Merge pull request #24 from scr/unknownFields

[Issue #23] Write a unit test that shows that unknown fields are not read into the message.

Author: scr

pom.xml

@@ -161,6 +161,7 @@
 								<exec executable="${protoc}" failonerror="true">
 									<arg value="--java_out=${project.build.directory}/generated-test-sources" />
 									<arg value="--proto_path=${project.basedir}/src/test/resources" />
+									<arg value="${project.basedir}/src/test/resources/proto/issue23.proto" />
 									<arg value="${project.basedir}/src/test/resources/proto/unittest.proto" />
 									<arg value="${project.basedir}/src/test/resources/proto/unittest_import.proto" />
 									<arg value="${project.basedir}/src/test/resources/proto/unittest_couchdb.proto" />

src/test/java/com/googlecode/protobuf/format/JsonFormatTest.java

@@ -1,12 +1,19 @@
 package com.googlecode.protobuf.format;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
+import com.google.protobuf.UnknownFieldSet;
+import com.googlecode.protobuf.format.issue23.Issue23;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.testng.reporters.Files;
 import protobuf_unittest.UnittestProto;
+import sun.nio.cs.StandardCharsets;
 
 import java.io.IOException;
+import java.io.StringBufferInputStream;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -19,11 +26,11 @@
 public class JsonFormatTest {
     private static final String RESOURCE_PATH = "/expectations/JsonFormatTest/";
     private static final FormatFactory FORMAT_FACTORY = new FormatFactory();
-    private static final ProtobufFormatter JSON_FORMATTER =
-            FORMAT_FACTORY.createFormatter(FormatFactory.Formatter.JSON);
+    private static final JsonFormat JSON_FORMATTER =
+            (JsonFormat) FORMAT_FACTORY.createFormatter(FormatFactory.Formatter.JSON);
 
     private static String getExpected(String name) throws IOException {
-        return Files.readFile(JsonFormatTest.class.getResourceAsStream(RESOURCE_PATH + "test1.json")).trim();
+        return Files.readFile(JsonFormatTest.class.getResourceAsStream(RESOURCE_PATH + name)).trim();
     }
 
     @DataProvider(name = "data")
@@ -44,4 +51,28 @@ public void testJsonFormat(
             String desc, Message input, ProtobufFormatter formatter, String expectedString) throws Exception {
         assertThat(formatter.printToString(input), is(expectedString));
     }
+
+    // TODO(scr): Re-enable test when the code is fixed to enable slurping unknown fields into the message.
+    @Test(enabled = false, description = "https://github.com/bivas/protobuf-java-format/issues/23")
+    public void testIssue23() throws Exception {
+        Issue23.MsgWithUnknownFields issue23Message = Issue23.MsgWithUnknownFields.newBuilder()
+                .setLeaf1("Hello")
+                .setLeaf2(23)
+                .addLeaf3(41)
+                .setUnknownFields(
+                        UnknownFieldSet.newBuilder()
+                                .addField(4, UnknownFieldSet.Field.newBuilder()
+                                        .addLengthDelimited(ByteString.copyFromUtf8("world"))
+                                        .build())
+                                .build())
+                .build();
+        String message = JSON_FORMATTER.printToString(issue23Message);
+        assertThat(message, is("{\"leaf1\": \"Hello\",\"leaf2\": 23,\"leaf3\": [41], \"4\": [\"world\"]}"));
+
+        Issue23.MsgWithUnknownFields.Builder issue23Builder = Issue23.MsgWithUnknownFields.newBuilder();
+        ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
+        Issue23.registerAllExtensions(extensionRegistry);
+        JSON_FORMATTER.merge(message, extensionRegistry, issue23Builder);
+        assertThat("No unknown field 4", issue23Builder.getUnknownFields().hasField(4));
+    }
 }

src/test/resources/proto/issue23.proto

@@ -0,0 +1,11 @@
+package issue23;
+
+option optimize_for = SPEED;
+
+option java_package = "com.googlecode.protobuf.format.issue23";
+
+message MsgWithUnknownFields {
+  optional string leaf1 = 1;
+  optional int32 leaf2 = 2;
+  repeated int32 leaf3 = 3;
+}