1 files changed, 47 insertions, 8 deletions

diff --git a/src/google/protobuf/drop_unknown_fields_test.cc b/src/google/protobuf/drop_unknown_fields_test.cc
index 6f16dc53..437a04e7 100644
--- a/src/google/protobuf/drop_unknown_fields_test.cc
+++ b/src/google/protobuf/drop_unknown_fields_test.cc
@@ -29,12 +29,10 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <memory>
-#ifndef _SHARED_PTR_H
-#include <google/protobuf/stubs/shared_ptr.h>
-#endif
 
 #include <google/protobuf/unittest_drop_unknown_fields.pb.h>
 #include <google/protobuf/dynamic_message.h>
+#include <google/protobuf/message_lite.h>
 #include <gtest/gtest.h>
 
 namespace google {
@@ -43,7 +41,8 @@ using unittest_drop_unknown_fields::FooWithExtraFields;
 
 namespace protobuf {
 
-TEST(DropUnknownFieldsTest, GeneratedMessage) {
+TEST(DropUnknownFieldsTest, GeneratedMessageDefaultDrop) {
+  ::google::protobuf::internal::SetProto3PreserveUnknownsDefault(false);
   FooWithExtraFields foo_with_extra_fields;
   foo_with_extra_fields.set_int32_value(1);
   foo_with_extra_fields.set_enum_value(FooWithExtraFields::QUX);
@@ -54,8 +53,6 @@ TEST(DropUnknownFieldsTest, GeneratedMessage) {
   EXPECT_EQ(1, foo.int32_value());
   EXPECT_EQ(static_cast<int>(FooWithExtraFields::QUX),
             static_cast<int>(foo.enum_value()));
-  // We don't generate unknown field accessors but the UnknownFieldSet is
-  // still exposed through reflection API.
   EXPECT_TRUE(foo.GetReflection()->GetUnknownFields(foo).empty());
 
   ASSERT_TRUE(foo_with_extra_fields.ParseFromString(foo.SerializeAsString()));
@@ -65,14 +62,36 @@ TEST(DropUnknownFieldsTest, GeneratedMessage) {
   EXPECT_EQ(0, foo_with_extra_fields.extra_int32_value());
 }
 
-TEST(DropUnknownFieldsTest, DynamicMessage) {
+TEST(DropUnknownFieldsTest, GeneratedMessageDefaultPreserve) {
+  ::google::protobuf::internal::SetProto3PreserveUnknownsDefault(true);
+  FooWithExtraFields foo_with_extra_fields;
+  foo_with_extra_fields.set_int32_value(1);
+  foo_with_extra_fields.set_enum_value(FooWithExtraFields::QUX);
+  foo_with_extra_fields.set_extra_int32_value(2);
+
+  Foo foo;
+  ASSERT_TRUE(foo.ParseFromString(foo_with_extra_fields.SerializeAsString()));
+  EXPECT_EQ(1, foo.int32_value());
+  EXPECT_EQ(static_cast<int>(FooWithExtraFields::QUX),
+            static_cast<int>(foo.enum_value()));
+  EXPECT_FALSE(foo.GetReflection()->GetUnknownFields(foo).empty());
+
+  ASSERT_TRUE(foo_with_extra_fields.ParseFromString(foo.SerializeAsString()));
+  EXPECT_EQ(1, foo_with_extra_fields.int32_value());
+  EXPECT_EQ(FooWithExtraFields::QUX, foo_with_extra_fields.enum_value());
+  // The "extra_int32_value" field should not be lost.
+  EXPECT_EQ(2, foo_with_extra_fields.extra_int32_value());
+}
+
+TEST(DropUnknownFieldsTest, DynamicMessageDefaultDrop) {
+  internal::SetProto3PreserveUnknownsDefault(false);
   FooWithExtraFields foo_with_extra_fields;
   foo_with_extra_fields.set_int32_value(1);
   foo_with_extra_fields.set_enum_value(FooWithExtraFields::QUX);
   foo_with_extra_fields.set_extra_int32_value(2);
 
   google::protobuf::DynamicMessageFactory factory;
-  google::protobuf::scoped_ptr<google::protobuf::Message> foo(
+  std::unique_ptr<google::protobuf::Message> foo(
       factory.GetPrototype(Foo::descriptor())->New());
   ASSERT_TRUE(foo->ParseFromString(foo_with_extra_fields.SerializeAsString()));
   EXPECT_TRUE(foo->GetReflection()->GetUnknownFields(*foo).empty());
@@ -84,5 +103,25 @@ TEST(DropUnknownFieldsTest, DynamicMessage) {
   EXPECT_EQ(0, foo_with_extra_fields.extra_int32_value());
 }
 
+TEST(DropUnknownFieldsTest, DynamicMessageDefaultPreserve) {
+  internal::SetProto3PreserveUnknownsDefault(true);
+  FooWithExtraFields foo_with_extra_fields;
+  foo_with_extra_fields.set_int32_value(1);
+  foo_with_extra_fields.set_enum_value(FooWithExtraFields::QUX);
+  foo_with_extra_fields.set_extra_int32_value(2);
+
+  google::protobuf::DynamicMessageFactory factory;
+  std::unique_ptr<google::protobuf::Message> foo(
+      factory.GetPrototype(Foo::descriptor())->New());
+  ASSERT_TRUE(foo->ParseFromString(foo_with_extra_fields.SerializeAsString()));
+  EXPECT_FALSE(foo->GetReflection()->GetUnknownFields(*foo).empty());
+
+  ASSERT_TRUE(foo_with_extra_fields.ParseFromString(foo->SerializeAsString()));
+  EXPECT_EQ(1, foo_with_extra_fields.int32_value());
+  EXPECT_EQ(FooWithExtraFields::QUX, foo_with_extra_fields.enum_value());
+  // The "extra_int32_value" field should not be lost.
+  EXPECT_EQ(2, foo_with_extra_fields.extra_int32_value());
+}
+
 }  // namespace protobuf
 }  // namespace google