Index: third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc |
diff --git a/third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc b/third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc |
index 20d50a2c2ff0deb0515f6942514514aa46ba1105..ae0811f892692c20137b3a9001a5c1ceeb052ed8 100644 |
--- a/third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc |
+++ b/third_party/protobuf/src/google/protobuf/io/tokenizer_unittest.cc |
@@ -736,19 +736,13 @@ TEST_F(TokenizerTest, ParseInteger) { |
EXPECT_EQ(0, ParseInteger("0x")); |
uint64 i; |
-#ifdef PROTOBUF_HAS_DEATH_TEST // death tests do not work on Windows yet |
+ |
// Test invalid integers that will never be tokenized as integers. |
- EXPECT_DEBUG_DEATH(Tokenizer::ParseInteger("zxy", kuint64max, &i), |
- "passed text that could not have been tokenized as an integer"); |
- EXPECT_DEBUG_DEATH(Tokenizer::ParseInteger("1.2", kuint64max, &i), |
- "passed text that could not have been tokenized as an integer"); |
- EXPECT_DEBUG_DEATH(Tokenizer::ParseInteger("08", kuint64max, &i), |
- "passed text that could not have been tokenized as an integer"); |
- EXPECT_DEBUG_DEATH(Tokenizer::ParseInteger("0xg", kuint64max, &i), |
- "passed text that could not have been tokenized as an integer"); |
- EXPECT_DEBUG_DEATH(Tokenizer::ParseInteger("-1", kuint64max, &i), |
- "passed text that could not have been tokenized as an integer"); |
-#endif // PROTOBUF_HAS_DEATH_TEST |
+ EXPECT_FALSE(Tokenizer::ParseInteger("zxy", kuint64max, &i)); |
+ EXPECT_FALSE(Tokenizer::ParseInteger("1.2", kuint64max, &i)); |
+ EXPECT_FALSE(Tokenizer::ParseInteger("08", kuint64max, &i)); |
+ EXPECT_FALSE(Tokenizer::ParseInteger("0xg", kuint64max, &i)); |
+ EXPECT_FALSE(Tokenizer::ParseInteger("-1", kuint64max, &i)); |
// Test overflows. |
EXPECT_TRUE (Tokenizer::ParseInteger("0", 0, &i)); |