1 files changed, 26 insertions, 9 deletions

diff --git a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
index 237d0722..b7a537ab 100644
--- a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
+++ b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
@@ -43,21 +43,19 @@ namespace testing {
 
 using google::protobuf::testing::DefaultValueTest;
 
-// Tests to cover some basic DefaultValueObjectWriter use cases. More tests are
-// in the marshalling_test.cc and translator_integration_test.cc.
-class DefaultValueObjectWriterTest
+// Base class for setting up required state for running default values tests on
+// different descriptors.
+class BaseDefaultValueObjectWriterTest
     : public ::testing::TestWithParam<testing::TypeInfoSource> {
  protected:
-  DefaultValueObjectWriterTest()
+  explicit BaseDefaultValueObjectWriterTest(const Descriptor* descriptor)
       : helper_(GetParam()), mock_(), expects_(&mock_) {
-    helper_.ResetTypeInfo(DefaultValueTest::descriptor());
+    helper_.ResetTypeInfo(descriptor);
     testing_.reset(helper_.NewDefaultValueWriter(
-        string(kTypeServiceBaseUrl) + "/" +
-            DefaultValueTest::descriptor()->full_name(),
-        &mock_));
+        string(kTypeServiceBaseUrl) + "/" + descriptor->full_name(), &mock_));
   }
 
-  virtual ~DefaultValueObjectWriterTest() {}
+  ~BaseDefaultValueObjectWriterTest() override {}
 
   TypeInfoTestHelper helper_;
   MockObjectWriter mock_;
@@ -65,6 +63,15 @@ class DefaultValueObjectWriterTest
   google::protobuf::scoped_ptr<DefaultValueObjectWriter> testing_;
 };
 
+// Tests to cover some basic DefaultValueObjectWriter use cases. More tests are
+// in the marshalling_test.cc and translator_integration_test.cc.
+class DefaultValueObjectWriterTest : public BaseDefaultValueObjectWriterTest {
+ protected:
+  DefaultValueObjectWriterTest()
+      : BaseDefaultValueObjectWriterTest(DefaultValueTest::descriptor()) {}
+  ~DefaultValueObjectWriterTest() override {}
+};
+
 INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                         DefaultValueObjectWriterTest,
                         ::testing::Values(
@@ -74,6 +81,8 @@ TEST_P(DefaultValueObjectWriterTest, Empty) {
   // Set expectation
   expects_.StartObject("")
       ->RenderDouble("doubleValue", 0.0)
+      ->StartList("repeatedDouble")
+      ->EndList()
       ->RenderFloat("floatValue", 0.0)
       ->RenderInt64("int64Value", 0)
       ->RenderUint64("uint64Value", 0)
@@ -82,6 +91,7 @@ TEST_P(DefaultValueObjectWriterTest, Empty) {
       ->RenderBool("boolValue", false)
       ->RenderString("stringValue", "")
       ->RenderBytes("bytesValue", "")
+      ->RenderString("enumValue", "ENUM_FIRST")
       ->EndObject();
 
   // Actual testing
@@ -92,6 +102,8 @@ TEST_P(DefaultValueObjectWriterTest, NonDefaultDouble) {
   // Set expectation
   expects_.StartObject("")
       ->RenderDouble("doubleValue", 1.0)
+      ->StartList("repeatedDouble")
+      ->EndList()
       ->RenderFloat("floatValue", 0.0)
       ->RenderInt64("int64Value", 0)
       ->RenderUint64("uint64Value", 0)
@@ -99,6 +111,7 @@ TEST_P(DefaultValueObjectWriterTest, NonDefaultDouble) {
       ->RenderUint32("uint32Value", 0)
       ->RenderBool("boolValue", false)
       ->RenderString("stringValue", "")
+      ->RenderString("enumValue", "ENUM_FIRST")
       ->EndObject();
 
   // Actual testing
@@ -109,6 +122,8 @@ TEST_P(DefaultValueObjectWriterTest, ShouldRetainUnknownField) {
   // Set expectation
   expects_.StartObject("")
       ->RenderDouble("doubleValue", 1.0)
+      ->StartList("repeatedDouble")
+      ->EndList()
       ->RenderFloat("floatValue", 0.0)
       ->RenderInt64("int64Value", 0)
       ->RenderUint64("uint64Value", 0)
@@ -120,6 +135,7 @@ TEST_P(DefaultValueObjectWriterTest, ShouldRetainUnknownField) {
       ->StartObject("unknownObject")
       ->RenderString("unknown", "def")
       ->EndObject()
+      ->RenderString("enumValue", "ENUM_FIRST")
       ->EndObject();
 
   // Actual testing
@@ -132,6 +148,7 @@ TEST_P(DefaultValueObjectWriterTest, ShouldRetainUnknownField) {
       ->EndObject();
 }
 
+
 }  // namespace testing
 }  // namespace converter
 }  // namespace util