diff options
author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-25 23:07:02 +0000 |
---|---|---|
committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-25 23:07:02 +0000 |
commit | db9f7dd1acca195cac67ca1f90e656fb64ebeb21 (patch) | |
tree | bb66cf5b666ce151135352b874d3e8c5a4b2cb0b /java/src/test | |
parent | 9eda53a6f1ab4229fd40473661d589be70382174 (diff) | |
download | protobuf-db9f7dd1acca195cac67ca1f90e656fb64ebeb21.tar.gz protobuf-db9f7dd1acca195cac67ca1f90e656fb64ebeb21.tar.bz2 protobuf-db9f7dd1acca195cac67ca1f90e656fb64ebeb21.zip |
1, Remove unkown field support in jave TextFormat
2, Verifies the EnumValueDscriptor for DynamicMessage.Builder#setField
Diffstat (limited to 'java/src/test')
-rw-r--r-- | java/src/test/java/com/google/protobuf/TextFormatTest.java | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/java/src/test/java/com/google/protobuf/TextFormatTest.java b/java/src/test/java/com/google/protobuf/TextFormatTest.java index 7cb70021..5b775698 100644 --- a/java/src/test/java/com/google/protobuf/TextFormatTest.java +++ b/java/src/test/java/com/google/protobuf/TextFormatTest.java @@ -119,9 +119,6 @@ public class TextFormatTest extends TestCase { " i: 456\n" + "}\n"; - private final TextFormat.Parser parserAllowingUnknownFields = - TextFormat.Parser.newBuilder().setAllowUnknownFields(true).build(); - private final TextFormat.Parser parserWithOverwriteForbidden = TextFormat.Parser.newBuilder() .setSingularOverwritePolicy( @@ -463,25 +460,6 @@ public class TextFormatTest extends TestCase { } } - private void assertParseErrorWithUnknownFields(String error, String text) { - TestAllTypes.Builder builder = TestAllTypes.newBuilder(); - try { - parserAllowingUnknownFields.merge( - text, TestUtil.getExtensionRegistry(), builder); - fail("Expected parse exception."); - } catch (TextFormat.ParseException e) { - assertEquals(error, e.getMessage()); - } - } - - private TestAllTypes assertParseSuccessWithUnknownFields(String text) - throws TextFormat.ParseException { - TestAllTypes.Builder builder = TestAllTypes.newBuilder(); - parserAllowingUnknownFields.merge( - text, TestUtil.getExtensionRegistry(), builder); - return builder.build(); - } - private void assertParseErrorWithOverwriteForbidden(String error, String text) { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); @@ -922,87 +900,6 @@ public class TextFormatTest extends TestCase { .build())); } - public void testParseUnknownFields() throws Exception { - assertParseSuccessWithUnknownFields("unknown_field: 12345"); - assertParseSuccessWithUnknownFields("unknown_field: -12345"); - assertParseSuccessWithUnknownFields("unknown_field: 1.2345"); - assertParseSuccessWithUnknownFields("unknown_field: -1.2345"); - assertParseSuccessWithUnknownFields("unknown_field: 1.2345f"); - assertParseSuccessWithUnknownFields("unknown_field: -1.2345f"); - assertParseSuccessWithUnknownFields("unknown_field: inf"); - assertParseSuccessWithUnknownFields("unknown_field: -inf"); - assertParseSuccessWithUnknownFields("unknown_field: TYPE_STRING"); - assertParseSuccessWithUnknownFields("unknown_field: \"string value\""); - // Invalid field value - assertParseErrorWithUnknownFields( - "1:16: Invalid field value: -TYPE_STRING", - "unknown_field: -TYPE_STRING"); - // Two or more unknown fields - assertParseSuccessWithUnknownFields("unknown_field1: TYPE_STRING\n" + - "unknown_field2: 12345"); - // Unknown nested message - assertParseSuccessWithUnknownFields("unknown_message1: {}\n" + - "unknown_message2 {\n" + - " unknown_field: 12345\n" + - "}\n" + - "unknown_message3 <\n" + - " unknown_nested_message {\n" + - " unknown_field: 12345\n" + - " }\n" + - ">"); - // Unmatched delimeters for message body - assertParseErrorWithUnknownFields( - "1:19: Expected \"}\".", "unknown_message: {>"); - // Unknown extension - assertParseSuccessWithUnknownFields( - "[somewhere.unknown_extension1]: 12345\n" + - "[somewhere.unknown_extension2] {\n" + - " unknown_field: 12345\n" + - "}"); - // Unknown fields between known fields. - TestAllTypes expected = TestAllTypes.newBuilder() - .setOptionalInt32(1) - .setOptionalString("string") - .setOptionalNestedMessage(NestedMessage.newBuilder() - .setBb(2)) - .build(); - assertEquals(expected, assertParseSuccessWithUnknownFields( - "optional_int32: 1\n" + - "unknown_field: 12345\n" + - "optional_string: \"string\"\n" + - "unknown_message { unknown : 0 }\n" + - "optional_nested_message { bb: 2 }")); - // Nested unknown extensions. - assertParseSuccessWithUnknownFields( - "[test.extension1] <\n" + - " unknown_nested_message <\n" + - " [test.extension2] <\n" + - " unknown_field: 12345\n" + - " >\n" + - " >\n" + - ">"); - assertParseSuccessWithUnknownFields( - "[test.extension1] {\n" + - " unknown_nested_message {\n" + - " [test.extension2] {\n" + - " unknown_field: 12345\n" + - " }\n" + - " }\n" + - "}"); - assertParseSuccessWithUnknownFields( - "[test.extension1] <\n" + - " some_unknown_fields: <\n" + - " unknown_field: 12345\n" + - " >\n" + - ">"); - assertParseSuccessWithUnknownFields( - "[test.extension1] {\n" + - " some_unknown_fields: {\n" + - " unknown_field: 12345\n" + - " }\n" + - "}"); - } - public void testParseNonRepeatedFields() throws Exception { assertParseSuccessWithOverwriteForbidden( "repeated_int32: 1\n" + |