diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-06-21 16:37:38 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-21 16:37:38 -0700 |
| commit | 6a4fec616ec4b20f54d5fb530808b855cb664390 (patch) | |
| tree | d61b8e4e8e7a9460a69dc59bb62f8b17fea7a629 /src/google/protobuf/util/json_util_test.cc | |
| parent | f35669b8d3f46f7f1236bd21f14d744bba251e60 (diff) | |
| parent | 2d31d0c70680399d45bffdb7de620e945b2cb6bc (diff) | |
Merge pull request #4813 from htuch/fix-any-in-map
protostream_objectwriter: fix bug when Any is directly embedded in a …
Diffstat (limited to 'src/google/protobuf/util/json_util_test.cc')
| -rw-r--r-- | src/google/protobuf/util/json_util_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/json_util_test.cc b/src/google/protobuf/util/json_util_test.cc index ed9092df..a2a84b57 100644 --- a/src/google/protobuf/util/json_util_test.cc +++ b/src/google/protobuf/util/json_util_test.cc @@ -284,7 +284,7 @@ TEST_F(JsonUtilTest, ParsePrimitiveMapIn) { JsonPrintOptions print_options; print_options.always_print_primitive_fields = true; JsonParseOptions parse_options; - EXPECT_EQ("{\"other\":\"\",\"things\":[],\"mapInput\":{}}", + EXPECT_EQ("{\"other\":\"\",\"things\":[],\"mapInput\":{},\"mapAny\":{}}", ToJson(message, print_options)); MapIn other; ASSERT_TRUE(FromJson(ToJson(message, print_options), &other, parse_options)); |