From d36c0c538a545fac5d9db6ba65c525246d4efa95 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 29 Mar 2017 14:32:48 -0700
Subject: Down-integrate from google3.

---
 .../protobuf/util/internal/protostream_objectwriter_test.cc    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/google/protobuf/util/internal/protostream_objectwriter_test.cc')

diff --git a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
index 97ef8fff..87d35b08 100644
--- a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
+++ b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
@@ -279,17 +279,13 @@ TEST_P(ProtoStreamObjectWriterTest, ConflictingJsonName) {
   ResetTypeInfo(TestJsonName1::descriptor());
   TestJsonName1 message1;
   message1.set_one_value(12345);
-  ow_->StartObject("")
-      ->RenderInt32("value", 12345)
-      ->EndObject();
+  ow_->StartObject("")->RenderInt32("value", 12345)->EndObject();
   CheckOutput(message1);
 
   ResetTypeInfo(TestJsonName2::descriptor());
   TestJsonName2 message2;
   message2.set_another_value(12345);
-  ow_->StartObject("")
-      ->RenderInt32("value", 12345)
-      ->EndObject();
+  ow_->StartObject("")->RenderInt32("value", 12345)->EndObject();
   CheckOutput(message2);
 }
 
@@ -1615,7 +1611,7 @@ TEST_P(ProtoStreamObjectWriterStructTest, RepeatedStructMapObjectKeyTest) {
 TEST_P(ProtoStreamObjectWriterStructTest, OptionStructIntAsStringsTest) {
   StructType struct_type;
   google::protobuf::Struct* s = struct_type.mutable_object();
-  s->mutable_fields()->operator[]("k1").set_number_value(123);
+  s->mutable_fields()->operator[]("k1").set_string_value("123");
   s->mutable_fields()->operator[]("k2").set_bool_value(true);
   s->mutable_fields()->operator[]("k3").set_string_value("-222222222");
   s->mutable_fields()->operator[]("k4").set_string_value("33333333");
-- 
cgit v1.2.3