From 5a17660ca0b8116219f6f86df1fcd49f33415777 Mon Sep 17 00:00:00 2001
From: mike07026 <121458737@qq.com>
Date: Thu, 1 Sep 2016 20:06:55 +0800
Subject: detect invaild JSON encoding in bytes field

---
 src/google/protobuf/util/json_util_test.cc | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'src')

diff --git a/src/google/protobuf/util/json_util_test.cc b/src/google/protobuf/util/json_util_test.cc
index dacac5e0..7d394240 100644
--- a/src/google/protobuf/util/json_util_test.cc
+++ b/src/google/protobuf/util/json_util_test.cc
@@ -128,6 +128,34 @@ TEST_F(JsonUtilTest, TestDefaultValues) {
       "\"repeatedMessageValue\":[]"
       "}",
       ToJson(m, options));
+
+  options.always_print_primitive_fields = true;
+  m.set_string_value("i am a test string value");
+  m.set_bytes_value("i am a test bytes value");
+  EXPECT_EQ(
+	  "{\"boolValue\":false,"
+	  "\"int32Value\":0,"
+	  "\"int64Value\":\"0\","
+	  "\"uint32Value\":0,"
+	  "\"uint64Value\":\"0\","
+	  "\"floatValue\":0,"
+	  "\"doubleValue\":0,"
+	  "\"stringValue\":\"i am a test string value\","
+	  "\"bytesValue\":\"aSBhbSBhIHRlc3QgYnl0ZXMgdmFsdWU=\","
+	  "\"enumValue\":\"FOO\","
+	  "\"repeatedBoolValue\":[],"
+	  "\"repeatedInt32Value\":[],"
+	  "\"repeatedInt64Value\":[],"
+	  "\"repeatedUint32Value\":[],"
+	  "\"repeatedUint64Value\":[],"
+	  "\"repeatedFloatValue\":[],"
+	  "\"repeatedDoubleValue\":[],"
+	  "\"repeatedStringValue\":[],"
+	  "\"repeatedBytesValue\":[],"
+	  "\"repeatedEnumValue\":[],"
+	  "\"repeatedMessageValue\":[]"
+	  "}",
+	  ToJson(m, options));
 }
 
 TEST_F(JsonUtilTest, ParseMessage) {
-- 
cgit v1.2.3