From e5891e40222575994541fccf6e12dc21168271bb Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Tue, 5 May 2020 16:00:26 -0700 Subject: [PATCH 1/2] Revert "Fix the test" This reverts commit ec3cf716 Signed-off-by: Teju Nareddy --- src/mutator_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutator_test.cc b/src/mutator_test.cc index 3e54cea..ec5da96 100644 --- a/src/mutator_test.cc +++ b/src/mutator_test.cc @@ -678,7 +678,7 @@ TYPED_TEST(MutatorTypedTest, Serialization) { TYPED_TEST(MutatorTypedTest, UnknownFieldTextFormat) { typename TestFixture::Message parsed; - EXPECT_FALSE(ParseTextMessage(kUnknownFieldInput, &parsed)); + EXPECT_TRUE(ParseTextMessage(kUnknownFieldInput, &parsed)); EXPECT_NE(SaveMessageAsText(parsed), kUnknownFieldExpected); } From 6b39c4d62a20ad9241cfc4fa53091ef7e9a560e8 Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Tue, 5 May 2020 16:00:36 -0700 Subject: [PATCH 2/2] Revert "Dissable AllowUnknownField" This reverts commit 301f18f7 Signed-off-by: Teju Nareddy --- src/mutator_test.cc | 2 +- src/text_format.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mutator_test.cc b/src/mutator_test.cc index ec5da96..312b2d9 100644 --- a/src/mutator_test.cc +++ b/src/mutator_test.cc @@ -679,7 +679,7 @@ TYPED_TEST(MutatorTypedTest, Serialization) { TYPED_TEST(MutatorTypedTest, UnknownFieldTextFormat) { typename TestFixture::Message parsed; EXPECT_TRUE(ParseTextMessage(kUnknownFieldInput, &parsed)); - EXPECT_NE(SaveMessageAsText(parsed), kUnknownFieldExpected); + EXPECT_EQ(SaveMessageAsText(parsed), kUnknownFieldExpected); } TYPED_TEST(MutatorTypedTest, DeepRecursion) { diff --git a/src/text_format.cc b/src/text_format.cc index fae6f6e..4479229 100644 --- a/src/text_format.cc +++ b/src/text_format.cc @@ -30,7 +30,7 @@ bool ParseTextMessage(const std::string& data, protobuf::Message* output) { TextFormat::Parser parser; parser.SetRecursionLimit(100); parser.AllowPartialMessage(true); - // parser.AllowUnknownField(true); + parser.AllowUnknownField(true); if (!parser.ParseFromString(data, output)) { output->Clear(); return false;