diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2016-12-08 11:17:10 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-08 11:17:10 -0800 |
commit | 34a1b6e6b8c0d477504d09df4df4b86770e47872 (patch) | |
tree | 10f401d3230026b535f1dccbe12c6475bb961a9d /java/util/src/test | |
parent | 46ae90dc5e145b12fffa7e053a908a9f3e066286 (diff) | |
parent | 1a56251a3582d8b060ca65db6ef1d178c744f81f (diff) | |
download | protobuf-34a1b6e6b8c0d477504d09df4df4b86770e47872.tar.gz protobuf-34a1b6e6b8c0d477504d09df4df4b86770e47872.tar.bz2 protobuf-34a1b6e6b8c0d477504d09df4df4b86770e47872.zip |
Merge pull request #2394 from cwelton/formatting
oneOf fix for JsonFormat includingDefaultValueFields
Diffstat (limited to 'java/util/src/test')
-rw-r--r-- | java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java b/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java index 164ee54b..dafd9bb5 100644 --- a/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java +++ b/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java @@ -1267,6 +1267,23 @@ public class JsonFormatTest extends TestCase { + " }\n" + "}", JsonFormat.printer().includingDefaultValueFields().print(mapMessage)); + + TestOneof oneofMessage = TestOneof.getDefaultInstance(); + assertEquals("{\n}", JsonFormat.printer().print(oneofMessage)); + assertEquals("{\n}", JsonFormat.printer().includingDefaultValueFields().print(oneofMessage)); + + oneofMessage = TestOneof.newBuilder().setOneofInt32(42).build(); + assertEquals("{\n \"oneofInt32\": 42\n}", + JsonFormat.printer().print(oneofMessage)); + assertEquals("{\n \"oneofInt32\": 42\n}", + JsonFormat.printer().includingDefaultValueFields().print(oneofMessage)); + + TestOneof.Builder oneofBuilder = TestOneof.newBuilder(); + mergeFromJson("{\n" + " \"oneofNullValue\": null \n" + "}", oneofBuilder); + oneofMessage = oneofBuilder.build(); + assertEquals("{\n \"oneofNullValue\": null\n}", JsonFormat.printer().print(oneofMessage)); + assertEquals("{\n \"oneofNullValue\": null\n}", + JsonFormat.printer().includingDefaultValueFields().print(oneofMessage)); } public void testPreservingProtoFieldNames() throws Exception { |