diff options
Diffstat (limited to 'java/core/src/test/java/com/google')
53 files changed, 5496 insertions, 5605 deletions
diff --git a/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java b/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java index cb2d34eb..1020c69c 100644 --- a/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java +++ b/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java @@ -53,10 +53,9 @@ import junit.framework.TestCase; */ public class AbstractMessageTest extends TestCase { /** - * Extends AbstractMessage and wraps some other message object. The methods - * of the Message interface which aren't explicitly implemented by - * AbstractMessage are forwarded to the wrapped object. This allows us to - * test that AbstractMessage's implementations work even if the wrapped + * Extends AbstractMessage and wraps some other message object. The methods of the Message + * interface which aren't explicitly implemented by AbstractMessage are forwarded to the wrapped + * object. This allows us to test that AbstractMessage's implementations work even if the wrapped * object does not use them. */ private static class AbstractMessageWrapper extends AbstractMessage { @@ -70,39 +69,47 @@ public class AbstractMessageTest extends TestCase { public Descriptors.Descriptor getDescriptorForType() { return wrappedMessage.getDescriptorForType(); } + @Override public AbstractMessageWrapper getDefaultInstanceForType() { - return new AbstractMessageWrapper( - wrappedMessage.getDefaultInstanceForType()); + return new AbstractMessageWrapper(wrappedMessage.getDefaultInstanceForType()); } + @Override public Map<Descriptors.FieldDescriptor, Object> getAllFields() { return wrappedMessage.getAllFields(); } + @Override public boolean hasField(Descriptors.FieldDescriptor field) { return wrappedMessage.hasField(field); } + @Override public Object getField(Descriptors.FieldDescriptor field) { return wrappedMessage.getField(field); } + @Override public int getRepeatedFieldCount(Descriptors.FieldDescriptor field) { return wrappedMessage.getRepeatedFieldCount(field); } + @Override public Object getRepeatedField(Descriptors.FieldDescriptor field, int index) { return wrappedMessage.getRepeatedField(field, index); } + @Override public UnknownFieldSet getUnknownFields() { return wrappedMessage.getUnknownFields(); } + @Override public Builder newBuilderForType() { return new Builder(wrappedMessage.newBuilderForType()); } + @Override public Builder toBuilder() { return new Builder(wrappedMessage.toBuilder()); @@ -119,85 +126,103 @@ public class AbstractMessageTest extends TestCase { public AbstractMessageWrapper build() { return new AbstractMessageWrapper(wrappedBuilder.build()); } + @Override public AbstractMessageWrapper buildPartial() { return new AbstractMessageWrapper(wrappedBuilder.buildPartial()); } + @Override public Builder clone() { return new Builder(wrappedBuilder.clone()); } + @Override public boolean isInitialized() { return clone().buildPartial().isInitialized(); } + @Override public Descriptors.Descriptor getDescriptorForType() { return wrappedBuilder.getDescriptorForType(); } + @Override public AbstractMessageWrapper getDefaultInstanceForType() { - return new AbstractMessageWrapper( - wrappedBuilder.getDefaultInstanceForType()); + return new AbstractMessageWrapper(wrappedBuilder.getDefaultInstanceForType()); } + @Override public Map<Descriptors.FieldDescriptor, Object> getAllFields() { return wrappedBuilder.getAllFields(); } + @Override public Builder newBuilderForField(Descriptors.FieldDescriptor field) { return new Builder(wrappedBuilder.newBuilderForField(field)); } + @Override public boolean hasField(Descriptors.FieldDescriptor field) { return wrappedBuilder.hasField(field); } + @Override public Object getField(Descriptors.FieldDescriptor field) { return wrappedBuilder.getField(field); } + @Override public Builder setField(Descriptors.FieldDescriptor field, Object value) { wrappedBuilder.setField(field, value); return this; } + @Override public Builder clearField(Descriptors.FieldDescriptor field) { wrappedBuilder.clearField(field); return this; } + @Override public int getRepeatedFieldCount(Descriptors.FieldDescriptor field) { return wrappedBuilder.getRepeatedFieldCount(field); } + @Override public Object getRepeatedField(Descriptors.FieldDescriptor field, int index) { return wrappedBuilder.getRepeatedField(field, index); } + @Override public Builder setRepeatedField(Descriptors.FieldDescriptor field, int index, Object value) { wrappedBuilder.setRepeatedField(field, index, value); return this; } + @Override public Builder addRepeatedField(Descriptors.FieldDescriptor field, Object value) { wrappedBuilder.addRepeatedField(field, value); return this; } + @Override public UnknownFieldSet getUnknownFields() { return wrappedBuilder.getUnknownFields(); } + @Override public Builder setUnknownFields(UnknownFieldSet unknownFields) { wrappedBuilder.setUnknownFields(unknownFields); return this; } + @Override public Message.Builder getFieldBuilder(FieldDescriptor field) { return wrappedBuilder.getFieldBuilder(field); } } + @Override public Parser<? extends Message> getParserForType() { return wrappedMessage.getParserForType(); @@ -207,24 +232,25 @@ public class AbstractMessageTest extends TestCase { // ================================================================= TestUtil.ReflectionTester reflectionTester = - new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null); + new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null); TestUtil.ReflectionTester extensionsReflectionTester = - new TestUtil.ReflectionTester(TestAllExtensions.getDescriptor(), - TestUtil.getExtensionRegistry()); + new TestUtil.ReflectionTester( + TestAllExtensions.getDescriptor(), TestUtil.getFullExtensionRegistry()); public void testClear() throws Exception { AbstractMessageWrapper message = - new AbstractMessageWrapper.Builder( - TestAllTypes.newBuilder(TestUtil.getAllSet())) - .clear().build(); + new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder(TestUtil.getAllSet())) + .clear() + .build(); TestUtil.assertClear((TestAllTypes) message.wrappedMessage); } public void testCopy() throws Exception { AbstractMessageWrapper message = - new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder()) - .mergeFrom(TestUtil.getAllSet()).build(); + new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder()) + .mergeFrom(TestUtil.getAllSet()) + .build(); TestUtil.assertAllFieldsSet((TestAllTypes) message.wrappedMessage); } @@ -232,25 +258,21 @@ public class AbstractMessageTest extends TestCase { TestAllTypes message = TestUtil.getAllSet(); Message abstractMessage = new AbstractMessageWrapper(TestUtil.getAllSet()); - assertEquals(message.getSerializedSize(), - abstractMessage.getSerializedSize()); + assertEquals(message.getSerializedSize(), abstractMessage.getSerializedSize()); } public void testSerialization() throws Exception { Message abstractMessage = new AbstractMessageWrapper(TestUtil.getAllSet()); - TestUtil.assertAllFieldsSet( - TestAllTypes.parseFrom(abstractMessage.toByteString())); + TestUtil.assertAllFieldsSet(TestAllTypes.parseFrom(abstractMessage.toByteString())); - assertEquals(TestUtil.getAllSet().toByteString(), - abstractMessage.toByteString()); + assertEquals(TestUtil.getAllSet().toByteString(), abstractMessage.toByteString()); } public void testParsing() throws Exception { AbstractMessageWrapper.Builder builder = - new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder()); - AbstractMessageWrapper message = - builder.mergeFrom(TestUtil.getAllSet().toByteString()).build(); + new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder()); + AbstractMessageWrapper message = builder.mergeFrom(TestUtil.getAllSet().toByteString()).build(); TestUtil.assertAllFieldsSet((TestAllTypes) message.wrappedMessage); } @@ -270,8 +292,8 @@ public class AbstractMessageTest extends TestCase { } // test DynamicMessage directly. - Message.Builder dynamicMessageBuilder = DynamicMessage.newBuilder( - TestRequiredForeign.getDescriptor()); + Message.Builder dynamicMessageBuilder = + DynamicMessage.newBuilder(TestRequiredForeign.getDescriptor()); // mergeFrom() should not throw initialization error. dynamicMessageBuilder.mergeFrom(bytes).buildPartial(); try { @@ -283,65 +305,56 @@ public class AbstractMessageTest extends TestCase { } public void testPackedSerialization() throws Exception { - Message abstractMessage = - new AbstractMessageWrapper(TestUtil.getPackedSet()); + Message abstractMessage = new AbstractMessageWrapper(TestUtil.getPackedSet()); - TestUtil.assertPackedFieldsSet( - TestPackedTypes.parseFrom(abstractMessage.toByteString())); + TestUtil.assertPackedFieldsSet(TestPackedTypes.parseFrom(abstractMessage.toByteString())); - assertEquals(TestUtil.getPackedSet().toByteString(), - abstractMessage.toByteString()); + assertEquals(TestUtil.getPackedSet().toByteString(), abstractMessage.toByteString()); } public void testPackedParsing() throws Exception { AbstractMessageWrapper.Builder builder = - new AbstractMessageWrapper.Builder(TestPackedTypes.newBuilder()); + new AbstractMessageWrapper.Builder(TestPackedTypes.newBuilder()); AbstractMessageWrapper message = - builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build(); + builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build(); TestUtil.assertPackedFieldsSet((TestPackedTypes) message.wrappedMessage); } public void testUnpackedSerialization() throws Exception { - Message abstractMessage = - new AbstractMessageWrapper(TestUtil.getUnpackedSet()); + Message abstractMessage = new AbstractMessageWrapper(TestUtil.getUnpackedSet()); - TestUtil.assertUnpackedFieldsSet( - TestUnpackedTypes.parseFrom(abstractMessage.toByteString())); + TestUtil.assertUnpackedFieldsSet(TestUnpackedTypes.parseFrom(abstractMessage.toByteString())); - assertEquals(TestUtil.getUnpackedSet().toByteString(), - abstractMessage.toByteString()); + assertEquals(TestUtil.getUnpackedSet().toByteString(), abstractMessage.toByteString()); } public void testParsePackedToUnpacked() throws Exception { AbstractMessageWrapper.Builder builder = - new AbstractMessageWrapper.Builder(TestUnpackedTypes.newBuilder()); + new AbstractMessageWrapper.Builder(TestUnpackedTypes.newBuilder()); AbstractMessageWrapper message = - builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build(); - TestUtil.assertUnpackedFieldsSet( - (TestUnpackedTypes) message.wrappedMessage); + builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build(); + TestUtil.assertUnpackedFieldsSet((TestUnpackedTypes) message.wrappedMessage); } public void testParseUnpackedToPacked() throws Exception { AbstractMessageWrapper.Builder builder = - new AbstractMessageWrapper.Builder(TestPackedTypes.newBuilder()); + new AbstractMessageWrapper.Builder(TestPackedTypes.newBuilder()); AbstractMessageWrapper message = - builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build(); + builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build(); TestUtil.assertPackedFieldsSet((TestPackedTypes) message.wrappedMessage); } public void testUnpackedParsing() throws Exception { AbstractMessageWrapper.Builder builder = - new AbstractMessageWrapper.Builder(TestUnpackedTypes.newBuilder()); + new AbstractMessageWrapper.Builder(TestUnpackedTypes.newBuilder()); AbstractMessageWrapper message = - builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build(); - TestUtil.assertUnpackedFieldsSet( - (TestUnpackedTypes) message.wrappedMessage); + builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build(); + TestUtil.assertUnpackedFieldsSet((TestUnpackedTypes) message.wrappedMessage); } public void testOptimizedForSize() throws Exception { // We're mostly only checking that this class was compiled successfully. - TestOptimizedForSize message = - TestOptimizedForSize.newBuilder().setI(1).build(); + TestOptimizedForSize message = TestOptimizedForSize.newBuilder().setI(1).build(); message = TestOptimizedForSize.parseFrom(message.toByteString()); assertEquals(2, message.getSerializedSize()); } @@ -351,8 +364,7 @@ public class AbstractMessageTest extends TestCase { public void testIsInitialized() throws Exception { TestRequired.Builder builder = TestRequired.newBuilder(); - AbstractMessageWrapper.Builder abstractBuilder = - new AbstractMessageWrapper.Builder(builder); + AbstractMessageWrapper.Builder abstractBuilder = new AbstractMessageWrapper.Builder(builder); assertFalse(abstractBuilder.isInitialized()); assertEquals("a, b, c", abstractBuilder.getInitializationErrorString()); @@ -369,8 +381,7 @@ public class AbstractMessageTest extends TestCase { public void testForeignIsInitialized() throws Exception { TestRequiredForeign.Builder builder = TestRequiredForeign.newBuilder(); - AbstractMessageWrapper.Builder abstractBuilder = - new AbstractMessageWrapper.Builder(builder); + AbstractMessageWrapper.Builder abstractBuilder = new AbstractMessageWrapper.Builder(builder); assertTrue(abstractBuilder.isInitialized()); assertEquals("", abstractBuilder.getInitializationErrorString()); @@ -378,8 +389,7 @@ public class AbstractMessageTest extends TestCase { builder.setOptionalMessage(TEST_REQUIRED_UNINITIALIZED); assertFalse(abstractBuilder.isInitialized()); assertEquals( - "optional_message.b, optional_message.c", - abstractBuilder.getInitializationErrorString()); + "optional_message.b, optional_message.c", abstractBuilder.getInitializationErrorString()); builder.setOptionalMessage(TEST_REQUIRED_INITIALIZED); assertTrue(abstractBuilder.isInitialized()); @@ -400,36 +410,37 @@ public class AbstractMessageTest extends TestCase { // Tests for mergeFrom static final TestAllTypes MERGE_SOURCE = - TestAllTypes.newBuilder() - .setOptionalInt32(1) - .setOptionalString("foo") - .setOptionalForeignMessage(ForeignMessage.getDefaultInstance()) - .addRepeatedString("bar") - .build(); + TestAllTypes.newBuilder() + .setOptionalInt32(1) + .setOptionalString("foo") + .setOptionalForeignMessage(ForeignMessage.getDefaultInstance()) + .addRepeatedString("bar") + .build(); static final TestAllTypes MERGE_DEST = - TestAllTypes.newBuilder() - .setOptionalInt64(2) - .setOptionalString("baz") - .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(3).build()) - .addRepeatedString("qux") - .build(); + TestAllTypes.newBuilder() + .setOptionalInt64(2) + .setOptionalString("baz") + .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(3).build()) + .addRepeatedString("qux") + .build(); static final String MERGE_RESULT_TEXT = - "optional_int32: 1\n" + - "optional_int64: 2\n" + - "optional_string: \"foo\"\n" + - "optional_foreign_message {\n" + - " c: 3\n" + - "}\n" + - "repeated_string: \"qux\"\n" + - "repeated_string: \"bar\"\n"; + "" + + "optional_int32: 1\n" + + "optional_int64: 2\n" + + "optional_string: \"foo\"\n" + + "optional_foreign_message {\n" + + " c: 3\n" + + "}\n" + + "repeated_string: \"qux\"\n" + + "repeated_string: \"bar\"\n"; public void testMergeFrom() throws Exception { AbstractMessageWrapper result = - new AbstractMessageWrapper.Builder( - TestAllTypes.newBuilder(MERGE_DEST)) - .mergeFrom(MERGE_SOURCE).build(); + new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder(MERGE_DEST)) + .mergeFrom(MERGE_SOURCE) + .build(); assertEquals(MERGE_RESULT_TEXT, result.toString()); } @@ -443,8 +454,10 @@ public class AbstractMessageTest extends TestCase { TestAllTypes c = TestAllTypes.newBuilder(b).addRepeatedString("x").build(); TestAllTypes d = TestAllTypes.newBuilder(c).addRepeatedString("y").build(); TestAllExtensions e = TestUtil.getAllExtensionsSet(); - TestAllExtensions f = TestAllExtensions.newBuilder(e) - .addExtension(UnittestProto.repeatedInt32Extension, 999).build(); + TestAllExtensions f = + TestAllExtensions.newBuilder(e) + .addExtension(UnittestProto.repeatedInt32Extension, 999) + .build(); checkEqualsIsConsistent(a); checkEqualsIsConsistent(b); @@ -489,9 +502,7 @@ public class AbstractMessageTest extends TestCase { checkEqualsIsConsistent(eUnknownFields, eUnknownFields2); } - /** - * Asserts that the given proto has symmetric equals and hashCode methods. - */ + /** Asserts that the given proto has symmetric equals and hashCode methods. */ private void checkEqualsIsConsistent(Message message) { // Object should be equal to itself. assertEquals(message, message); @@ -501,9 +512,7 @@ public class AbstractMessageTest extends TestCase { checkEqualsIsConsistent(message, dynamic); } - /** - * Asserts that the given protos are equal and have the same hash code. - */ + /** Asserts that the given protos are equal and have the same hash code. */ private void checkEqualsIsConsistent(Message message1, Message message2) { assertEquals(message1, message2); assertEquals(message2, message1); @@ -513,9 +522,8 @@ public class AbstractMessageTest extends TestCase { /** * Asserts that the given protos are not equal and have different hash codes. * - * @warning It's valid for non-equal objects to have the same hash code, so - * this test is stricter than it needs to be. However, this should happen - * relatively rarely. + * @warning It's valid for non-equal objects to have the same hash code, so this test is stricter + * than it needs to be. However, this should happen relatively rarely. */ private void checkNotEqual(Message m1, Message m2) { String equalsError = String.format("%s should not be equal to %s", m1, m2); @@ -535,7 +543,7 @@ public class AbstractMessageTest extends TestCase { public void testCheckByteStringIsUtf8OnNonUtf8() { ByteString byteString = - ByteString.copyFrom(new byte[]{(byte) 0x80}); // A lone continuation byte. + ByteString.copyFrom(new byte[] {(byte) 0x80}); // A lone continuation byte. try { AbstractMessageLite.checkByteStringIsUtf8(byteString); fail("Expected AbstractMessageLite.checkByteStringIsUtf8 to throw IllegalArgumentException"); @@ -543,5 +551,4 @@ public class AbstractMessageTest extends TestCase { assertEquals("Byte string is not UTF-8.", exception.getMessage()); } } - } diff --git a/java/core/src/test/java/com/google/protobuf/AnyTest.java b/java/core/src/test/java/com/google/protobuf/AnyTest.java index cf91ed91..2fe04a94 100644 --- a/java/core/src/test/java/com/google/protobuf/AnyTest.java +++ b/java/core/src/test/java/com/google/protobuf/AnyTest.java @@ -32,7 +32,7 @@ package com.google.protobuf; import any_test.AnyTestProto.TestAny; import protobuf_unittest.UnittestProto.TestAllTypes; - +import java.util.Objects; import junit.framework.TestCase; /** @@ -56,7 +56,7 @@ public class AnyTest extends TestCase { // Unpacking to a wrong type will throw an exception. try { - TestAny wrongMessage = container.getValue().unpack(TestAny.class); + container.getValue().unpack(TestAny.class); fail("Exception is expected."); } catch (InvalidProtocolBufferException e) { // expected. @@ -68,7 +68,7 @@ public class AnyTest extends TestCase { ByteString.copyFrom(new byte[]{0x11})); container = containerBuilder.build(); try { - TestAllTypes parsingFailed = container.getValue().unpack(TestAllTypes.class); + container.getValue().unpack(TestAllTypes.class); fail("Exception is expected."); } catch (InvalidProtocolBufferException e) { // expected. @@ -132,6 +132,6 @@ public class AnyTest extends TestCase { TestAllTypes result1 = container.getValue().unpack(TestAllTypes.class); TestAllTypes result2 = container.getValue().unpack(TestAllTypes.class); - assertTrue(result1 == result2); + assertTrue(Objects.equals(result1, result2)); } } diff --git a/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java b/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java index 4906763c..8ef8edd2 100644 --- a/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java @@ -45,8 +45,7 @@ import junit.framework.TestCase; */ public class BooleanArrayListTest extends TestCase { - private static final BooleanArrayList UNARY_LIST = - newImmutableBooleanArrayList(true); + private static final BooleanArrayList UNARY_LIST = newImmutableBooleanArrayList(true); private static final BooleanArrayList TERTIARY_LIST = newImmutableBooleanArrayList(true, false, true); @@ -78,10 +77,10 @@ public class BooleanArrayListTest extends TestCase { list.addAll(asList(true, false, true, false)); Iterator<Boolean> iterator = list.iterator(); assertEquals(4, list.size()); - assertEquals(true, (boolean) list.get(0)); - assertEquals(true, (boolean) iterator.next()); + assertTrue(list.get(0)); + assertTrue(iterator.next()); list.set(0, true); - assertEquals(false, (boolean) iterator.next()); + assertFalse(iterator.next()); list.remove(0); try { @@ -102,9 +101,9 @@ public class BooleanArrayListTest extends TestCase { } public void testGet() { - assertEquals(true, (boolean) TERTIARY_LIST.get(0)); - assertEquals(false, (boolean) TERTIARY_LIST.get(1)); - assertEquals(true, (boolean) TERTIARY_LIST.get(2)); + assertTrue(TERTIARY_LIST.get(0)); + assertFalse(TERTIARY_LIST.get(1)); + assertTrue(TERTIARY_LIST.get(2)); try { TERTIARY_LIST.get(-1); @@ -122,9 +121,9 @@ public class BooleanArrayListTest extends TestCase { } public void testGetBoolean() { - assertEquals(true, TERTIARY_LIST.getBoolean(0)); - assertEquals(false, TERTIARY_LIST.getBoolean(1)); - assertEquals(true, TERTIARY_LIST.getBoolean(2)); + assertTrue(TERTIARY_LIST.getBoolean(0)); + assertFalse(TERTIARY_LIST.getBoolean(1)); + assertTrue(TERTIARY_LIST.getBoolean(2)); try { TERTIARY_LIST.get(-1); @@ -163,11 +162,11 @@ public class BooleanArrayListTest extends TestCase { list.addBoolean(false); list.addBoolean(false); - assertEquals(false, (boolean) list.set(0, true)); - assertEquals(true, list.getBoolean(0)); + assertFalse(list.set(0, true)); + assertTrue(list.getBoolean(0)); - assertEquals(false, (boolean) list.set(1, false)); - assertEquals(false, list.getBoolean(1)); + assertFalse(list.set(1, false)); + assertFalse(list.getBoolean(1)); try { list.set(-1, false); @@ -188,11 +187,11 @@ public class BooleanArrayListTest extends TestCase { list.addBoolean(true); list.addBoolean(true); - assertEquals(true, list.setBoolean(0, false)); - assertEquals(false, list.getBoolean(0)); + assertTrue(list.setBoolean(0, false)); + assertFalse(list.getBoolean(0)); - assertEquals(true, list.setBoolean(1, false)); - assertEquals(false, list.getBoolean(1)); + assertTrue(list.setBoolean(1, false)); + assertFalse(list.getBoolean(1)); try { list.setBoolean(-1, false); @@ -226,8 +225,7 @@ public class BooleanArrayListTest extends TestCase { list.add(i % 2 == 0); } assertEquals( - asList(false, true, false, false, true, true, false, true, false, true, false), - list); + asList(false, true, false, false, true, true, false, true, false, true, false), list); try { list.add(-1, true); @@ -257,8 +255,8 @@ public class BooleanArrayListTest extends TestCase { assertTrue(list.addAll(Collections.singleton(true))); assertEquals(1, list.size()); - assertEquals(true, (boolean) list.get(0)); - assertEquals(true, list.getBoolean(0)); + assertTrue(list.get(0)); + assertTrue(list.getBoolean(0)); assertTrue(list.addAll(asList(false, true, false, true, false))); assertEquals(asList(true, false, true, false, true, false), list); @@ -272,7 +270,7 @@ public class BooleanArrayListTest extends TestCase { public void testRemove() { list.addAll(TERTIARY_LIST); - assertEquals(true, (boolean) list.remove(0)); + assertTrue(list.remove(0)); assertEquals(asList(false, true), list); assertTrue(list.remove(Boolean.TRUE)); @@ -281,7 +279,7 @@ public class BooleanArrayListTest extends TestCase { assertFalse(list.remove(Boolean.TRUE)); assertEquals(asList(false), list); - assertEquals(false, (boolean) list.remove(0)); + assertFalse(list.remove(0)); assertEquals(asList(), list); try { @@ -312,7 +310,7 @@ public class BooleanArrayListTest extends TestCase { assertEquals(0, toRemove.size()); } - private void assertImmutable(BooleanArrayList list) { + private void assertImmutable(BooleanList list) { try { list.add(true); diff --git a/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java b/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java index db10ee74..654d62bc 100644 --- a/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java +++ b/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java @@ -38,9 +38,9 @@ import java.io.ObjectOutputStream; import java.io.UnsupportedEncodingException; /** - * This class tests {@link BoundedByteString}, which extends {@link LiteralByteString}, - * by inheriting the tests from {@link LiteralByteStringTest}. The only method which - * is strange enough that it needs to be overridden here is {@link #testToString()}. + * This class tests {@link BoundedByteString}, which extends {@link LiteralByteString}, by + * inheriting the tests from {@link LiteralByteStringTest}. The only method which is strange enough + * that it needs to be overridden here is {@link #testToString()}. * * @author carlanton@google.com (Carl Haverl) */ @@ -63,12 +63,16 @@ public class BoundedByteStringTest extends LiteralByteStringTest { String testString = "I love unicode \u1234\u5678 characters"; ByteString unicode = ByteString.wrap(testString.getBytes(Internal.UTF_8)); ByteString chopped = unicode.substring(2, unicode.size() - 6); - assertEquals(classUnderTest + ".substring() must have the expected type", - classUnderTest, getActualClassName(chopped)); + assertEquals( + classUnderTest + ".substring() must have the expected type", + classUnderTest, + getActualClassName(chopped)); String roundTripString = chopped.toString(UTF_8); - assertEquals(classUnderTest + " unicode bytes must match", - testString.substring(2, testString.length() - 6), roundTripString); + assertEquals( + classUnderTest + " unicode bytes must match", + testString.substring(2, testString.length() - 6), + roundTripString); } @Override @@ -76,12 +80,16 @@ public class BoundedByteStringTest extends LiteralByteStringTest { String testString = "I love unicode \u1234\u5678 characters"; ByteString unicode = ByteString.wrap(testString.getBytes(Internal.UTF_8)); ByteString chopped = unicode.substring(2, unicode.size() - 6); - assertEquals(classUnderTest + ".substring() must have the expected type", - classUnderTest, getActualClassName(chopped)); + assertEquals( + classUnderTest + ".substring() must have the expected type", + classUnderTest, + getActualClassName(chopped)); String roundTripString = chopped.toString(Internal.UTF_8); - assertEquals(classUnderTest + " unicode bytes must match", - testString.substring(2, testString.length() - 6), roundTripString); + assertEquals( + classUnderTest + " unicode bytes must match", + testString.substring(2, testString.length() - 6), + roundTripString); } @Override diff --git a/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java b/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java index 6b1cfe78..5f0ef620 100644 --- a/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java +++ b/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java @@ -37,9 +37,7 @@ import java.util.Arrays; import java.util.Random; import junit.framework.TestCase; -/** - * Tests for {@link ByteBufferWriter}. - */ +/** Tests for {@link ByteBufferWriter}. */ public class ByteBufferWriterTest extends TestCase { public void testHeapBuffer() throws IOException { diff --git a/java/core/src/test/java/com/google/protobuf/ByteStringTest.java b/java/core/src/test/java/com/google/protobuf/ByteStringTest.java index be71f1f5..83b343ad 100644 --- a/java/core/src/test/java/com/google/protobuf/ByteStringTest.java +++ b/java/core/src/test/java/com/google/protobuf/ByteStringTest.java @@ -41,6 +41,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; @@ -86,25 +87,61 @@ public class ByteStringTest extends TestCase { return left.length == right.length && isArrayRange(left, right, 0, left.length); } + public void testCompare_equalByteStrings_compareEqual() throws Exception { + byte[] referenceBytes = getTestBytes(); + ByteString string1 = ByteString.copyFrom(referenceBytes); + ByteString string2 = ByteString.copyFrom(referenceBytes); + + assertEquals( + "ByteString instances containing the same data must compare equal.", + 0, + ByteString.unsignedLexicographicalComparator().compare(string1, string2)); + } + + public void testCompare_byteStringsSortLexicographically() throws Exception { + ByteString app = ByteString.copyFromUtf8("app"); + ByteString apple = ByteString.copyFromUtf8("apple"); + ByteString banana = ByteString.copyFromUtf8("banana"); + + Comparator<ByteString> comparator = ByteString.unsignedLexicographicalComparator(); + + assertTrue("ByteString(app) < ByteString(apple)", comparator.compare(app, apple) < 0); + assertTrue("ByteString(app) < ByteString(banana)", comparator.compare(app, banana) < 0); + assertTrue("ByteString(apple) < ByteString(banana)", comparator.compare(apple, banana) < 0); + } + + public void testCompare_interpretsByteValuesAsUnsigned() throws Exception { + // Two's compliment of `-1` == 0b11111111 == 255 + ByteString twoHundredFiftyFive = ByteString.copyFrom(new byte[] {-1}); + // 0b00000001 == 1 + ByteString one = ByteString.copyFrom(new byte[] {1}); + + assertTrue( + "ByteString comparison treats bytes as unsigned values", + ByteString.unsignedLexicographicalComparator().compare(one, twoHundredFiftyFive) < 0); + } + public void testSubstring_BeginIndex() { byte[] bytes = getTestBytes(); ByteString substring = ByteString.copyFrom(bytes).substring(500); - assertTrue("substring must contain the tail of the string", + assertTrue( + "substring must contain the tail of the string", isArrayRange(substring.toByteArray(), bytes, 500, bytes.length - 500)); } public void testCopyFrom_BytesOffsetSize() { byte[] bytes = getTestBytes(); ByteString byteString = ByteString.copyFrom(bytes, 500, 200); - assertTrue("copyFrom sub-range must contain the expected bytes", + assertTrue( + "copyFrom sub-range must contain the expected bytes", isArrayRange(byteString.toByteArray(), bytes, 500, 200)); } public void testCopyFrom_Bytes() { byte[] bytes = getTestBytes(); ByteString byteString = ByteString.copyFrom(bytes); - assertTrue("copyFrom must contain the expected bytes", - isArray(byteString.toByteArray(), bytes)); + assertTrue( + "copyFrom must contain the expected bytes", isArray(byteString.toByteArray(), bytes)); } public void testCopyFrom_ByteBufferSize() { @@ -113,7 +150,8 @@ public class ByteStringTest extends TestCase { byteBuffer.put(bytes); byteBuffer.position(500); ByteString byteString = ByteString.copyFrom(byteBuffer, 200); - assertTrue("copyFrom byteBuffer sub-range must contain the expected bytes", + assertTrue( + "copyFrom byteBuffer sub-range must contain the expected bytes", isArrayRange(byteString.toByteArray(), bytes, 500, 200)); } @@ -123,7 +161,8 @@ public class ByteStringTest extends TestCase { byteBuffer.put(bytes); byteBuffer.position(500); ByteString byteString = ByteString.copyFrom(byteBuffer); - assertTrue("copyFrom byteBuffer sub-range must contain the expected bytes", + assertTrue( + "copyFrom byteBuffer sub-range must contain the expected bytes", isArrayRange(byteString.toByteArray(), bytes, 500, bytes.length - 500)); } @@ -131,7 +170,8 @@ public class ByteStringTest extends TestCase { String testString = "I love unicode \u1234\u5678 characters"; ByteString byteString = ByteString.copyFrom(testString, UTF_16); byte[] testBytes = testString.getBytes(UTF_16); - assertTrue("copyFrom string must respect the charset", + assertTrue( + "copyFrom string must respect the charset", isArrayRange(byteString.toByteArray(), testBytes, 0, testBytes.length)); } @@ -139,7 +179,8 @@ public class ByteStringTest extends TestCase { String testString = "I love unicode \u1234\u5678 characters"; ByteString byteString = ByteString.copyFromUtf8(testString); byte[] testBytes = testString.getBytes(Internal.UTF_8); - assertTrue("copyFromUtf8 string must respect the charset", + assertTrue( + "copyFromUtf8 string must respect the charset", isArrayRange(byteString.toByteArray(), testBytes, 0, testBytes.length)); } @@ -148,17 +189,48 @@ public class ByteStringTest extends TestCase { final List<ByteString> pieces = makeConcretePieces(testBytes); // Call copyFrom() on a Collection ByteString byteString = ByteString.copyFrom(pieces); - assertTrue("copyFrom a List must contain the expected bytes", + assertTrue( + "copyFrom a List must contain the expected bytes", isArrayRange(byteString.toByteArray(), testBytes, 0, testBytes.length)); // Call copyFrom on an iteration that's not a collection - ByteString byteStringAlt = ByteString.copyFrom(new Iterable<ByteString>() { - @Override - public Iterator<ByteString> iterator() { - return pieces.iterator(); - } - }); - assertEquals("copyFrom from an Iteration must contain the expected bytes", - byteString, byteStringAlt); + ByteString byteStringAlt = + ByteString.copyFrom( + new Iterable<ByteString>() { + @Override + public Iterator<ByteString> iterator() { + return pieces.iterator(); + } + }); + assertEquals( + "copyFrom from an Iteration must contain the expected bytes", byteString, byteStringAlt); + } + + public void testCopyFrom_LengthTooBig() { + byte[] testBytes = getTestBytes(100); + try { + ByteString.copyFrom(testBytes, 0, 200); + fail("Should throw"); + } catch (IndexOutOfBoundsException expected) { + } + + try { + ByteString.copyFrom(testBytes, 99, 2); + fail(); + } catch (IndexOutOfBoundsException expected) { + } + + ByteBuffer buf = ByteBuffer.wrap(testBytes); + try { + ByteString.copyFrom(buf, 101); + fail(); + } catch (IndexOutOfBoundsException expected) { + } + + try { + ByteString.copyFrom(testBytes, -1, 10); + fail("Should throw"); + } catch (IndexOutOfBoundsException expected) { + } } public void testCopyTo_TargetOffset() { @@ -166,15 +238,17 @@ public class ByteStringTest extends TestCase { ByteString byteString = ByteString.copyFrom(bytes); byte[] target = new byte[bytes.length + 1000]; byteString.copyTo(target, 400); - assertTrue("copyFrom byteBuffer sub-range must contain the expected bytes", + assertTrue( + "copyFrom byteBuffer sub-range must contain the expected bytes", isArrayRange(bytes, target, 400, bytes.length)); } public void testReadFrom_emptyStream() throws IOException { - ByteString byteString = - ByteString.readFrom(new ByteArrayInputStream(new byte[0])); - assertSame("reading an empty stream must result in the EMPTY constant " - + "byte string", ByteString.EMPTY, byteString); + ByteString byteString = ByteString.readFrom(new ByteArrayInputStream(new byte[0])); + assertSame( + "reading an empty stream must result in the EMPTY constant byte string", + ByteString.EMPTY, + byteString); } public void testReadFrom_smallStream() throws IOException { @@ -182,18 +256,18 @@ public class ByteStringTest extends TestCase { } public void testReadFrom_mutating() throws IOException { - byte[] capturedArray = null; EvilInputStream eis = new EvilInputStream(); ByteString byteString = ByteString.readFrom(eis); + byte[] capturedArray = eis.capturedArray; - capturedArray = eis.capturedArray; byte[] originalValue = byteString.toByteArray(); for (int x = 0; x < capturedArray.length; ++x) { capturedArray[x] = (byte) 0; } byte[] newValue = byteString.toByteArray(); - assertTrue("copyFrom byteBuffer must not grant access to underlying array", + assertTrue( + "copyFrom byteBuffer must not grant access to underlying array", Arrays.equals(originalValue, newValue)); } @@ -255,8 +329,8 @@ public class ByteStringTest extends TestCase { fail("readFrom must throw the underlying IOException"); } catch (IOException e) { - assertEquals("readFrom must throw the expected exception", - "synthetic failure", e.getMessage()); + assertEquals( + "readFrom must throw the expected exception", "synthetic failure", e.getMessage()); } } @@ -266,7 +340,8 @@ public class ByteStringTest extends TestCase { final byte[] data = getTestBytes(0x1000); ByteString byteString = ByteString.readFrom(new ReluctantStream(data)); - assertTrue("readFrom byte stream must contain the expected bytes", + assertTrue( + "readFrom byte stream must contain the expected bytes", isArray(byteString.toByteArray(), data)); // Same test as above, but with some specific chunk sizes. @@ -281,11 +356,10 @@ public class ByteStringTest extends TestCase { // Fails unless ByteString.readFrom reads the bytes correctly from a // reluctant stream with the given chunkSize parameter. - private void assertReadFromReluctantStream(byte[] bytes, int chunkSize) - throws IOException { + private void assertReadFromReluctantStream(byte[] bytes, int chunkSize) throws IOException { ByteString b = ByteString.readFrom(new ReluctantStream(bytes), chunkSize); - assertTrue("readFrom byte stream must contain the expected bytes", - isArray(b.toByteArray(), bytes)); + assertTrue( + "readFrom byte stream must contain the expected bytes", isArray(b.toByteArray(), bytes)); } // Tests that ByteString.readFrom works with streams that implement @@ -294,21 +368,23 @@ public class ByteStringTest extends TestCase { final byte[] data = getTestBytes(0x1001); ByteString byteString = ByteString.readFrom(new AvailableStream(data)); - assertTrue("readFrom byte stream must contain the expected bytes", + assertTrue( + "readFrom byte stream must contain the expected bytes", isArray(byteString.toByteArray(), data)); } // Fails unless ByteString.readFrom reads the bytes correctly. private void assertReadFrom(byte[] bytes) throws IOException { - ByteString byteString = - ByteString.readFrom(new ByteArrayInputStream(bytes)); - assertTrue("readFrom byte stream must contain the expected bytes", + ByteString byteString = ByteString.readFrom(new ByteArrayInputStream(bytes)); + assertTrue( + "readFrom byte stream must contain the expected bytes", isArray(byteString.toByteArray(), bytes)); } // A stream that fails when read. private static final class FailStream extends InputStream { - @Override public int read() throws IOException { + @Override + public int read() throws IOException { throw new IOException("synthetic failure"); } } @@ -323,7 +399,8 @@ public class ByteStringTest extends TestCase { this.data = data; } - @Override public int read() { + @Override + public int read() { if (pos == data.length) { return -1; } else { @@ -331,11 +408,13 @@ public class ByteStringTest extends TestCase { } } - @Override public int read(byte[] buf) { + @Override + public int read(byte[] buf) { return read(buf, 0, buf.length); } - @Override public int read(byte[] buf, int offset, int size) { + @Override + public int read(byte[] buf, int offset, int size) { if (pos == data.length) { return -1; } @@ -352,7 +431,8 @@ public class ByteStringTest extends TestCase { super(data); } - @Override public int available() { + @Override + public int available() { return Math.min(250, data.length - pos); } } @@ -402,8 +482,8 @@ public class ByteStringTest extends TestCase { String testString = "I love unicode \u1234\u5678 characters"; byte[] testBytes = testString.getBytes(Internal.UTF_8); ByteString byteString = ByteString.copyFrom(testBytes); - assertEquals("copyToStringUtf8 must respect the charset", - testString, byteString.toStringUtf8()); + assertEquals( + "copyToStringUtf8 must respect the charset", testString, byteString.toStringUtf8()); } public void testNewOutput_InitialCapacity() throws IOException { @@ -421,8 +501,9 @@ public class ByteStringTest extends TestCase { public void testNewOutput_ArrayWrite() { byte[] bytes = getTestBytes(); int length = bytes.length; - int[] bufferSizes = {128, 256, length / 2, length - 1, length, length + 1, - 2 * length, 3 * length}; + int[] bufferSizes = { + 128, 256, length / 2, length - 1, length, length + 1, 2 * length, 3 * length + }; int[] writeSizes = {1, 4, 5, 7, 23, bytes.length}; for (int bufferSize : bufferSizes) { @@ -433,7 +514,8 @@ public class ByteStringTest extends TestCase { output.write(bytes, i, Math.min(writeSize, length - i)); } ByteString byteString = output.toByteString(); - assertTrue("String built from newOutput() must contain the expected bytes", + assertTrue( + "String built from newOutput() must contain the expected bytes", isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length)); } } @@ -444,16 +526,17 @@ public class ByteStringTest extends TestCase { public void testNewOutput_WriteChar() { byte[] bytes = getTestBytes(); int length = bytes.length; - int[] bufferSizes = {0, 1, 128, 256, length / 2, - length - 1, length, length + 1, - 2 * length, 3 * length}; + int[] bufferSizes = { + 0, 1, 128, 256, length / 2, length - 1, length, length + 1, 2 * length, 3 * length + }; for (int bufferSize : bufferSizes) { ByteString.Output output = ByteString.newOutput(bufferSize); for (byte byteValue : bytes) { output.write(byteValue); } ByteString byteString = output.toByteString(); - assertTrue("String built from newOutput() must contain the expected bytes", + assertTrue( + "String built from newOutput() must contain the expected bytes", isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length)); } } @@ -464,9 +547,9 @@ public class ByteStringTest extends TestCase { Random rng = new Random(1); byte[] bytes = getTestBytes(); int length = bytes.length; - int[] bufferSizes = {0, 1, 128, 256, length / 2, - length - 1, length, length + 1, - 2 * length, 3 * length}; + int[] bufferSizes = { + 0, 1, 128, 256, length / 2, length - 1, length, length + 1, 2 * length, 3 * length + }; for (int bufferSize : bufferSizes) { // Test writing the entire output using a mixture of write sizes and @@ -483,12 +566,13 @@ public class ByteStringTest extends TestCase { position++; } assertEquals("size() returns the right value", position, output.size()); - assertTrue("newOutput() substring must have correct bytes", - isArrayRange(output.toByteString().toByteArray(), - bytes, 0, position)); + assertTrue( + "newOutput() substring must have correct bytes", + isArrayRange(output.toByteString().toByteArray(), bytes, 0, position)); } ByteString byteString = output.toByteString(); - assertTrue("String built from newOutput() must contain the expected bytes", + assertTrue( + "String built from newOutput() must contain the expected bytes", isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length)); } } @@ -509,7 +593,8 @@ public class ByteStringTest extends TestCase { byte[] oldValue = byteString.toByteArray(); Arrays.fill(capturedArray, (byte) 0); byte[] newValue = byteString.toByteArray(); - assertTrue("Output must not provide access to the underlying byte array", + assertTrue( + "Output must not provide access to the underlying byte array", Arrays.equals(oldValue, newValue)); } @@ -518,14 +603,15 @@ public class ByteStringTest extends TestCase { ByteString.CodedBuilder builder = ByteString.newCodedBuilder(bytes.length); builder.getCodedOutput().writeRawBytes(bytes); ByteString byteString = builder.build(); - assertTrue("String built from newCodedBuilder() must contain the expected bytes", + assertTrue( + "String built from newCodedBuilder() must contain the expected bytes", isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length)); } public void testSubstringParity() { byte[] bigBytes = getTestBytes(2048 * 1024, 113344L); int start = 512 * 1024 - 3333; - int end = 512 * 1024 + 7777; + int end = 512 * 1024 + 7777; ByteString concreteSubstring = ByteString.copyFrom(bigBytes).substring(start, end); boolean ok = true; for (int i = start; ok && i < end; ++i) { @@ -534,10 +620,11 @@ public class ByteStringTest extends TestCase { assertTrue("Concrete substring didn't capture the right bytes", ok); ByteString literalString = ByteString.copyFrom(bigBytes, start, end - start); - assertTrue("Substring must be equal to literal string", - concreteSubstring.equals(literalString)); - assertEquals("Substring must have same hashcode as literal string", - literalString.hashCode(), concreteSubstring.hashCode()); + assertEquals("Substring must be equal to literal string", literalString, concreteSubstring); + assertEquals( + "Substring must have same hashcode as literal string", + literalString.hashCode(), + concreteSubstring.hashCode()); } public void testCompositeSubstring() { @@ -563,15 +650,22 @@ public class ByteStringTest extends TestCase { assertTrue("Substring must support byteAt() correctly", stillEqual); ByteString literalSubstring = ByteString.copyFrom(referenceBytes, from, to - from); - assertTrue("Composite substring must equal a literal substring over the same bytes", - compositeSubstring.equals(literalSubstring)); - assertTrue("Literal substring must equal a composite substring over the same bytes", - literalSubstring.equals(compositeSubstring)); - - assertEquals("We must get the same hashcodes for composite and literal substrings", - literalSubstring.hashCode(), compositeSubstring.hashCode()); - - assertFalse("We can't be equal to a proper substring", + assertEquals( + "Composite substring must equal a literal substring over the same bytes", + literalSubstring, + compositeSubstring); + assertEquals( + "Literal substring must equal a composite substring over the same bytes", + compositeSubstring, + literalSubstring); + + assertEquals( + "We must get the same hashcodes for composite and literal substrings", + literalSubstring.hashCode(), + compositeSubstring.hashCode()); + + assertFalse( + "We can't be equal to a proper substring", compositeSubstring.equals(literalSubstring.substring(0, literalSubstring.size() - 1))); } @@ -582,10 +676,11 @@ public class ByteStringTest extends TestCase { List<ByteString> pieces = makeConcretePieces(referenceBytes); ByteString listString = ByteString.copyFrom(pieces); - assertTrue("Composite string must be equal to literal string", - listString.equals(literalString)); - assertEquals("Composite string must have same hashcode as literal string", - literalString.hashCode(), listString.hashCode()); + assertEquals("Composite string must be equal to literal string", literalString, listString); + assertEquals( + "Composite string must have same hashcode as literal string", + literalString.hashCode(), + listString.hashCode()); } public void testConcat() { @@ -600,30 +695,34 @@ public class ByteStringTest extends TestCase { concatenatedString = concatenatedString.concat(iter.next()); } - assertTrue("Concatenated string must be equal to literal string", - concatenatedString.equals(literalString)); - assertEquals("Concatenated string must have same hashcode as literal string", - literalString.hashCode(), concatenatedString.hashCode()); + assertEquals( + "Concatenated string must be equal to literal string", literalString, concatenatedString); + assertEquals( + "Concatenated string must have same hashcode as literal string", + literalString.hashCode(), + concatenatedString.hashCode()); } /** - * Test the Rope implementation can deal with Empty nodes, even though we - * guard against them. See also {@link LiteralByteStringTest#testConcat_empty()}. + * Test the Rope implementation can deal with Empty nodes, even though we guard against them. See + * also {@link LiteralByteStringTest#testConcat_empty()}. */ public void testConcat_empty() { byte[] referenceBytes = getTestBytes(7748, 113344L); ByteString literalString = ByteString.copyFrom(referenceBytes); ByteString duo = RopeByteString.newInstanceForTest(literalString, literalString); - ByteString temp = RopeByteString.newInstanceForTest( - RopeByteString.newInstanceForTest(literalString, ByteString.EMPTY), - RopeByteString.newInstanceForTest(ByteString.EMPTY, literalString)); + ByteString temp = + RopeByteString.newInstanceForTest( + RopeByteString.newInstanceForTest(literalString, ByteString.EMPTY), + RopeByteString.newInstanceForTest(ByteString.EMPTY, literalString)); ByteString quintet = RopeByteString.newInstanceForTest(temp, ByteString.EMPTY); - assertTrue("String with concatenated nulls must equal simple concatenate", - duo.equals(quintet)); - assertEquals("String with concatenated nulls have same hashcode as simple concatenate", - duo.hashCode(), quintet.hashCode()); + assertEquals("String with concatenated nulls must equal simple concatenate", quintet, duo); + assertEquals( + "String with concatenated nulls have same hashcode as simple concatenate", + duo.hashCode(), + quintet.hashCode()); ByteString.ByteIterator duoIter = duo.iterator(); ByteString.ByteIterator quintetIter = quintet.iterator(); @@ -653,11 +752,13 @@ public class ByteStringTest extends TestCase { // It is possible, using the testing factory method to create deeply nested // trees of empty leaves, to make a string that will fail this test. for (int i = 1; i < duo.size(); ++i) { - assertTrue("Substrings of size() < 2 must not be RopeByteStrings", + assertTrue( + "Substrings of size() < 2 must not be RopeByteStrings", duo.substring(i - 1, i) instanceof ByteString.LeafByteString); } for (int i = 1; i < quintet.size(); ++i) { - assertTrue("Substrings of size() < 2 must not be RopeByteStrings", + assertTrue( + "Substrings of size() < 2 must not be RopeByteStrings", quintet.substring(i - 1, i) instanceof ByteString.LeafByteString); } } @@ -706,8 +807,7 @@ public class ByteStringTest extends TestCase { return pieces; } - private byte[] substringUsingWriteTo( - ByteString data, int offset, int length) throws IOException { + private byte[] substringUsingWriteTo(ByteString data, int offset, int length) throws IOException { ByteArrayOutputStream output = new ByteArrayOutputStream(); data.writeTo(output, offset, length); return output.toByteArray(); @@ -718,9 +818,7 @@ public class ByteStringTest extends TestCase { // won't be merged into one byte array due to some optimizations. final int dataSize = ByteString.CONCATENATE_BY_COPY_SIZE + 1; byte[] data1 = new byte[dataSize]; - for (int i = 0; i < data1.length; i++) { - data1[i] = (byte) 1; - } + Arrays.fill(data1, (byte) 1); data1[1] = (byte) 11; // Test LiteralByteString.writeTo(OutputStream,int,int) ByteString left = ByteString.wrap(data1); @@ -729,9 +827,7 @@ public class ByteStringTest extends TestCase { assertEquals((byte) 11, result[0]); byte[] data2 = new byte[dataSize]; - for (int i = 0; i < data1.length; i++) { - data2[i] = (byte) 2; - } + Arrays.fill(data2, 0, data1.length, (byte) 2); ByteString right = ByteString.wrap(data2); // Concatenate two ByteStrings to create a RopeByteString. ByteString root = left.concat(right); @@ -756,11 +852,12 @@ public class ByteStringTest extends TestCase { assertEquals((byte) 2, result[dataSize - dataSize / 2]); assertEquals((byte) 2, result[dataSize - 1]); } - - /** - * Tests ByteString uses Arrays based byte copier when running under Hotstop VM. - */ + + /** Tests ByteString uses Arrays based byte copier when running under Hotstop VM. */ public void testByteArrayCopier() throws Exception { + if (Android.isOnAndroidDevice()) { + return; + } Field field = ByteString.class.getDeclaredField("byteArrayCopier"); field.setAccessible(true); Object byteArrayCopier = field.get(null); diff --git a/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java b/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java index 50b87ae3..e276225e 100644 --- a/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java +++ b/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java @@ -38,22 +38,21 @@ import java.io.ByteArrayInputStream; import junit.framework.TestCase; /** - * Test that protos generated with file option java_string_check_utf8 do in - * fact perform appropriate UTF-8 checks. + * Test that protos generated with file option java_string_check_utf8 do in fact perform appropriate + * UTF-8 checks. * * @author jbaum@google.com (Jacob Butcher) */ public class CheckUtf8Test extends TestCase { private static final String UTF8_BYTE_STRING_TEXT = "some text"; - private static final ByteString UTF8_BYTE_STRING = - ByteString.copyFromUtf8(UTF8_BYTE_STRING_TEXT); + private static final ByteString UTF8_BYTE_STRING = ByteString.copyFromUtf8(UTF8_BYTE_STRING_TEXT); private static final ByteString NON_UTF8_BYTE_STRING = - ByteString.copyFrom(new byte[]{(byte) 0x80}); // A lone continuation byte. + ByteString.copyFrom(new byte[] {(byte) 0x80}); // A lone continuation byte. public void testBuildRequiredStringWithGoodUtf8() throws Exception { - assertEquals(UTF8_BYTE_STRING_TEXT, - StringWrapper.newBuilder().setReqBytes(UTF8_BYTE_STRING).getReq()); + assertEquals( + UTF8_BYTE_STRING_TEXT, StringWrapper.newBuilder().setReqBytes(UTF8_BYTE_STRING).getReq()); } public void testParseRequiredStringWithGoodUtf8() throws Exception { diff --git a/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java b/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java index 5ea6b79c..f64df334 100644 --- a/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java +++ b/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java @@ -699,7 +699,7 @@ public class CodedInputStreamTest extends TestCase { } assertEquals(true, input.isAtEnd()); } catch (Exception e) { - fail("Catch exception in the testIsAtEnd"); + throw new AssertionError("Catch exception in the testIsAtEnd", e); } } diff --git a/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java b/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java index 78f415c2..8dc3e4ce 100644 --- a/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java +++ b/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java @@ -257,13 +257,27 @@ public class CodedOutputStreamTest extends TestCase { // 41256202580718336 assertWriteVarint( bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49), - (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) | (0x43L << 28) | (0x49L << 35) - | (0x24L << 42) | (0x49L << 49)); + (0x00 << 0) + | (0x66 << 7) + | (0x6b << 14) + | (0x1c << 21) + | (0x43L << 28) + | (0x49L << 35) + | (0x24L << 42) + | (0x49L << 49)); // 11964378330978735131 assertWriteVarint( bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01), - (0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) | (0x3bL << 28) | (0x56L << 35) - | (0x00L << 42) | (0x05L << 49) | (0x26L << 56) | (0x01L << 63)); + (0x1b << 0) + | (0x28 << 7) + | (0x79 << 14) + | (0x42 << 21) + | (0x3bL << 28) + | (0x56L << 35) + | (0x00L << 42) + | (0x05L << 49) + | (0x26L << 56) + | (0x01L << 63)); } /** Tests writeRawLittleEndian32() and writeRawLittleEndian64(). */ @@ -344,8 +358,8 @@ public class CodedOutputStreamTest extends TestCase { } /** - * Tests writing a whole message with every packed field type. Ensures the - * wire format of packed fields is compatible with C++. + * Tests writing a whole message with every packed field type. Ensures the wire format of packed + * fields is compatible with C++. */ public void testWriteWholePackedFieldsMessage() throws Exception { byte[] expectedBytes = TestUtil.getGoldenPackedFieldsMessage().toByteArray(); @@ -361,8 +375,8 @@ public class CodedOutputStreamTest extends TestCase { } /** - * Test writing a message containing a negative enum value. This used to - * fail because the size was not properly computed as a sign-extended varint. + * Test writing a message containing a negative enum value. This used to fail because the size was + * not properly computed as a sign-extended varint. */ public void testWriteMessageWithNegativeEnumValue() throws Exception { SparseEnumMessage message = @@ -394,8 +408,9 @@ public class CodedOutputStreamTest extends TestCase { String string = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"; // Ensure we take the slower fast path. - assertTrue(CodedOutputStream.computeUInt32SizeNoTag(string.length()) - != CodedOutputStream.computeUInt32SizeNoTag(string.length() * Utf8.MAX_BYTES_PER_CHAR)); + assertTrue( + CodedOutputStream.computeUInt32SizeNoTag(string.length()) + != CodedOutputStream.computeUInt32SizeNoTag(string.length() * Utf8.MAX_BYTES_PER_CHAR)); coder.stream().writeStringNoTag(string); coder.stream().flush(); @@ -438,9 +453,7 @@ public class CodedOutputStreamTest extends TestCase { } final int length2 = 8 * 1024; byte[] data = new byte[length2]; - for (int i = 0; i < length2; i++) { - data[i] = (byte) 2; - } + Arrays.fill(data, 0, length2, (byte) 2); codedStream.writeRawBytes(data); final int length3 = bufferSize - length1 - length2; for (int i = 0; i < length3; i++) { @@ -521,10 +534,14 @@ public class CodedOutputStreamTest extends TestCase { } public void testSerializeInvalidUtf8() throws Exception { - String[] invalidStrings = new String[] {newString(Character.MIN_HIGH_SURROGATE), - "foobar" + newString(Character.MIN_HIGH_SURROGATE), newString(Character.MIN_LOW_SURROGATE), - "foobar" + newString(Character.MIN_LOW_SURROGATE), - newString(Character.MIN_HIGH_SURROGATE, Character.MIN_HIGH_SURROGATE)}; + String[] invalidStrings = + new String[] { + newString(Character.MIN_HIGH_SURROGATE), + "foobar" + newString(Character.MIN_HIGH_SURROGATE), + newString(Character.MIN_LOW_SURROGATE), + "foobar" + newString(Character.MIN_LOW_SURROGATE), + newString(Character.MIN_HIGH_SURROGATE, Character.MIN_HIGH_SURROGATE) + }; CodedOutputStream outputWithStream = CodedOutputStream.newInstance(new ByteArrayOutputStream()); CodedOutputStream outputWithArray = CodedOutputStream.newInstance(new byte[10000]); @@ -562,7 +579,7 @@ public class CodedOutputStreamTest extends TestCase { } } - /** Regression test for https://github.com/google/protobuf/issues/292 */ + /** Regression test for https://github.com/protocolbuffers/protobuf/issues/292 */ public void testCorrectExceptionThrowWhenEncodingStringsWithoutEnoughSpace() throws Exception { String testCase = "Foooooooo"; assertEquals( @@ -594,16 +611,17 @@ public class CodedOutputStreamTest extends TestCase { // with ASCII and Unicode characters requiring different UTF-8 byte counts per // char, hence causing the length delimiter varint to sometimes require more // bytes for the Unicode strings than the ASCII string of the same length. - int[] lengths = new int[] { - 0, - 1, - (1 << 4) - 1, // 1 byte for ASCII and Unicode - (1 << 7) - 1, // 1 byte for ASCII, 2 bytes for Unicode - (1 << 11) - 1, // 2 bytes for ASCII and Unicode - (1 << 14) - 1, // 2 bytes for ASCII, 3 bytes for Unicode - (1 << 17) - 1, - // 3 bytes for ASCII and Unicode - }; + int[] lengths = + new int[] { + 0, + 1, + (1 << 4) - 1, // 1 byte for ASCII and Unicode + (1 << 7) - 1, // 1 byte for ASCII, 2 bytes for Unicode + (1 << 11) - 1, // 2 bytes for ASCII and Unicode + (1 << 14) - 1, // 2 bytes for ASCII, 3 bytes for Unicode + (1 << 17) - 1, + // 3 bytes for ASCII and Unicode + }; for (OutputType outputType : OutputType.values()) { for (int i : lengths) { testEncodingOfString(outputType, 'q', i); // 1 byte per char @@ -626,8 +644,8 @@ public class CodedOutputStreamTest extends TestCase { } /** - * Parses the given bytes using writeRawLittleEndian32() and checks - * that the result matches the given value. + * Parses the given bytes using writeRawLittleEndian32() and checks that the result matches the + * given value. */ private static void assertWriteLittleEndian32(byte[] data, int value) throws Exception { for (OutputType outputType : OutputType.values()) { @@ -647,8 +665,8 @@ public class CodedOutputStreamTest extends TestCase { } /** - * Parses the given bytes using writeRawLittleEndian64() and checks - * that the result matches the given value. + * Parses the given bytes using writeRawLittleEndian64() and checks that the result matches the + * given value. */ private static void assertWriteLittleEndian64(byte[] data, long value) throws Exception { for (OutputType outputType : OutputType.values()) { @@ -691,9 +709,8 @@ public class CodedOutputStreamTest extends TestCase { } /** - * Helper to construct a byte array from a bunch of bytes. The inputs are - * actually ints so that I can use hex notation and not get stupid errors - * about precision. + * Helper to construct a byte array from a bunch of bytes. The inputs are actually ints so that I + * can use hex notation and not get stupid errors about precision. */ private static byte[] bytes(int... bytesAsInts) { byte[] bytes = new byte[bytesAsInts.length]; @@ -703,7 +720,7 @@ public class CodedOutputStreamTest extends TestCase { return bytes; } - /** Arrays.asList() does not work with arrays of primitives. :( */ + /** Arrays.asList() does not work with arrays of primitives. :( */ private static List<Byte> toList(byte[] bytes) { List<Byte> result = new ArrayList<Byte>(); for (byte b : bytes) { @@ -717,8 +734,8 @@ public class CodedOutputStreamTest extends TestCase { } /** - * Writes the given value using writeRawVarint32() and writeRawVarint64() and - * checks that the result matches the given bytes. + * Writes the given value using writeRawVarint32() and writeRawVarint64() and checks that the + * result matches the given bytes. */ private static void assertWriteVarint(byte[] data, long value) throws Exception { for (OutputType outputType : OutputType.values()) { diff --git a/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java b/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java index 9c0997c4..2addde84 100644 --- a/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java +++ b/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java @@ -41,35 +41,28 @@ import junit.framework.TestCase; * @author birdo@google.com (Roberto Scaramuzzi) */ public class DeprecatedFieldTest extends TestCase { - private String[] deprecatedGetterNames = { - "hasDeprecatedInt32", - "getDeprecatedInt32"}; + private String[] deprecatedGetterNames = {"hasDeprecatedInt32", "getDeprecatedInt32"}; private String[] deprecatedBuilderGetterNames = { - "hasDeprecatedInt32", - "getDeprecatedInt32", - "clearDeprecatedInt32"}; + "hasDeprecatedInt32", "getDeprecatedInt32", "clearDeprecatedInt32" + }; - private String[] deprecatedBuilderSetterNames = { - "setDeprecatedInt32"}; + private String[] deprecatedBuilderSetterNames = {"setDeprecatedInt32"}; public void testDeprecatedField() throws Exception { Class<?> deprecatedFields = TestDeprecatedFields.class; Class<?> deprecatedFieldsBuilder = TestDeprecatedFields.Builder.class; for (String name : deprecatedGetterNames) { Method method = deprecatedFields.getMethod(name); - assertTrue("Method " + name + " should be deprecated", - isDeprecated(method)); + assertTrue("Method " + name + " should be deprecated", isDeprecated(method)); } for (String name : deprecatedBuilderGetterNames) { Method method = deprecatedFieldsBuilder.getMethod(name); - assertTrue("Method " + name + " should be deprecated", - isDeprecated(method)); + assertTrue("Method " + name + " should be deprecated", isDeprecated(method)); } for (String name : deprecatedBuilderSetterNames) { Method method = deprecatedFieldsBuilder.getMethod(name, int.class); - assertTrue("Method " + name + " should be deprecated", - isDeprecated(method)); + assertTrue("Method " + name + " should be deprecated", isDeprecated(method)); } } @@ -77,8 +70,7 @@ public class DeprecatedFieldTest extends TestCase { Class<?> oneofCase = TestDeprecatedFields.OneofFieldsCase.class; String name = "DEPRECATED_INT32_IN_ONEOF"; java.lang.reflect.Field enumValue = oneofCase.getField(name); - assertTrue("Enum value " + name + " should be deprecated.", - isDeprecated(enumValue)); + assertTrue("Enum value " + name + " should be deprecated.", isDeprecated(enumValue)); } private boolean isDeprecated(AnnotatedElement annotated) { diff --git a/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java b/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java index 0f09a51b..01a96ba5 100644 --- a/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java +++ b/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java @@ -43,15 +43,13 @@ import org.junit.runners.JUnit4; public class DiscardUnknownFieldsTest { @Test public void testProto2() throws Exception { + testProto2Message(UnittestProto.TestEmptyMessage.getDefaultInstance()); + testProto2Message(UnittestProto.TestEmptyMessageWithExtensions.getDefaultInstance()); testProto2Message( - UnittestProto.TestEmptyMessage.getDefaultInstance()); + DynamicMessage.getDefaultInstance(UnittestProto.TestEmptyMessage.getDescriptor())); testProto2Message( - UnittestProto.TestEmptyMessageWithExtensions.getDefaultInstance()); - testProto2Message( - DynamicMessage.getDefaultInstance(UnittestProto.TestEmptyMessage.getDescriptor())); - testProto2Message( - DynamicMessage.getDefaultInstance( - UnittestProto.TestEmptyMessageWithExtensions.getDescriptor())); + DynamicMessage.getDefaultInstance( + UnittestProto.TestEmptyMessageWithExtensions.getDescriptor())); } @Test @@ -62,22 +60,17 @@ public class DiscardUnknownFieldsTest { } private static void testProto2Message(Message message) throws Exception { - assertUnknownFieldsDefaultPreserved(message); + assertUnknownFieldsPreserved(message); assertUnknownFieldsExplicitlyDiscarded(message); assertReuseCodedInputStreamPreserve(message); assertUnknownFieldsInUnknownFieldSetArePreserve(message); } private static void testProto3Message(Message message) throws Exception { - CodedInputStream.setProto3KeepUnknownsByDefaultForTest(); - assertUnknownFieldsDefaultPreserved(message); + assertUnknownFieldsPreserved(message); assertUnknownFieldsExplicitlyDiscarded(message); assertReuseCodedInputStreamPreserve(message); assertUnknownFieldsInUnknownFieldSetArePreserve(message); - CodedInputStream.setProto3DiscardUnknownsByDefaultForTest(); - assertUnknownFieldsDefaultDiscarded(message); - assertUnknownFieldsExplicitlyDiscarded(message); - assertUnknownFieldsInUnknownFieldSetAreDiscarded(message); } private static void assertReuseCodedInputStreamPreserve(Message message) throws Exception { @@ -86,18 +79,16 @@ public class DiscardUnknownFieldsTest { payload.copyTo(copied, 0); payload.copyTo(copied, messageSize); CodedInputStream input = CodedInputStream.newInstance(copied); - { - // Use DiscardUnknownFieldsParser to parse the first payload. - int oldLimit = input.pushLimit(messageSize); - Message parsed = DiscardUnknownFieldsParser.wrap(message.getParserForType()).parseFrom(input); - assertEquals(message.getClass().getName(), 0, parsed.getSerializedSize()); - input.popLimit(oldLimit); - } - { - // Use the normal parser to parse the remaining payload should have unknown fields preserved. - Message parsed = message.getParserForType().parseFrom(input); - assertEquals(message.getClass().getName(), payload, parsed.toByteString()); - } + + // Use DiscardUnknownFieldsParser to parse the first payload. + int oldLimit = input.pushLimit(messageSize); + Message parsed = DiscardUnknownFieldsParser.wrap(message.getParserForType()).parseFrom(input); + assertEquals(message.getClass().getName(), 0, parsed.getSerializedSize()); + input.popLimit(oldLimit); + + // Use the normal parser to parse the remaining payload should have unknown fields preserved. + parsed = message.getParserForType().parseFrom(input); + assertEquals(message.getClass().getName(), payload, parsed.toByteString()); } /** @@ -109,46 +100,18 @@ public class DiscardUnknownFieldsTest { UnknownFieldSet unknownFields = UnknownFieldSet.newBuilder().mergeFrom(payload).build(); Message built = message.newBuilderForType().setUnknownFields(unknownFields).build(); assertEquals(message.getClass().getName(), payload, built.toByteString()); - - } - /** - * {@link Message.Builder#setUnknownFields(UnknownFieldSet)} and {@link - * Message.Builder#mergeUnknownFields(UnknownFieldSet)} should discard the unknown fields. - */ - private static void assertUnknownFieldsInUnknownFieldSetAreDiscarded(Message message) - throws Exception { - UnknownFieldSet unknownFields = UnknownFieldSet.newBuilder().mergeFrom(payload).build(); - Message built = message.newBuilderForType().setUnknownFields(unknownFields).build(); - assertEquals(message.getClass().getName(), 0, built.getSerializedSize()); - } - - private static void assertUnknownFieldsDefaultPreserved(MessageLite message) throws Exception { - { - MessageLite parsed = message.getParserForType().parseFrom(payload); - assertEquals(message.getClass().getName(), payload, parsed.toByteString()); - } - - { - MessageLite parsed = message.newBuilderForType().mergeFrom(payload).build(); - assertEquals(message.getClass().getName(), payload, parsed.toByteString()); - } } - private static void assertUnknownFieldsDefaultDiscarded(MessageLite message) throws Exception { - { - MessageLite parsed = message.getParserForType().parseFrom(payload); - assertEquals(message.getClass().getName(), 0, parsed.getSerializedSize()); - } + private static void assertUnknownFieldsPreserved(MessageLite message) throws Exception { + MessageLite parsed = message.getParserForType().parseFrom(payload); + assertEquals(message.getClass().getName(), payload, parsed.toByteString()); - { - MessageLite parsed = message.newBuilderForType().mergeFrom(payload).build(); - assertEquals(message.getClass().getName(), 0, parsed.getSerializedSize()); - } + parsed = message.newBuilderForType().mergeFrom(payload).build(); + assertEquals(message.getClass().getName(), payload, parsed.toByteString()); } private static void assertUnknownFieldsExplicitlyDiscarded(Message message) throws Exception { - Message parsed = - DiscardUnknownFieldsParser.wrap(message.getParserForType()).parseFrom(payload); + Message parsed = DiscardUnknownFieldsParser.wrap(message.getParserForType()).parseFrom(payload); assertEquals(message.getClass().getName(), 0, parsed.getSerializedSize()); } diff --git a/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java b/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java index 923d7f43..6a942121 100644 --- a/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java @@ -45,10 +45,8 @@ import junit.framework.TestCase; */ public class DoubleArrayListTest extends TestCase { - private static final DoubleArrayList UNARY_LIST = - newImmutableDoubleArrayList(1); - private static final DoubleArrayList TERTIARY_LIST = - newImmutableDoubleArrayList(1, 2, 3); + private static final DoubleArrayList UNARY_LIST = newImmutableDoubleArrayList(1); + private static final DoubleArrayList TERTIARY_LIST = newImmutableDoubleArrayList(1, 2, 3); private DoubleArrayList list; @@ -78,10 +76,10 @@ public class DoubleArrayListTest extends TestCase { list.addAll(asList(1D, 2D, 3D, 4D)); Iterator<Double> iterator = list.iterator(); assertEquals(4, list.size()); - assertEquals(1D, (double) list.get(0)); - assertEquals(1D, (double) iterator.next()); + assertEquals(1D, (double) list.get(0), 0.0); + assertEquals(1D, (double) iterator.next(), 0.0); list.set(0, 1D); - assertEquals(2D, (double) iterator.next()); + assertEquals(2D, (double) iterator.next(), 0.0); list.remove(0); try { @@ -102,9 +100,9 @@ public class DoubleArrayListTest extends TestCase { } public void testGet() { - assertEquals(1D, (double) TERTIARY_LIST.get(0)); - assertEquals(2D, (double) TERTIARY_LIST.get(1)); - assertEquals(3D, (double) TERTIARY_LIST.get(2)); + assertEquals(1D, (double) TERTIARY_LIST.get(0), 0.0); + assertEquals(2D, (double) TERTIARY_LIST.get(1), 0.0); + assertEquals(3D, (double) TERTIARY_LIST.get(2), 0.0); try { TERTIARY_LIST.get(-1); @@ -122,9 +120,9 @@ public class DoubleArrayListTest extends TestCase { } public void testGetDouble() { - assertEquals(1D, TERTIARY_LIST.getDouble(0)); - assertEquals(2D, TERTIARY_LIST.getDouble(1)); - assertEquals(3D, TERTIARY_LIST.getDouble(2)); + assertEquals(1D, TERTIARY_LIST.getDouble(0), 0.0); + assertEquals(2D, TERTIARY_LIST.getDouble(1), 0.0); + assertEquals(3D, TERTIARY_LIST.getDouble(2), 0.0); try { TERTIARY_LIST.get(-1); @@ -163,11 +161,11 @@ public class DoubleArrayListTest extends TestCase { list.addDouble(2); list.addDouble(4); - assertEquals(2D, (double) list.set(0, 3D)); - assertEquals(3D, list.getDouble(0)); + assertEquals(2D, (double) list.set(0, 3D), 0.0); + assertEquals(3D, list.getDouble(0), 0.0); - assertEquals(4D, (double) list.set(1, 0D)); - assertEquals(0D, list.getDouble(1)); + assertEquals(4D, (double) list.set(1, 0D), 0.0); + assertEquals(0D, list.getDouble(1), 0.0); try { list.set(-1, 0D); @@ -188,11 +186,11 @@ public class DoubleArrayListTest extends TestCase { list.addDouble(1); list.addDouble(3); - assertEquals(1D, list.setDouble(0, 0)); - assertEquals(0D, list.getDouble(0)); + assertEquals(1D, list.setDouble(0, 0), 0.0); + assertEquals(0D, list.getDouble(0), 0.0); - assertEquals(3D, list.setDouble(1, 0)); - assertEquals(0D, list.getDouble(1)); + assertEquals(3D, list.setDouble(1, 0), 0.0); + assertEquals(0D, list.getDouble(1), 0.0); try { list.setDouble(-1, 0); @@ -225,9 +223,7 @@ public class DoubleArrayListTest extends TestCase { for (int i = 0; i < 6; i++) { list.add(Double.valueOf(5 + i)); } - assertEquals( - asList(0D, 1D, 4D, 2D, 3D, 5D, 6D, 7D, 8D, 9D, 10D), - list); + assertEquals(asList(0D, 1D, 4D, 2D, 3D, 5D, 6D, 7D, 8D, 9D, 10D), list); try { list.add(-1, 5D); @@ -257,8 +253,8 @@ public class DoubleArrayListTest extends TestCase { assertTrue(list.addAll(Collections.singleton(1D))); assertEquals(1, list.size()); - assertEquals(1D, (double) list.get(0)); - assertEquals(1D, list.getDouble(0)); + assertEquals(1D, (double) list.get(0), 0.0); + assertEquals(1D, list.getDouble(0), 0.0); assertTrue(list.addAll(asList(2D, 3D, 4D, 5D, 6D))); assertEquals(asList(1D, 2D, 3D, 4D, 5D, 6D), list); @@ -272,7 +268,7 @@ public class DoubleArrayListTest extends TestCase { public void testRemove() { list.addAll(TERTIARY_LIST); - assertEquals(1D, (double) list.remove(0)); + assertEquals(1D, (double) list.remove(0), 0.0); assertEquals(asList(2D, 3D), list); assertTrue(list.remove(Double.valueOf(3))); @@ -281,7 +277,7 @@ public class DoubleArrayListTest extends TestCase { assertFalse(list.remove(Double.valueOf(3))); assertEquals(asList(2D), list); - assertEquals(2D, (double) list.remove(0)); + assertEquals(2D, (double) list.remove(0), 0.0); assertEquals(asList(), list); try { @@ -312,7 +308,7 @@ public class DoubleArrayListTest extends TestCase { assertEquals(0, toRemove.size()); } - private void assertImmutable(DoubleArrayList list) { + private void assertImmutable(DoubleList list) { if (list.contains(1D)) { throw new RuntimeException("Cannot test the immutability of lists that contain 1."); } diff --git a/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java b/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java index 77d14f6b..0514241a 100644 --- a/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java +++ b/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java @@ -41,32 +41,30 @@ import java.util.Arrays; import junit.framework.TestCase; /** - * Unit test for {@link DynamicMessage}. See also {@link MessageTest}, which - * tests some {@link DynamicMessage} functionality. + * Unit test for {@link DynamicMessage}. See also {@link MessageTest}, which tests some {@link + * DynamicMessage} functionality. * * @author kenton@google.com Kenton Varda */ public class DynamicMessageTest extends TestCase { TestUtil.ReflectionTester reflectionTester = - new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null); + new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null); TestUtil.ReflectionTester extensionsReflectionTester = - new TestUtil.ReflectionTester(TestAllExtensions.getDescriptor(), - TestUtil.getExtensionRegistry()); + new TestUtil.ReflectionTester( + TestAllExtensions.getDescriptor(), TestUtil.getFullExtensionRegistry()); TestUtil.ReflectionTester packedReflectionTester = - new TestUtil.ReflectionTester(TestPackedTypes.getDescriptor(), null); + new TestUtil.ReflectionTester(TestPackedTypes.getDescriptor(), null); public void testDynamicMessageAccessors() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.setAllFieldsViaReflection(builder); Message message = builder.build(); reflectionTester.assertAllFieldsSetViaReflection(message); } public void testSettersAfterBuild() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); Message firstMessage = builder.build(); // double build() builder.build(); @@ -85,12 +83,12 @@ public class DynamicMessageTest extends TestCase { } public void testUnknownFields() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestEmptyMessage.getDescriptor()); - builder.setUnknownFields(UnknownFieldSet.newBuilder() - .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(1).build()) - .addField(2, UnknownFieldSet.Field.newBuilder().addFixed32(1).build()) - .build()); + Message.Builder builder = DynamicMessage.newBuilder(TestEmptyMessage.getDescriptor()); + builder.setUnknownFields( + UnknownFieldSet.newBuilder() + .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(1).build()) + .addField(2, UnknownFieldSet.Field.newBuilder().addFixed32(1).build()) + .build()); Message message = builder.build(); assertEquals(2, message.getUnknownFields().asMap().size()); // clone() with unknown fields @@ -105,8 +103,7 @@ public class DynamicMessageTest extends TestCase { } public void testDynamicMessageSettersRejectNull() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.assertReflectionSettersRejectNull(builder); } @@ -114,22 +111,19 @@ public class DynamicMessageTest extends TestCase { // We don't need to extensively test DynamicMessage's handling of // extensions because, frankly, it doesn't do anything special with them. // It treats them just like any other fields. - Message.Builder builder = - DynamicMessage.newBuilder(TestAllExtensions.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllExtensions.getDescriptor()); extensionsReflectionTester.setAllFieldsViaReflection(builder); Message message = builder.build(); extensionsReflectionTester.assertAllFieldsSetViaReflection(message); } public void testDynamicMessageExtensionSettersRejectNull() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllExtensions.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllExtensions.getDescriptor()); extensionsReflectionTester.assertReflectionSettersRejectNull(builder); } public void testDynamicMessageRepeatedSetters() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.setAllFieldsViaReflection(builder); reflectionTester.modifyRepeatedFieldsViaReflection(builder); Message message = builder.build(); @@ -137,33 +131,29 @@ public class DynamicMessageTest extends TestCase { } public void testDynamicMessageRepeatedSettersRejectNull() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.assertReflectionRepeatedSettersRejectNull(builder); } public void testDynamicMessageDefaults() throws Exception { reflectionTester.assertClearViaReflection( - DynamicMessage.getDefaultInstance(TestAllTypes.getDescriptor())); + DynamicMessage.getDefaultInstance(TestAllTypes.getDescriptor())); reflectionTester.assertClearViaReflection( - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()).build()); + DynamicMessage.newBuilder(TestAllTypes.getDescriptor()).build()); } public void testDynamicMessageSerializedSize() throws Exception { TestAllTypes message = TestUtil.getAllSet(); - Message.Builder dynamicBuilder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder dynamicBuilder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.setAllFieldsViaReflection(dynamicBuilder); Message dynamicMessage = dynamicBuilder.build(); - assertEquals(message.getSerializedSize(), - dynamicMessage.getSerializedSize()); + assertEquals(message.getSerializedSize(), dynamicMessage.getSerializedSize()); } public void testDynamicMessageSerialization() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.setAllFieldsViaReflection(builder); Message message = builder.build(); @@ -183,8 +173,7 @@ public class DynamicMessageTest extends TestCase { ByteString rawBytes = message.toByteString(); - Message message2 = - DynamicMessage.parseFrom(TestAllTypes.getDescriptor(), rawBytes); + Message message2 = DynamicMessage.parseFrom(TestAllTypes.getDescriptor(), rawBytes); reflectionTester.assertAllFieldsSetViaReflection(message2); // Test Parser interface. @@ -194,20 +183,19 @@ public class DynamicMessageTest extends TestCase { public void testDynamicMessageExtensionParsing() throws Exception { ByteString rawBytes = TestUtil.getAllExtensionsSet().toByteString(); - Message message = DynamicMessage.parseFrom( - TestAllExtensions.getDescriptor(), rawBytes, - TestUtil.getExtensionRegistry()); + Message message = + DynamicMessage.parseFrom( + TestAllExtensions.getDescriptor(), rawBytes, TestUtil.getFullExtensionRegistry()); extensionsReflectionTester.assertAllFieldsSetViaReflection(message); // Test Parser interface. - Message message2 = message.getParserForType().parseFrom( - rawBytes, TestUtil.getExtensionRegistry()); + Message message2 = + message.getParserForType().parseFrom(rawBytes, TestUtil.getExtensionRegistry()); extensionsReflectionTester.assertAllFieldsSetViaReflection(message2); } public void testDynamicMessagePackedSerialization() throws Exception { - Message.Builder builder = - DynamicMessage.newBuilder(TestPackedTypes.getDescriptor()); + Message.Builder builder = DynamicMessage.newBuilder(TestPackedTypes.getDescriptor()); packedReflectionTester.setPackedFieldsViaReflection(builder); Message message = builder.build(); @@ -227,8 +215,7 @@ public class DynamicMessageTest extends TestCase { ByteString rawBytes = message.toByteString(); - Message message2 = - DynamicMessage.parseFrom(TestPackedTypes.getDescriptor(), rawBytes); + Message message2 = DynamicMessage.parseFrom(TestPackedTypes.getDescriptor(), rawBytes); packedReflectionTester.assertPackedFieldsSetViaReflection(message2); // Test Parser interface. @@ -245,41 +232,38 @@ public class DynamicMessageTest extends TestCase { reflectionTester.assertAllFieldsSetViaReflection(copy); // Test oneof behavior - FieldDescriptor bytesField = - TestAllTypes.getDescriptor().findFieldByName("oneof_bytes"); - FieldDescriptor uint32Field = - TestAllTypes.getDescriptor().findFieldByName("oneof_uint32"); + FieldDescriptor bytesField = TestAllTypes.getDescriptor().findFieldByName("oneof_bytes"); + FieldDescriptor uint32Field = TestAllTypes.getDescriptor().findFieldByName("oneof_uint32"); assertTrue(copy.hasField(bytesField)); assertFalse(copy.hasField(uint32Field)); - DynamicMessage copy2 = - DynamicMessage.newBuilder(message).setField(uint32Field, 123).build(); + DynamicMessage copy2 = DynamicMessage.newBuilder(message).setField(uint32Field, 123).build(); assertFalse(copy2.hasField(bytesField)); assertTrue(copy2.hasField(uint32Field)); assertEquals(123, copy2.getField(uint32Field)); } public void testToBuilder() throws Exception { - DynamicMessage.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); reflectionTester.setAllFieldsViaReflection(builder); int unknownFieldNum = 9; long unknownFieldVal = 90; - builder.setUnknownFields(UnknownFieldSet.newBuilder() - .addField(unknownFieldNum, - UnknownFieldSet.Field.newBuilder() - .addVarint(unknownFieldVal).build()) - .build()); + builder.setUnknownFields( + UnknownFieldSet.newBuilder() + .addField( + unknownFieldNum, + UnknownFieldSet.Field.newBuilder().addVarint(unknownFieldVal).build()) + .build()); DynamicMessage message = builder.build(); DynamicMessage derived = message.toBuilder().build(); reflectionTester.assertAllFieldsSetViaReflection(derived); - assertEquals(Arrays.asList(unknownFieldVal), + assertEquals( + Arrays.asList(unknownFieldVal), derived.getUnknownFields().getField(unknownFieldNum).getVarintList()); } public void testDynamicOneofMessage() throws Exception { - DynamicMessage.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); OneofDescriptor oneof = TestAllTypes.getDescriptor().getOneofs().get(0); assertFalse(builder.hasOneof(oneof)); assertSame(null, builder.getOneofFieldDescriptor(oneof)); @@ -292,8 +276,7 @@ public class DynamicMessageTest extends TestCase { DynamicMessage message = builder.buildPartial(); assertTrue(message.hasOneof(oneof)); - DynamicMessage.Builder mergedBuilder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + DynamicMessage.Builder mergedBuilder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); FieldDescriptor mergedField = oneof.getField(0); mergedBuilder.setField(mergedField, 123); assertTrue(mergedBuilder.hasField(mergedField)); @@ -310,15 +293,12 @@ public class DynamicMessageTest extends TestCase { // Regression test for a bug that makes setField() not work for repeated // enum fields. public void testSettersForRepeatedEnumField() throws Exception { - DynamicMessage.Builder builder = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); + DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor()); FieldDescriptor repeatedEnumField = - TestAllTypes.getDescriptor().findFieldByName( - "repeated_nested_enum"); + TestAllTypes.getDescriptor().findFieldByName("repeated_nested_enum"); EnumDescriptor enumDescriptor = TestAllTypes.NestedEnum.getDescriptor(); builder.setField(repeatedEnumField, enumDescriptor.getValues()); DynamicMessage message = builder.build(); - assertEquals( - enumDescriptor.getValues(), message.getField(repeatedEnumField)); + assertEquals(enumDescriptor.getValues(), message.getField(repeatedEnumField)); } } diff --git a/java/core/src/test/java/com/google/protobuf/EnumTest.java b/java/core/src/test/java/com/google/protobuf/EnumTest.java index 14c7406b..80c176a7 100644 --- a/java/core/src/test/java/com/google/protobuf/EnumTest.java +++ b/java/core/src/test/java/com/google/protobuf/EnumTest.java @@ -34,43 +34,43 @@ import com.google.protobuf.UnittestLite.ForeignEnumLite; import com.google.protobuf.UnittestLite.TestAllTypesLite; import protobuf_unittest.UnittestProto.ForeignEnum; import protobuf_unittest.UnittestProto.TestAllTypes; - import junit.framework.TestCase; public class EnumTest extends TestCase { - + public void testForNumber() { ForeignEnum e = ForeignEnum.forNumber(ForeignEnum.FOREIGN_BAR.getNumber()); assertEquals(ForeignEnum.FOREIGN_BAR, e); e = ForeignEnum.forNumber(1000); - assertEquals(null, e); + assertNull(e); } - + public void testForNumber_oneof() { - TestAllTypes.OneofFieldCase e = TestAllTypes.OneofFieldCase.forNumber( - TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber()); + TestAllTypes.OneofFieldCase e = + TestAllTypes.OneofFieldCase.forNumber( + TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber()); assertEquals(TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE, e); e = TestAllTypes.OneofFieldCase.forNumber(1000); - assertEquals(null, e); + assertNull(e); } - + public void testForNumberLite() { ForeignEnumLite e = ForeignEnumLite.forNumber(ForeignEnumLite.FOREIGN_LITE_BAR.getNumber()); assertEquals(ForeignEnumLite.FOREIGN_LITE_BAR, e); e = ForeignEnumLite.forNumber(1000); - assertEquals(null, e); + assertNull(e); } - + public void testForNumberLite_oneof() { - TestAllTypesLite.OneofFieldCase e = TestAllTypesLite.OneofFieldCase.forNumber( - TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber()); + TestAllTypesLite.OneofFieldCase e = + TestAllTypesLite.OneofFieldCase.forNumber( + TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber()); assertEquals(TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE, e); e = TestAllTypesLite.OneofFieldCase.forNumber(1000); - assertEquals(null, e); + assertNull(e); } } - diff --git a/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java b/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java index 6157e589..a0e91375 100644 --- a/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java +++ b/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java @@ -47,31 +47,31 @@ import junit.framework.TestSuite; * creates. * * <p>This test simulates the runtime behaviour of the ExtensionRegistryFactory by delegating test - * definitions to two inner classes {@link InnerTest} and {@link InnerLiteTest}, the latter of - * which is executed using a custom ClassLoader, simulating the ProtoLite environment. + * definitions to two inner classes {@link InnerTest} and {@link InnerLiteTest}, the latter of which + * is executed using a custom ClassLoader, simulating the ProtoLite environment. * - * <p>The test mechanism employed here is based on the pattern in - * {@code com.google.common.util.concurrent.AbstractFutureFallbackAtomicHelperTest} + * <p>The test mechanism employed here is based on the pattern in {@code + * com.google.common.util.concurrent.AbstractFutureFallbackAtomicHelperTest} */ public class ExtensionRegistryFactoryTest extends TestCase { // A classloader which blacklists some non-Lite classes. private static final ClassLoader LITE_CLASS_LOADER = getLiteOnlyClassLoader(); - /** - * Defines the set of test methods which will be run. - */ + /** Defines the set of test methods which will be run. */ static interface RegistryTests { void testCreate(); + void testEmpty(); + void testIsFullRegistry(); + void testAdd(); + void testAdd_immutable(); } - /** - * Test implementations for the non-Lite usage of ExtensionRegistryFactory. - */ + /** Test implementations for the non-Lite usage of ExtensionRegistryFactory. */ public static class InnerTest implements RegistryTests { @Override @@ -108,20 +108,25 @@ public class ExtensionRegistryFactoryTest extends TestCase { ExtensionRegistry fullRegistry1 = (ExtensionRegistry) registry1; ExtensionRegistry fullRegistry2 = (ExtensionRegistry) registry2; - assertTrue("Test is using a non-lite extension", + assertTrue( + "Test is using a non-lite extension", GeneratedMessageLite.GeneratedExtension.class.isAssignableFrom( NonNestedExtensionLite.nonNestedExtensionLite.getClass())); - assertNull("Extension is not registered in masqueraded full registry", + assertNull( + "Extension is not registered in masqueraded full registry", fullRegistry1.findImmutableExtensionByName("protobuf_unittest.nonNestedExtension")); GeneratedMessageLite.GeneratedExtension<NonNestedExtensionLite.MessageLiteToBeExtended, ?> - extension = registry1.findLiteExtensionByNumber( - NonNestedExtensionLite.MessageLiteToBeExtended.getDefaultInstance(), 1); + extension = + registry1.findLiteExtensionByNumber( + NonNestedExtensionLite.MessageLiteToBeExtended.getDefaultInstance(), 1); assertNotNull("Extension registered in lite registry", extension); - assertTrue("Test is using a non-lite extension", + assertTrue( + "Test is using a non-lite extension", GeneratedMessage.GeneratedExtension.class.isAssignableFrom( - NonNestedExtension.nonNestedExtension.getClass())); - assertNotNull("Extension is registered in masqueraded full registry", + NonNestedExtension.nonNestedExtension.getClass())); + assertNotNull( + "Extension is registered in masqueraded full registry", fullRegistry2.findImmutableExtensionByName("protobuf_unittest.nonNestedExtension")); } @@ -131,27 +136,29 @@ public class ExtensionRegistryFactoryTest extends TestCase { try { NonNestedExtensionLite.registerAllExtensions(registry1); fail(); - } catch (UnsupportedOperationException expected) {} + } catch (UnsupportedOperationException expected) { + } try { registry1.add(NonNestedExtensionLite.nonNestedExtensionLite); fail(); - } catch (UnsupportedOperationException expected) {} + } catch (UnsupportedOperationException expected) { + } ExtensionRegistryLite registry2 = ExtensionRegistryLite.newInstance().getUnmodifiable(); try { NonNestedExtension.registerAllExtensions((ExtensionRegistry) registry2); fail(); - } catch (IllegalArgumentException expected) {} + } catch (IllegalArgumentException expected) { + } try { registry2.add(NonNestedExtension.nonNestedExtension); fail(); - } catch (IllegalArgumentException expected) {} + } catch (IllegalArgumentException expected) { + } } } - /** - * Test implementations for the Lite usage of ExtensionRegistryFactory. - */ + /** Test implementations for the Lite usage of ExtensionRegistryFactory. */ public static final class InnerLiteTest implements RegistryTests { @Override @@ -180,8 +187,9 @@ public class ExtensionRegistryFactoryTest extends TestCase { ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance(); NonNestedExtensionLite.registerAllExtensions(registry); GeneratedMessageLite.GeneratedExtension<NonNestedExtensionLite.MessageLiteToBeExtended, ?> - extension = registry.findLiteExtensionByNumber( - NonNestedExtensionLite.MessageLiteToBeExtended.getDefaultInstance(), 1); + extension = + registry.findLiteExtensionByNumber( + NonNestedExtensionLite.MessageLiteToBeExtended.getDefaultInstance(), 1); assertNotNull("Extension is registered in Lite registry", extension); } @@ -191,13 +199,12 @@ public class ExtensionRegistryFactoryTest extends TestCase { try { NonNestedExtensionLite.registerAllExtensions(registry); fail(); - } catch (UnsupportedOperationException expected) {} + } catch (UnsupportedOperationException expected) { + } } } - /** - * Defines a suite of tests which the JUnit3 runner retrieves by reflection. - */ + /** Defines a suite of tests which the JUnit3 runner retrieves by reflection. */ public static Test suite() { TestSuite suite = new TestSuite(); for (Method method : RegistryTests.class.getMethods()) { @@ -235,8 +242,8 @@ public class ExtensionRegistryFactoryTest extends TestCase { } /** - * Constructs a custom ClassLoader blacklisting the classes which are inspected in the SUT - * to determine the Lite/non-Lite runtime. + * Constructs a custom ClassLoader blacklisting the classes which are inspected in the SUT to + * determine the Lite/non-Lite runtime. */ private static ClassLoader getLiteOnlyClassLoader() { ClassLoader testClassLoader = ExtensionRegistryFactoryTest.class.getClassLoader(); @@ -250,8 +257,8 @@ public class ExtensionRegistryFactoryTest extends TestCase { // Construct a URLClassLoader delegating to the system ClassLoader, and looking up classes // in jar files based on the URLs already configured for this test's UrlClassLoader. // Certain classes throw a ClassNotFoundException by design. - return new URLClassLoader(((URLClassLoader) testClassLoader).getURLs(), - ClassLoader.getSystemClassLoader()) { + return new URLClassLoader( + ((URLClassLoader) testClassLoader).getURLs(), ClassLoader.getSystemClassLoader()) { @Override public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { if (classNamesNotInLite.contains(name)) { diff --git a/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java b/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java index 42da5bb3..85a2fe08 100644 --- a/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java +++ b/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java @@ -38,12 +38,10 @@ import com.google.protobuf.FieldPresenceTestProto.TestAllTypes; import com.google.protobuf.FieldPresenceTestProto.TestOptionalFieldsOnly; import com.google.protobuf.FieldPresenceTestProto.TestRepeatedFieldsOnly; import protobuf_unittest.UnittestProto; - import junit.framework.TestCase; /** - * Unit tests for protos that doesn't support field presence test for optional - * non-message fields. + * Unit tests for protos that doesn't support field presence test for optional non-message fields. */ public class FieldPresenceTest extends TestCase { private static boolean hasMethod(Class<?> clazz, String name) { @@ -59,9 +57,7 @@ public class FieldPresenceTest extends TestCase { } private static void assertHasMethodRemoved( - Class<?> classWithFieldPresence, - Class<?> classWithoutFieldPresence, - String camelName) { + Class<?> classWithFieldPresence, Class<?> classWithoutFieldPresence, String camelName) { assertTrue(hasMethod(classWithFieldPresence, "get" + camelName)); assertTrue(hasMethod(classWithFieldPresence, "has" + camelName)); assertTrue(hasMethod(classWithoutFieldPresence, "get" + camelName)); @@ -70,72 +66,38 @@ public class FieldPresenceTest extends TestCase { public void testHasMethod() { // Optional non-message fields don't have a hasFoo() method generated. + assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalInt32"); + assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalString"); + assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalBytes"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OptionalInt32"); - assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OptionalString"); - assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OptionalBytes"); - assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OptionalNestedEnum"); + UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalNestedEnum"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OptionalInt32"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalInt32"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OptionalString"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalString"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OptionalBytes"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalBytes"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OptionalNestedEnum"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalNestedEnum"); // message fields still have the hasFoo() method generated. - assertFalse(TestAllTypes.newBuilder().build().hasOptionalNestedMessage()); + assertFalse(TestAllTypes.getDefaultInstance().hasOptionalNestedMessage()); assertFalse(TestAllTypes.newBuilder().hasOptionalNestedMessage()); // oneof fields don't have hasFoo() methods for non-message types. - assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OneofUint32"); - assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OneofString"); - assertHasMethodRemoved( - UnittestProto.TestAllTypes.class, - TestAllTypes.class, - "OneofBytes"); - assertFalse(TestAllTypes.newBuilder().build().hasOneofNestedMessage()); + assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OneofUint32"); + assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OneofString"); + assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OneofBytes"); + assertFalse(TestAllTypes.getDefaultInstance().hasOneofNestedMessage()); assertFalse(TestAllTypes.newBuilder().hasOneofNestedMessage()); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OneofUint32"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OneofUint32"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OneofString"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OneofString"); assertHasMethodRemoved( - UnittestProto.TestAllTypes.Builder.class, - TestAllTypes.Builder.class, - "OneofBytes"); + UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OneofBytes"); } public void testOneofEquals() throws Exception { @@ -200,10 +162,10 @@ public class FieldPresenceTest extends TestCase { assertEquals(TestAllTypes.NestedEnum.BAR, message.getOptionalNestedEnum()); // equals()/hashCode() should produce the same results. - TestAllTypes empty = TestAllTypes.newBuilder().build(); + TestAllTypes empty = TestAllTypes.getDefaultInstance(); message = builder.build(); - assertTrue(empty.equals(message)); - assertTrue(message.equals(empty)); + assertEquals(message, empty); + assertEquals(empty, message); assertEquals(empty.hashCode(), message.hashCode()); } @@ -215,7 +177,7 @@ public class FieldPresenceTest extends TestCase { FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum"); // Field not present. - TestAllTypes message = TestAllTypes.newBuilder().build(); + TestAllTypes message = TestAllTypes.getDefaultInstance(); assertFalse(message.hasField(optionalInt32Field)); assertFalse(message.hasField(optionalStringField)); assertFalse(message.hasField(optionalBytesField)); @@ -223,12 +185,13 @@ public class FieldPresenceTest extends TestCase { assertEquals(0, message.getAllFields().size()); // Field set to default value is seen as not present. - message = TestAllTypes.newBuilder() - .setOptionalInt32(0) - .setOptionalString("") - .setOptionalBytes(ByteString.EMPTY) - .setOptionalNestedEnum(TestAllTypes.NestedEnum.FOO) - .build(); + message = + TestAllTypes.newBuilder() + .setOptionalInt32(0) + .setOptionalString("") + .setOptionalBytes(ByteString.EMPTY) + .setOptionalNestedEnum(TestAllTypes.NestedEnum.FOO) + .build(); assertFalse(message.hasField(optionalInt32Field)); assertFalse(message.hasField(optionalStringField)); assertFalse(message.hasField(optionalBytesField)); @@ -236,12 +199,13 @@ public class FieldPresenceTest extends TestCase { assertEquals(0, message.getAllFields().size()); // Field set to non-default value is seen as present. - message = TestAllTypes.newBuilder() - .setOptionalInt32(1) - .setOptionalString("x") - .setOptionalBytes(ByteString.copyFromUtf8("y")) - .setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR) - .build(); + message = + TestAllTypes.newBuilder() + .setOptionalInt32(1) + .setOptionalString("x") + .setOptionalBytes(ByteString.copyFromUtf8("y")) + .setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR) + .build(); assertTrue(message.hasField(optionalInt32Field)); assertTrue(message.hasField(optionalStringField)); assertTrue(message.hasField(optionalBytesField)); @@ -284,7 +248,9 @@ public class FieldPresenceTest extends TestCase { assertEquals(4, message.getAllFields().size()); // Field set to default value is seen as not present. - message = message.toBuilder() + message = + message + .toBuilder() .setField(optionalInt32Field, 0) .setField(optionalStringField, "") .setField(optionalBytesField, ByteString.EMPTY) @@ -302,8 +268,7 @@ public class FieldPresenceTest extends TestCase { assertFalse(builder.hasOptionalNestedMessage()); assertFalse(builder.build().hasOptionalNestedMessage()); - TestAllTypes.NestedMessage.Builder nestedBuilder = - builder.getOptionalNestedMessageBuilder(); + TestAllTypes.NestedMessage.Builder nestedBuilder = builder.getOptionalNestedMessageBuilder(); assertTrue(builder.hasOptionalNestedMessage()); assertTrue(builder.build().hasOptionalNestedMessage()); @@ -341,8 +306,7 @@ public class FieldPresenceTest extends TestCase { assertTrue(message.hasOptionalNestedMessage()); assertEquals(0, message.getOptionalNestedMessage().getValue()); // The oneof field set to its default value is also present. - assertEquals( - TestAllTypes.OneofFieldCase.ONEOF_INT32, message.getOneofFieldCase()); + assertEquals(TestAllTypes.OneofFieldCase.ONEOF_INT32, message.getOneofFieldCase()); } // Regression test for b/16173397 @@ -376,8 +340,7 @@ public class FieldPresenceTest extends TestCase { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); // Test optional proto2 message fields. - UnittestProto.TestRequired.Builder proto2Builder = - builder.getOptionalProto2MessageBuilder(); + UnittestProto.TestRequired.Builder proto2Builder = builder.getOptionalProto2MessageBuilder(); assertFalse(builder.isInitialized()); assertFalse(builder.buildPartial().isInitialized()); diff --git a/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java b/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java index 903a79db..7ed61340 100644 --- a/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java @@ -45,10 +45,8 @@ import junit.framework.TestCase; */ public class FloatArrayListTest extends TestCase { - private static final FloatArrayList UNARY_LIST = - newImmutableFloatArrayList(1); - private static final FloatArrayList TERTIARY_LIST = - newImmutableFloatArrayList(1, 2, 3); + private static final FloatArrayList UNARY_LIST = newImmutableFloatArrayList(1); + private static final FloatArrayList TERTIARY_LIST = newImmutableFloatArrayList(1, 2, 3); private FloatArrayList list; @@ -78,10 +76,10 @@ public class FloatArrayListTest extends TestCase { list.addAll(asList(1F, 2F, 3F, 4F)); Iterator<Float> iterator = list.iterator(); assertEquals(4, list.size()); - assertEquals(1F, (float) list.get(0)); - assertEquals(1F, (float) iterator.next()); + assertEquals(1F, (float) list.get(0), 0.0f); + assertEquals(1F, (float) iterator.next(), 0.0f); list.set(0, 1F); - assertEquals(2F, (float) iterator.next()); + assertEquals(2F, (float) iterator.next(), 0.0f); list.remove(0); try { @@ -102,9 +100,9 @@ public class FloatArrayListTest extends TestCase { } public void testGet() { - assertEquals(1F, (float) TERTIARY_LIST.get(0)); - assertEquals(2F, (float) TERTIARY_LIST.get(1)); - assertEquals(3F, (float) TERTIARY_LIST.get(2)); + assertEquals(1F, (float) TERTIARY_LIST.get(0), 0.0f); + assertEquals(2F, (float) TERTIARY_LIST.get(1), 0.0f); + assertEquals(3F, (float) TERTIARY_LIST.get(2), 0.0f); try { TERTIARY_LIST.get(-1); @@ -122,9 +120,9 @@ public class FloatArrayListTest extends TestCase { } public void testGetFloat() { - assertEquals(1F, TERTIARY_LIST.getFloat(0)); - assertEquals(2F, TERTIARY_LIST.getFloat(1)); - assertEquals(3F, TERTIARY_LIST.getFloat(2)); + assertEquals(1F, TERTIARY_LIST.getFloat(0), 0.0f); + assertEquals(2F, TERTIARY_LIST.getFloat(1), 0.0f); + assertEquals(3F, TERTIARY_LIST.getFloat(2), 0.0f); try { TERTIARY_LIST.get(-1); @@ -163,11 +161,11 @@ public class FloatArrayListTest extends TestCase { list.addFloat(2); list.addFloat(4); - assertEquals(2F, (float) list.set(0, 3F)); - assertEquals(3F, list.getFloat(0)); + assertEquals(2F, (float) list.set(0, 3F), 0.0f); + assertEquals(3F, list.getFloat(0), 0.0f); - assertEquals(4F, (float) list.set(1, 0F)); - assertEquals(0F, list.getFloat(1)); + assertEquals(4F, (float) list.set(1, 0F), 0.0f); + assertEquals(0F, list.getFloat(1), 0.0f); try { list.set(-1, 0F); @@ -188,11 +186,11 @@ public class FloatArrayListTest extends TestCase { list.addFloat(1); list.addFloat(3); - assertEquals(1F, list.setFloat(0, 0)); - assertEquals(0F, list.getFloat(0)); + assertEquals(1F, list.setFloat(0, 0), 0.0f); + assertEquals(0F, list.getFloat(0), 0.0f); - assertEquals(3F, list.setFloat(1, 0)); - assertEquals(0F, list.getFloat(1)); + assertEquals(3F, list.setFloat(1, 0), 0.0f); + assertEquals(0F, list.getFloat(1), 0.0f); try { list.setFloat(-1, 0); @@ -225,9 +223,7 @@ public class FloatArrayListTest extends TestCase { for (int i = 0; i < 6; i++) { list.add(Float.valueOf(5 + i)); } - assertEquals( - asList(0F, 1F, 4F, 2F, 3F, 5F, 6F, 7F, 8F, 9F, 10F), - list); + assertEquals(asList(0F, 1F, 4F, 2F, 3F, 5F, 6F, 7F, 8F, 9F, 10F), list); try { list.add(-1, 5F); @@ -257,8 +253,8 @@ public class FloatArrayListTest extends TestCase { assertTrue(list.addAll(Collections.singleton(1F))); assertEquals(1, list.size()); - assertEquals(1F, (float) list.get(0)); - assertEquals(1F, list.getFloat(0)); + assertEquals(1F, (float) list.get(0), 0.0f); + assertEquals(1F, list.getFloat(0), 0.0f); assertTrue(list.addAll(asList(2F, 3F, 4F, 5F, 6F))); assertEquals(asList(1F, 2F, 3F, 4F, 5F, 6F), list); @@ -272,7 +268,7 @@ public class FloatArrayListTest extends TestCase { public void testRemove() { list.addAll(TERTIARY_LIST); - assertEquals(1F, (float) list.remove(0)); + assertEquals(1F, (float) list.remove(0), 0.0f); assertEquals(asList(2F, 3F), list); assertTrue(list.remove(Float.valueOf(3))); @@ -281,7 +277,7 @@ public class FloatArrayListTest extends TestCase { assertFalse(list.remove(Float.valueOf(3))); assertEquals(asList(2F), list); - assertEquals(2F, (float) list.remove(0)); + assertEquals(2F, (float) list.remove(0), 0.0f); assertEquals(asList(), list); try { @@ -312,7 +308,7 @@ public class FloatArrayListTest extends TestCase { assertEquals(0, toRemove.size()); } - private void assertImmutable(FloatArrayList list) { + private void assertImmutable(FloatList list) { if (list.contains(1F)) { throw new RuntimeException("Cannot test the immutability of lists that contain 1."); } diff --git a/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java b/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java index b7eaebf5..baa6d086 100644 --- a/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java +++ b/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java @@ -31,11 +31,10 @@ package com.google.protobuf; /** - * A prerun for a test suite that allows running the full protocol buffer - * tests in a mode that disables the optimization for not using - * {@link RepeatedFieldBuilder} and {@link SingleFieldBuilder} until they are - * requested. This allows us to run all the tests through both code paths - * and ensures that both code paths produce identical results. + * A prerun for a test suite that allows running the full protocol buffer tests in a mode that + * disables the optimization for not using {@link RepeatedFieldBuilder} and {@link + * SingleFieldBuilder} until they are requested. This allows us to run all the tests through both + * code paths and ensures that both code paths produce identical results. * * @author jonp@google.com (Jon Perlow) */ diff --git a/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java index c9ebe7f5..13457bc0 100644 --- a/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java +++ b/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java @@ -71,20 +71,21 @@ import java.util.List; import junit.framework.TestCase; /** - * Unit test for generated messages and generated code. See also - * {@link MessageTest}, which tests some generated message functionality. + * Unit test for generated messages and generated code. See also {@link MessageTest}, which tests + * some generated message functionality. * * @author kenton@google.com Kenton Varda */ public class GeneratedMessageTest extends TestCase { TestUtil.ReflectionTester reflectionTester = - new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null); + new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null); public void testDefaultInstance() throws Exception { - assertSame(TestAllTypes.getDefaultInstance(), - TestAllTypes.getDefaultInstance().getDefaultInstanceForType()); - assertSame(TestAllTypes.getDefaultInstance(), - TestAllTypes.newBuilder().getDefaultInstanceForType()); + assertSame( + TestAllTypes.getDefaultInstance(), + TestAllTypes.getDefaultInstance().getDefaultInstanceForType()); + assertSame( + TestAllTypes.getDefaultInstance(), TestAllTypes.newBuilder().getDefaultInstanceForType()); } public void testMessageOrBuilder() throws Exception { @@ -110,10 +111,8 @@ public class GeneratedMessageTest extends TestCase { assertEquals(100, value1.getOptionalSfixed64()); assertEquals(100, value1.getRepeatedInt32(0)); - assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, - value1.getOptionalImportEnum()); - assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, - value1.getRepeatedImportEnum(0)); + assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, value1.getOptionalImportEnum()); + assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, value1.getRepeatedImportEnum(0)); assertEquals(1, value1.getOptionalForeignMessage().getC()); assertEquals(1, value1.getRepeatedForeignMessage(0).getC()); @@ -130,20 +129,16 @@ public class GeneratedMessageTest extends TestCase { // Make sure value1 didn't change. assertEquals(100, value1.getOptionalSfixed64()); assertEquals(100, value1.getRepeatedInt32(0)); - assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, - value1.getOptionalImportEnum()); - assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, - value1.getRepeatedImportEnum(0)); + assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, value1.getOptionalImportEnum()); + assertEquals(UnittestImport.ImportEnum.IMPORT_BAR, value1.getRepeatedImportEnum(0)); assertEquals(1, value1.getOptionalForeignMessage().getC()); assertEquals(1, value1.getRepeatedForeignMessage(0).getC()); // Make sure value2 is correct assertEquals(200, value2.getOptionalSfixed64()); assertEquals(200, value2.getRepeatedInt32(0)); - assertEquals(UnittestImport.ImportEnum.IMPORT_FOO, - value2.getOptionalImportEnum()); - assertEquals(UnittestImport.ImportEnum.IMPORT_FOO, - value2.getRepeatedImportEnum(0)); + assertEquals(UnittestImport.ImportEnum.IMPORT_FOO, value2.getOptionalImportEnum()); + assertEquals(UnittestImport.ImportEnum.IMPORT_FOO, value2.getRepeatedImportEnum(0)); assertEquals(2, value2.getOptionalForeignMessage().getC()); assertEquals(2, value2.getRepeatedForeignMessage(0).getC()); } @@ -157,8 +152,7 @@ public class GeneratedMessageTest extends TestCase { TestAllTypes value2 = value1.toBuilder().build(); assertSame(value1.getRepeatedInt32List(), value2.getRepeatedInt32List()); - assertSame(value1.getRepeatedForeignMessageList(), - value2.getRepeatedForeignMessageList()); + assertSame(value1.getRepeatedForeignMessageList(), value2.getRepeatedForeignMessageList()); } public void testRepeatedArraysAreImmutable() throws Exception { @@ -171,7 +165,6 @@ public class GeneratedMessageTest extends TestCase { assertIsUnmodifiable(builder.getRepeatedForeignMessageList()); assertIsUnmodifiable(builder.getRepeatedFloatList()); - TestAllTypes value = builder.build(); assertIsUnmodifiable(value.getRepeatedInt32List()); assertIsUnmodifiable(value.getRepeatedImportEnumList()); @@ -239,8 +232,7 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.setOptionalNestedMessage( - (TestAllTypes.NestedMessage.Builder) null); + builder.setOptionalNestedMessage((TestAllTypes.NestedMessage.Builder) null); fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. @@ -270,8 +262,7 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.addRepeatedNestedMessage( - (TestAllTypes.NestedMessage.Builder) null); + builder.addRepeatedNestedMessage((TestAllTypes.NestedMessage.Builder) null); fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. @@ -313,10 +304,8 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } - builder.addRepeatedNestedMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); - builder.addRepeatedNestedMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(456).build()); + builder.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); + builder.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(456).build()); try { builder.setRepeatedNestedMessage(1, (TestAllTypes.NestedMessage) null); fail("Exception was not thrown"); @@ -324,8 +313,7 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.setRepeatedNestedMessage( - 1, (TestAllTypes.NestedMessage.Builder) null); + builder.setRepeatedNestedMessage(1, (TestAllTypes.NestedMessage.Builder) null); fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. @@ -347,14 +335,12 @@ public class GeneratedMessageTest extends TestCase { builder.addAllRepeatedInt32(Arrays.asList(1, 2, 3, 4)); builder.addAllRepeatedForeignEnum(Arrays.asList(ForeignEnum.FOREIGN_BAZ)); - ForeignMessage foreignMessage = - ForeignMessage.newBuilder().setC(12).build(); + ForeignMessage foreignMessage = ForeignMessage.newBuilder().setC(12).build(); builder.addAllRepeatedForeignMessage(Arrays.asList(foreignMessage)); TestAllTypes message = builder.build(); assertEquals(message.getRepeatedInt32List(), Arrays.asList(1, 2, 3, 4)); - assertEquals(message.getRepeatedForeignEnumList(), - Arrays.asList(ForeignEnum.FOREIGN_BAZ)); + assertEquals(message.getRepeatedForeignEnumList(), Arrays.asList(ForeignEnum.FOREIGN_BAZ)); assertEquals(1, message.getRepeatedForeignMessageCount()); assertEquals(12, message.getRepeatedForeignMessage(0).getC()); } @@ -362,19 +348,16 @@ public class GeneratedMessageTest extends TestCase { public void testRepeatedAppendRejectsNull() throws Exception { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); - ForeignMessage foreignMessage = - ForeignMessage.newBuilder().setC(12).build(); + ForeignMessage foreignMessage = ForeignMessage.newBuilder().setC(12).build(); try { - builder.addAllRepeatedForeignMessage( - Arrays.asList(foreignMessage, (ForeignMessage) null)); + builder.addAllRepeatedForeignMessage(Arrays.asList(foreignMessage, (ForeignMessage) null)); fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. } try { - builder.addAllRepeatedForeignEnum( - Arrays.asList(ForeignEnum.FOREIGN_BAZ, null)); + builder.addAllRepeatedForeignEnum(Arrays.asList(ForeignEnum.FOREIGN_BAZ, null)); fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. @@ -394,20 +377,22 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } } - + public void testRepeatedAppendIterateOnlyOnce() throws Exception { // Create a Iterable that can only be iterated once. - Iterable<String> stringIterable = new Iterable<String>() { - private boolean called = false; - @Override - public Iterator<String> iterator() { - if (called) { - throw new IllegalStateException(); - } - called = true; - return Arrays.asList("one", "two", "three").iterator(); - } - }; + Iterable<String> stringIterable = + new Iterable<String>() { + private boolean called = false; + + @Override + public Iterator<String> iterator() { + if (called) { + throw new IllegalStateException(); + } + called = true; + return Arrays.asList("one", "two", "three").iterator(); + } + }; TestAllTypes.Builder builder = TestAllTypes.newBuilder(); builder.addAllRepeatedString(stringIterable); assertEquals(3, builder.getRepeatedStringCount()); @@ -434,29 +419,31 @@ public class GeneratedMessageTest extends TestCase { } public void testSettingForeignMessageUsingBuilder() throws Exception { - TestAllTypes message = TestAllTypes.newBuilder() - // Pass builder for foreign message instance. - .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(123)) - .build(); - TestAllTypes expectedMessage = TestAllTypes.newBuilder() - // Create expected version passing foreign message instance explicitly. - .setOptionalForeignMessage( - ForeignMessage.newBuilder().setC(123).build()) - .build(); + TestAllTypes message = + TestAllTypes.newBuilder() + // Pass builder for foreign message instance. + .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(123)) + .build(); + TestAllTypes expectedMessage = + TestAllTypes.newBuilder() + // Create expected version passing foreign message instance explicitly. + .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(123).build()) + .build(); // TODO(ngd): Upgrade to using real #equals method once implemented assertEquals(expectedMessage.toString(), message.toString()); } public void testSettingRepeatedForeignMessageUsingBuilder() throws Exception { - TestAllTypes message = TestAllTypes.newBuilder() - // Pass builder for foreign message instance. - .addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(456)) - .build(); - TestAllTypes expectedMessage = TestAllTypes.newBuilder() - // Create expected version passing foreign message instance explicitly. - .addRepeatedForeignMessage( - ForeignMessage.newBuilder().setC(456).build()) - .build(); + TestAllTypes message = + TestAllTypes.newBuilder() + // Pass builder for foreign message instance. + .addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(456)) + .build(); + TestAllTypes expectedMessage = + TestAllTypes.newBuilder() + // Create expected version passing foreign message instance explicitly. + .addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(456).build()) + .build(); assertEquals(expectedMessage.toString(), message.toString()); } @@ -464,14 +451,13 @@ public class GeneratedMessageTest extends TestCase { TestUtil.assertClear(TestAllTypes.getDefaultInstance()); TestUtil.assertClear(TestAllTypes.newBuilder().build()); - TestExtremeDefaultValues message = - TestExtremeDefaultValues.getDefaultInstance(); + TestExtremeDefaultValues message = TestExtremeDefaultValues.getDefaultInstance(); assertEquals("\u1234", message.getUtf8String()); - assertEquals(Double.POSITIVE_INFINITY, message.getInfDouble()); - assertEquals(Double.NEGATIVE_INFINITY, message.getNegInfDouble()); + assertEquals(Double.POSITIVE_INFINITY, message.getInfDouble(), 0.0); + assertEquals(Double.NEGATIVE_INFINITY, message.getNegInfDouble(), 0.0); assertTrue(Double.isNaN(message.getNanDouble())); - assertEquals(Float.POSITIVE_INFINITY, message.getInfFloat()); - assertEquals(Float.NEGATIVE_INFINITY, message.getNegInfFloat()); + assertEquals(Float.POSITIVE_INFINITY, message.getInfFloat(), 0.0f); + assertEquals(Float.NEGATIVE_INFINITY, message.getNegInfFloat(), 0.0f); assertTrue(Float.isNaN(message.getNanFloat())); assertEquals("? ? ?? ?? ??? ??/ ??-", message.getCppTrigraph()); } @@ -523,19 +509,15 @@ public class GeneratedMessageTest extends TestCase { } public void testReflectionDefaults() throws Exception { - reflectionTester.assertClearViaReflection( - TestAllTypes.getDefaultInstance()); - reflectionTester.assertClearViaReflection( - TestAllTypes.newBuilder().build()); + reflectionTester.assertClearViaReflection(TestAllTypes.getDefaultInstance()); + reflectionTester.assertClearViaReflection(TestAllTypes.newBuilder().build()); } public void testReflectionGetOneof() throws Exception { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); reflectionTester.setAllFieldsViaReflection(builder); - Descriptors.OneofDescriptor oneof = - TestAllTypes.getDescriptor().getOneofs().get(0); - Descriptors.FieldDescriptor field = - TestAllTypes.getDescriptor().findFieldByName("oneof_bytes"); + Descriptors.OneofDescriptor oneof = TestAllTypes.getDescriptor().getOneofs().get(0); + Descriptors.FieldDescriptor field = TestAllTypes.getDescriptor().findFieldByName("oneof_bytes"); assertSame(field, builder.getOneofFieldDescriptor(oneof)); TestAllTypes message = builder.build(); @@ -545,10 +527,8 @@ public class GeneratedMessageTest extends TestCase { public void testReflectionClearOneof() throws Exception { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); reflectionTester.setAllFieldsViaReflection(builder); - Descriptors.OneofDescriptor oneof = - TestAllTypes.getDescriptor().getOneofs().get(0); - Descriptors.FieldDescriptor field = - TestAllTypes.getDescriptor().findFieldByName("oneof_bytes"); + Descriptors.OneofDescriptor oneof = TestAllTypes.getDescriptor().getOneofs().get(0); + Descriptors.FieldDescriptor field = TestAllTypes.getDescriptor().findFieldByName("oneof_bytes"); assertTrue(builder.hasOneof(oneof)); assertTrue(builder.hasField(field)); @@ -558,8 +538,8 @@ public class GeneratedMessageTest extends TestCase { } public void testEnumInterface() throws Exception { - assertTrue(TestAllTypes.getDefaultInstance().getDefaultNestedEnum() - instanceof ProtocolMessageEnum); + assertTrue( + TestAllTypes.getDefaultInstance().getDefaultNestedEnum() instanceof ProtocolMessageEnum); } public void testEnumMap() throws Exception { @@ -574,15 +554,13 @@ public class GeneratedMessageTest extends TestCase { public void testParsePackedToUnpacked() throws Exception { TestUnpackedTypes.Builder builder = TestUnpackedTypes.newBuilder(); - TestUnpackedTypes message = - builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build(); + TestUnpackedTypes message = builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build(); TestUtil.assertUnpackedFieldsSet(message); } public void testParseUnpackedToPacked() throws Exception { TestPackedTypes.Builder builder = TestPackedTypes.newBuilder(); - TestPackedTypes message = - builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build(); + TestPackedTypes message = builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build(); TestUtil.assertPackedFieldsSet(message); } @@ -590,8 +568,8 @@ public class GeneratedMessageTest extends TestCase { // Extensions. TestUtil.ReflectionTester extensionsReflectionTester = - new TestUtil.ReflectionTester(TestAllExtensions.getDescriptor(), - TestUtil.getExtensionRegistry()); + new TestUtil.ReflectionTester( + TestAllExtensions.getDescriptor(), TestUtil.getFullExtensionRegistry()); public void testExtensionMessageOrBuilder() throws Exception { TestAllExtensions.Builder builder = TestAllExtensions.newBuilder(); @@ -661,32 +639,29 @@ public class GeneratedMessageTest extends TestCase { TestUtil.assertRepeatedExtensionsModified(message); } - public void testExtensionReflectionRepeatedSettersRejectNull() - throws Exception { + public void testExtensionReflectionRepeatedSettersRejectNull() throws Exception { TestAllExtensions.Builder builder = TestAllExtensions.newBuilder(); - extensionsReflectionTester.assertReflectionRepeatedSettersRejectNull( - builder); + extensionsReflectionTester.assertReflectionRepeatedSettersRejectNull(builder); } public void testExtensionReflectionDefaults() throws Exception { - extensionsReflectionTester.assertClearViaReflection( - TestAllExtensions.getDefaultInstance()); - extensionsReflectionTester.assertClearViaReflection( - TestAllExtensions.newBuilder().build()); + extensionsReflectionTester.assertClearViaReflection(TestAllExtensions.getDefaultInstance()); + extensionsReflectionTester.assertClearViaReflection(TestAllExtensions.newBuilder().build()); } public void testClearExtension() throws Exception { // clearExtension() is not actually used in TestUtil, so try it manually. assertFalse( - TestAllExtensions.newBuilder() - .setExtension(UnittestProto.optionalInt32Extension, 1) - .clearExtension(UnittestProto.optionalInt32Extension) - .hasExtension(UnittestProto.optionalInt32Extension)); - assertEquals(0, - TestAllExtensions.newBuilder() - .addExtension(UnittestProto.repeatedInt32Extension, 1) - .clearExtension(UnittestProto.repeatedInt32Extension) - .getExtensionCount(UnittestProto.repeatedInt32Extension)); + TestAllExtensions.newBuilder() + .setExtension(UnittestProto.optionalInt32Extension, 1) + .clearExtension(UnittestProto.optionalInt32Extension) + .hasExtension(UnittestProto.optionalInt32Extension)); + assertEquals( + 0, + TestAllExtensions.newBuilder() + .addExtension(UnittestProto.repeatedInt32Extension, 1) + .clearExtension(UnittestProto.repeatedInt32Extension) + .getExtensionCount(UnittestProto.repeatedInt32Extension)); } public void testExtensionCopy() throws Exception { @@ -697,13 +672,12 @@ public class GeneratedMessageTest extends TestCase { public void testExtensionMergeFrom() throws Exception { TestAllExtensions original = - TestAllExtensions.newBuilder() - .setExtension(UnittestProto.optionalInt32Extension, 1).build(); - TestAllExtensions merged = - TestAllExtensions.newBuilder().mergeFrom(original).build(); + TestAllExtensions.newBuilder() + .setExtension(UnittestProto.optionalInt32Extension, 1) + .build(); + TestAllExtensions merged = TestAllExtensions.newBuilder().mergeFrom(original).build(); assertTrue(merged.hasExtension(UnittestProto.optionalInt32Extension)); - assertEquals( - 1, (int) merged.getExtension(UnittestProto.optionalInt32Extension)); + assertEquals(1, (int) merged.getExtension(UnittestProto.optionalInt32Extension)); } // ================================================================= @@ -714,64 +688,69 @@ public class GeneratedMessageTest extends TestCase { // or messages defined in multiple_files_test.proto because the class loading // order affects initialization process of custom options. public void testEnumValueOptionsInMultipleFilesMode() throws Exception { - assertEquals(12345, EnumWithNoOuter.FOO.getValueDescriptor().getOptions() - .getExtension(MultipleFilesTestProto.enumValueOption).intValue()); + assertEquals( + 12345, + EnumWithNoOuter.FOO + .getValueDescriptor() + .getOptions() + .getExtension(MultipleFilesTestProto.enumValueOption) + .intValue()); } public void testMultipleFilesOption() throws Exception { // We mostly just want to check that things compile. MessageWithNoOuter message = - MessageWithNoOuter.newBuilder() - .setNested(MessageWithNoOuter.NestedMessage.newBuilder().setI(1)) - .addForeign(TestAllTypes.newBuilder().setOptionalInt32(1)) - .setNestedEnum(MessageWithNoOuter.NestedEnum.BAZ) - .setForeignEnum(EnumWithNoOuter.BAR) - .build(); + MessageWithNoOuter.newBuilder() + .setNested(MessageWithNoOuter.NestedMessage.newBuilder().setI(1)) + .addForeign(TestAllTypes.newBuilder().setOptionalInt32(1)) + .setNestedEnum(MessageWithNoOuter.NestedEnum.BAZ) + .setForeignEnum(EnumWithNoOuter.BAR) + .build(); assertEquals(message, MessageWithNoOuter.parseFrom(message.toByteString())); - assertEquals(MultipleFilesTestProto.getDescriptor(), - MessageWithNoOuter.getDescriptor().getFile()); + assertEquals( + MultipleFilesTestProto.getDescriptor(), MessageWithNoOuter.getDescriptor().getFile()); Descriptors.FieldDescriptor field = - MessageWithNoOuter.getDescriptor().findFieldByName("foreign_enum"); - assertEquals(EnumWithNoOuter.BAR.getValueDescriptor(), - message.getField(field)); + MessageWithNoOuter.getDescriptor().findFieldByName("foreign_enum"); + assertEquals(EnumWithNoOuter.BAR.getValueDescriptor(), message.getField(field)); - assertEquals(MultipleFilesTestProto.getDescriptor(), - ServiceWithNoOuter.getDescriptor().getFile()); + assertEquals( + MultipleFilesTestProto.getDescriptor(), ServiceWithNoOuter.getDescriptor().getFile()); assertFalse( - TestAllExtensions.getDefaultInstance().hasExtension( - MultipleFilesTestProto.extensionWithOuter)); + TestAllExtensions.getDefaultInstance() + .hasExtension(MultipleFilesTestProto.extensionWithOuter)); } - public void testOptionalFieldWithRequiredSubfieldsOptimizedForSize() - throws Exception { - TestOptionalOptimizedForSize message = - TestOptionalOptimizedForSize.getDefaultInstance(); + public void testOptionalFieldWithRequiredSubfieldsOptimizedForSize() throws Exception { + TestOptionalOptimizedForSize message = TestOptionalOptimizedForSize.getDefaultInstance(); assertTrue(message.isInitialized()); - message = TestOptionalOptimizedForSize.newBuilder().setO( - TestRequiredOptimizedForSize.newBuilder().buildPartial() - ).buildPartial(); + message = + TestOptionalOptimizedForSize.newBuilder() + .setO(TestRequiredOptimizedForSize.newBuilder().buildPartial()) + .buildPartial(); assertFalse(message.isInitialized()); - message = TestOptionalOptimizedForSize.newBuilder().setO( - TestRequiredOptimizedForSize.newBuilder().setX(5).buildPartial() - ).buildPartial(); + message = + TestOptionalOptimizedForSize.newBuilder() + .setO(TestRequiredOptimizedForSize.newBuilder().setX(5).buildPartial()) + .buildPartial(); assertTrue(message.isInitialized()); } - public void testUninitializedExtensionInOptimizedForSize() - throws Exception { + public void testUninitializedExtensionInOptimizedForSize() throws Exception { TestOptimizedForSize.Builder builder = TestOptimizedForSize.newBuilder(); - builder.setExtension(TestOptimizedForSize.testExtension2, + builder.setExtension( + TestOptimizedForSize.testExtension2, TestRequiredOptimizedForSize.newBuilder().buildPartial()); assertFalse(builder.isInitialized()); assertFalse(builder.buildPartial().isInitialized()); builder = TestOptimizedForSize.newBuilder(); - builder.setExtension(TestOptimizedForSize.testExtension2, + builder.setExtension( + TestOptimizedForSize.testExtension2, TestRequiredOptimizedForSize.newBuilder().setX(10).buildPartial()); assertTrue(builder.isInitialized()); assertTrue(builder.buildPartial().isInitialized()); @@ -802,13 +781,11 @@ public class GeneratedMessageTest extends TestCase { assertEquals(UnittestProto.TestRequired.MULTI_FIELD_NUMBER, 1001); assertEquals(UnittestProto.OPTIONAL_INT32_EXTENSION_FIELD_NUMBER, 1); assertEquals(UnittestProto.OPTIONALGROUP_EXTENSION_FIELD_NUMBER, 16); - assertEquals( - UnittestProto.OPTIONAL_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER, 18); + assertEquals(UnittestProto.OPTIONAL_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER, 18); assertEquals(UnittestProto.OPTIONAL_NESTED_ENUM_EXTENSION_FIELD_NUMBER, 21); assertEquals(UnittestProto.REPEATED_INT32_EXTENSION_FIELD_NUMBER, 31); assertEquals(UnittestProto.REPEATEDGROUP_EXTENSION_FIELD_NUMBER, 46); - assertEquals( - UnittestProto.REPEATED_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER, 48); + assertEquals(UnittestProto.REPEATED_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER, 48); assertEquals(UnittestProto.REPEATED_NESTED_ENUM_EXTENSION_FIELD_NUMBER, 51); } @@ -817,7 +794,7 @@ public class GeneratedMessageTest extends TestCase { UnittestProto.TestRecursiveMessage.getDefaultInstance(); assertTrue(message != null); assertNotNull(message.getA()); - assertTrue(message.getA() == message); + assertTrue(message.getA().equals(message)); } public void testSerialize() throws Exception { @@ -853,6 +830,67 @@ public class GeneratedMessageTest extends TestCase { assertEquals(expected, actual); } + public void testDeserializeWithoutClassField() throws Exception { + // serialized form for version <=3.6.0 + // just includes messageClassName and asBytes + + // Int32Value.newBuilder().setValue(123).build() + byte[] int32ValueBytes = + new byte[] { + -84, -19, 0, 5, 115, 114, 0, 55, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 112, + 114, 111, 116, 111, 98, 117, 102, 46, 71, 101, 110, 101, 114, 97, 116, 101, 100, 77, 101, + 115, 115, 97, 103, 101, 76, 105, 116, 101, 36, 83, 101, 114, 105, 97, 108, 105, 122, 101, + 100, 70, 111, 114, 109, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 91, 0, 7, 97, 115, 66, 121, 116, + 101, 115, 116, 0, 2, 91, 66, 76, 0, 16, 109, 101, 115, 115, 97, 103, 101, 67, 108, 97, + 115, 115, 78, 97, 109, 101, 116, 0, 18, 76, 106, 97, 118, 97, 47, 108, 97, 110, 103, 47, + 83, 116, 114, 105, 110, 103, 59, 120, 112, 117, 114, 0, 2, 91, 66, -84, -13, 23, -8, 6, 8, + 84, -32, 2, 0, 0, 120, 112, 0, 0, 0, 2, 8, 123, 116, 0, 30, 99, 111, 109, 46, 103, 111, + 111, 103, 108, 101, 46, 112, 114, 111, 116, 111, 98, 117, 102, 46, 73, 110, 116, 51, 50, + 86, 97, 108, 117, 101 + }; + + ByteArrayInputStream bais = new ByteArrayInputStream(int32ValueBytes); + ObjectInputStream in = new ObjectInputStream(bais); + Int32Value int32Value = (Int32Value) in.readObject(); + assertEquals(123, int32Value.getValue()); + } + + public void testDeserializeWithClassField() throws Exception { + // serialized form for version > 3.6.0 + // includes messageClass, messageClassName (for compatibility), and asBytes + + // Int32Value.newBuilder().setValue(123).build() + byte[] int32ValueBytes = + new byte[] { + -84, -19, 0, 5, 115, 114, 0, 55, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 112, + 114, 111, 116, 111, 98, 117, 102, 46, 71, 101, 110, 101, 114, 97, 116, 101, 100, 77, 101, + 115, 115, 97, 103, 101, 76, 105, 116, 101, 36, 83, 101, 114, 105, 97, 108, 105, 122, 101, + 100, 70, 111, 114, 109, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 91, 0, 7, 97, 115, 66, 121, 116, + 101, 115, 116, 0, 2, 91, 66, 76, 0, 12, 109, 101, 115, 115, 97, 103, 101, 67, 108, 97, + 115, 115, 116, 0, 17, 76, 106, 97, 118, 97, 47, 108, 97, 110, 103, 47, 67, 108, 97, 115, + 115, 59, 76, 0, 16, 109, 101, 115, 115, 97, 103, 101, 67, 108, 97, 115, 115, 78, 97, 109, + 101, 116, 0, 18, 76, 106, 97, 118, 97, 47, 108, 97, 110, 103, 47, 83, 116, 114, 105, 110, + 103, 59, 120, 112, 117, 114, 0, 2, 91, 66, -84, -13, 23, -8, 6, 8, 84, -32, 2, 0, 0, 120, + 112, 0, 0, 0, 2, 8, 123, 118, 114, 0, 30, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, + 46, 112, 114, 111, 116, 111, 98, 117, 102, 46, 73, 110, 116, 51, 50, 86, 97, 108, 117, + 101, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 66, 0, 21, 109, 101, 109, 111, 105, 122, 101, 100, + 73, 115, 73, 110, 105, 116, 105, 97, 108, 105, 122, 101, 100, 73, 0, 6, 118, 97, 108, 117, + 101, 95, 120, 114, 0, 38, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 112, 114, + 111, 116, 111, 98, 117, 102, 46, 71, 101, 110, 101, 114, 97, 116, 101, 100, 77, 101, 115, + 115, 97, 103, 101, 86, 51, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 1, 76, 0, 13, 117, 110, 107, 110, + 111, 119, 110, 70, 105, 101, 108, 100, 115, 116, 0, 37, 76, 99, 111, 109, 47, 103, 111, + 111, 103, 108, 101, 47, 112, 114, 111, 116, 111, 98, 117, 102, 47, 85, 110, 107, 110, 111, + 119, 110, 70, 105, 101, 108, 100, 83, 101, 116, 59, 120, 112, 116, 0, 30, 99, 111, 109, + 46, 103, 111, 111, 103, 108, 101, 46, 112, 114, 111, 116, 111, 98, 117, 102, 46, 73, 110, + 116, 51, 50, 86, 97, 108, 117, 101 + }; + + ByteArrayInputStream bais = new ByteArrayInputStream(int32ValueBytes); + ObjectInputStream in = new ObjectInputStream(bais); + Int32Value int32Value = (Int32Value) in.readObject(); + assertEquals(123, int32Value.getValue()); + } + public void testEnumValues() { assertEquals(TestAllTypes.NestedEnum.BAR_VALUE, TestAllTypes.NestedEnum.BAR.getNumber()); assertEquals(TestAllTypes.NestedEnum.BAZ_VALUE, TestAllTypes.NestedEnum.BAZ.getNumber()); @@ -860,33 +898,33 @@ public class GeneratedMessageTest extends TestCase { } public void testNonNestedExtensionInitialization() { - assertTrue(NonNestedExtension.nonNestedExtension - .getMessageDefaultInstance() instanceof MyNonNestedExtension); - assertEquals("nonNestedExtension", - NonNestedExtension.nonNestedExtension.getDescriptor().getName()); + assertTrue( + NonNestedExtension.nonNestedExtension.getMessageDefaultInstance() + instanceof MyNonNestedExtension); + assertEquals( + "nonNestedExtension", NonNestedExtension.nonNestedExtension.getDescriptor().getName()); } public void testNestedExtensionInitialization() { - assertTrue(MyNestedExtension.recursiveExtension.getMessageDefaultInstance() - instanceof MessageToBeExtended); - assertEquals("recursiveExtension", - MyNestedExtension.recursiveExtension.getDescriptor().getName()); + assertTrue( + MyNestedExtension.recursiveExtension.getMessageDefaultInstance() + instanceof MessageToBeExtended); + assertEquals( + "recursiveExtension", MyNestedExtension.recursiveExtension.getDescriptor().getName()); } public void testInvalidations() throws Exception { GeneratedMessage.enableAlwaysUseFieldBuildersForTesting(); - TestAllTypes.NestedMessage nestedMessage1 = - TestAllTypes.NestedMessage.newBuilder().build(); - TestAllTypes.NestedMessage nestedMessage2 = - TestAllTypes.NestedMessage.newBuilder().build(); + TestAllTypes.NestedMessage nestedMessage1 = TestAllTypes.NestedMessage.newBuilder().build(); + TestAllTypes.NestedMessage nestedMessage2 = TestAllTypes.NestedMessage.newBuilder().build(); // Set all three flavors (enum, primitive, message and singular/repeated) // and verify no invalidations fired TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - TestAllTypes.Builder builder = (TestAllTypes.Builder) - ((AbstractMessage) TestAllTypes.getDefaultInstance()). - newBuilderForType(mockParent); + TestAllTypes.Builder builder = + (TestAllTypes.Builder) + ((AbstractMessage) TestAllTypes.getDefaultInstance()).newBuilderForType(mockParent); builder.setOptionalInt32(1); builder.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR); builder.setOptionalNestedMessage(nestedMessage1); @@ -933,15 +971,15 @@ public class GeneratedMessageTest extends TestCase { builder.addRepeatedNestedMessage(nestedMessage2); builder.addRepeatedNestedMessage(nestedMessage1); assertEquals(6, mockParent.getInvalidationCount()); - } public void testInvalidations_Extensions() throws Exception { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - TestAllExtensions.Builder builder = (TestAllExtensions.Builder) - ((AbstractMessage) TestAllExtensions.getDefaultInstance()). - newBuilderForType(mockParent); + TestAllExtensions.Builder builder = + (TestAllExtensions.Builder) + ((AbstractMessage) TestAllExtensions.getDefaultInstance()) + .newBuilderForType(mockParent); builder.addExtension(UnittestProto.repeatedInt32Extension, 1); builder.setExtension(UnittestProto.repeatedInt32Extension, 0, 2); @@ -969,25 +1007,19 @@ public class GeneratedMessageTest extends TestCase { // Mostly just makes sure the base interface exists and has some methods. TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TestAllTypes message = builder.buildPartial(); - TestAllTypesOrBuilder builderAsInterface = (TestAllTypesOrBuilder) builder; TestAllTypesOrBuilder messageAsInterface = (TestAllTypesOrBuilder) message; + assertEquals(messageAsInterface.getDefaultBool(), messageAsInterface.getDefaultBool()); assertEquals( - messageAsInterface.getDefaultBool(), - messageAsInterface.getDefaultBool()); - assertEquals( - messageAsInterface.getOptionalDouble(), - messageAsInterface.getOptionalDouble()); + messageAsInterface.getOptionalDouble(), messageAsInterface.getOptionalDouble(), 0.0); } public void testMessageOrBuilderGetters() { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); // single fields - assertSame(ForeignMessage.getDefaultInstance(), - builder.getOptionalForeignMessageOrBuilder()); - ForeignMessage.Builder subBuilder = - builder.getOptionalForeignMessageBuilder(); + assertSame(ForeignMessage.getDefaultInstance(), builder.getOptionalForeignMessageOrBuilder()); + ForeignMessage.Builder subBuilder = builder.getOptionalForeignMessageBuilder(); assertSame(subBuilder, builder.getOptionalForeignMessageOrBuilder()); // repeated fields @@ -1016,36 +1048,37 @@ public class GeneratedMessageTest extends TestCase { public void testGetFieldBuilder() { Descriptor descriptor = TestAllTypes.getDescriptor(); - FieldDescriptor fieldDescriptor = - descriptor.findFieldByName("optional_nested_message"); - FieldDescriptor foreignFieldDescriptor = - descriptor.findFieldByName("optional_foreign_message"); - FieldDescriptor importFieldDescriptor = - descriptor.findFieldByName("optional_import_message"); + FieldDescriptor fieldDescriptor = descriptor.findFieldByName("optional_nested_message"); + FieldDescriptor foreignFieldDescriptor = descriptor.findFieldByName("optional_foreign_message"); + FieldDescriptor importFieldDescriptor = descriptor.findFieldByName("optional_import_message"); // Mutate the message with new field builder // Mutate nested message TestAllTypes.Builder builder1 = TestAllTypes.newBuilder(); - Message.Builder fieldBuilder1 = builder1.newBuilderForField(fieldDescriptor) - .mergeFrom((Message) builder1.getField(fieldDescriptor)); + Message.Builder fieldBuilder1 = + builder1 + .newBuilderForField(fieldDescriptor) + .mergeFrom((Message) builder1.getField(fieldDescriptor)); FieldDescriptor subFieldDescriptor1 = fieldBuilder1.getDescriptorForType().findFieldByName("bb"); fieldBuilder1.setField(subFieldDescriptor1, 1); builder1.setField(fieldDescriptor, fieldBuilder1.build()); // Mutate foreign message - Message.Builder foreignFieldBuilder1 = builder1.newBuilderForField( - foreignFieldDescriptor) - .mergeFrom((Message) builder1.getField(foreignFieldDescriptor)); + Message.Builder foreignFieldBuilder1 = + builder1 + .newBuilderForField(foreignFieldDescriptor) + .mergeFrom((Message) builder1.getField(foreignFieldDescriptor)); FieldDescriptor subForeignFieldDescriptor1 = foreignFieldBuilder1.getDescriptorForType().findFieldByName("c"); foreignFieldBuilder1.setField(subForeignFieldDescriptor1, 2); builder1.setField(foreignFieldDescriptor, foreignFieldBuilder1.build()); // Mutate import message - Message.Builder importFieldBuilder1 = builder1.newBuilderForField( - importFieldDescriptor) - .mergeFrom((Message) builder1.getField(importFieldDescriptor)); + Message.Builder importFieldBuilder1 = + builder1 + .newBuilderForField(importFieldDescriptor) + .mergeFrom((Message) builder1.getField(importFieldDescriptor)); FieldDescriptor subImportFieldDescriptor1 = importFieldBuilder1.getDescriptorForType().findFieldByName("d"); importFieldBuilder1.setField(subImportFieldDescriptor1, 3); @@ -1063,18 +1096,20 @@ public class GeneratedMessageTest extends TestCase { builder2.setField(fieldDescriptor, fieldBuilder2.build()); // Mutate foreign message - Message.Builder foreignFieldBuilder2 = builder2.newBuilderForField( - foreignFieldDescriptor) - .mergeFrom((Message) builder2.getField(foreignFieldDescriptor)); + Message.Builder foreignFieldBuilder2 = + builder2 + .newBuilderForField(foreignFieldDescriptor) + .mergeFrom((Message) builder2.getField(foreignFieldDescriptor)); FieldDescriptor subForeignFieldDescriptor2 = foreignFieldBuilder2.getDescriptorForType().findFieldByName("c"); foreignFieldBuilder2.setField(subForeignFieldDescriptor2, 2); builder2.setField(foreignFieldDescriptor, foreignFieldBuilder2.build()); // Mutate import message - Message.Builder importFieldBuilder2 = builder2.newBuilderForField( - importFieldDescriptor) - .mergeFrom((Message) builder2.getField(importFieldDescriptor)); + Message.Builder importFieldBuilder2 = + builder2 + .newBuilderForField(importFieldDescriptor) + .mergeFrom((Message) builder2.getField(importFieldDescriptor)); FieldDescriptor subImportFieldDescriptor2 = importFieldBuilder2.getDescriptorForType().findFieldByName("d"); importFieldBuilder2.setField(subImportFieldDescriptor2, 3); @@ -1088,10 +1123,9 @@ public class GeneratedMessageTest extends TestCase { public void testGetFieldBuilderWithInitializedValue() { Descriptor descriptor = TestAllTypes.getDescriptor(); - FieldDescriptor fieldDescriptor = - descriptor.findFieldByName("optional_nested_message"); + FieldDescriptor fieldDescriptor = descriptor.findFieldByName("optional_nested_message"); - // Before setting field, builder is initialized by default value. + // Before setting field, builder is initialized by default value. TestAllTypes.Builder builder = TestAllTypes.newBuilder(); NestedMessage.Builder fieldBuilder = (NestedMessage.Builder) builder.getFieldBuilder(fieldDescriptor); @@ -1099,12 +1133,10 @@ public class GeneratedMessageTest extends TestCase { // Setting field value with new field builder instance. builder = TestAllTypes.newBuilder(); - NestedMessage.Builder newFieldBuilder = - builder.getOptionalNestedMessageBuilder(); + NestedMessage.Builder newFieldBuilder = builder.getOptionalNestedMessageBuilder(); newFieldBuilder.setBb(2); // Then get the field builder instance by getFieldBuilder(). - fieldBuilder = - (NestedMessage.Builder) builder.getFieldBuilder(fieldDescriptor); + fieldBuilder = (NestedMessage.Builder) builder.getFieldBuilder(fieldDescriptor); // It should contain new value. assertEquals(2, fieldBuilder.getBb()); // These two builder should be equal. @@ -1121,8 +1153,7 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.getFieldBuilder( - descriptor.findFieldByName("optional_nested_enum")); + builder.getFieldBuilder(descriptor.findFieldByName("optional_nested_enum")); fail("Exception was not thrown"); } catch (UnsupportedOperationException e) { // We expect this exception. @@ -1134,15 +1165,13 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.getFieldBuilder( - descriptor.findFieldByName("repeated_nested_enum")); + builder.getFieldBuilder(descriptor.findFieldByName("repeated_nested_enum")); fail("Exception was not thrown"); } catch (UnsupportedOperationException e) { // We expect this exception. } try { - builder.getFieldBuilder( - descriptor.findFieldByName("repeated_nested_message")); + builder.getFieldBuilder(descriptor.findFieldByName("repeated_nested_message")); fail("Exception was not thrown"); } catch (UnsupportedOperationException e) { // We expect this exception. @@ -1157,25 +1186,25 @@ public class GeneratedMessageTest extends TestCase { // expected name. There is nothing else to test. OuterClassNameTestOuterClass.OuterClassNameTest message = OuterClassNameTestOuterClass.OuterClassNameTest.newBuilder().build(); - assertTrue(message.getDescriptorForType() == - OuterClassNameTestOuterClass.OuterClassNameTest.getDescriptor()); + assertTrue( + message.getDescriptorForType() + == OuterClassNameTestOuterClass.OuterClassNameTest.getDescriptor()); - OuterClassNameTest2OuterClass.TestMessage2.NestedMessage.OuterClassNameTest2 - message2 = OuterClassNameTest2OuterClass.TestMessage2.NestedMessage - .OuterClassNameTest2.newBuilder().build(); + OuterClassNameTest2OuterClass.TestMessage2.NestedMessage.OuterClassNameTest2 message2 = + OuterClassNameTest2OuterClass.TestMessage2.NestedMessage.OuterClassNameTest2.newBuilder() + .build(); assertEquals(0, message2.getSerializedSize()); - OuterClassNameTest3OuterClass.TestMessage3.NestedMessage.OuterClassNameTest3 - enumValue = OuterClassNameTest3OuterClass.TestMessage3.NestedMessage - .OuterClassNameTest3.DUMMY_VALUE; + OuterClassNameTest3OuterClass.TestMessage3.NestedMessage.OuterClassNameTest3 enumValue = + OuterClassNameTest3OuterClass.TestMessage3.NestedMessage.OuterClassNameTest3.DUMMY_VALUE; assertEquals(1, enumValue.getNumber()); } // ================================================================= // oneof generated code test public void testOneofEnumCase() throws Exception { - TestOneof2 message = TestOneof2.newBuilder() - .setFooInt(123).setFooString("foo").setFooCord("bar").build(); + TestOneof2 message = + TestOneof2.newBuilder().setFooInt(123).setFooString("foo").setFooCord("bar").build(); TestUtil.assertAtMostOneFieldSetOneof(message); } @@ -1188,8 +1217,7 @@ public class GeneratedMessageTest extends TestCase { public void testSetOneofClearsOthers() throws Exception { TestOneof2.Builder builder = TestOneof2.newBuilder(); - TestOneof2 message = - builder.setFooInt(123).setFooString("foo").buildPartial(); + TestOneof2 message = builder.setFooInt(123).setFooString("foo").buildPartial(); assertTrue(message.hasFooString()); TestUtil.assertAtMostOneFieldSetOneof(message); @@ -1209,8 +1237,10 @@ public class GeneratedMessageTest extends TestCase { assertTrue(message.hasFooEnum()); TestUtil.assertAtMostOneFieldSetOneof(message); - message = builder.setFooMessage( - TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()).buildPartial(); + message = + builder + .setFooMessage(TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()) + .buildPartial(); assertTrue(message.hasFooMessage()); TestUtil.assertAtMostOneFieldSetOneof(message); @@ -1326,8 +1356,7 @@ public class GeneratedMessageTest extends TestCase { // set TestOneof2.Builder builder = TestOneof2.newBuilder(); assertEquals(0, builder.getFooMessage().getQuxInt()); - builder.setFooMessage( - TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()); + builder.setFooMessage(TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()); assertTrue(builder.hasFooMessage()); assertEquals(234, builder.getFooMessage().getQuxInt()); TestOneof2 message = builder.buildPartial(); @@ -1342,8 +1371,7 @@ public class GeneratedMessageTest extends TestCase { // nested builder builder = TestOneof2.newBuilder(); - assertSame(builder.getFooMessageOrBuilder(), - TestOneof2.NestedMessage.getDefaultInstance()); + assertSame(builder.getFooMessageOrBuilder(), TestOneof2.NestedMessage.getDefaultInstance()); assertFalse(builder.hasFooMessage()); builder.getFooMessageBuilder().setQuxInt(123); assertTrue(builder.hasFooMessage()); @@ -1387,8 +1415,10 @@ public class GeneratedMessageTest extends TestCase { // Message { TestOneof2.Builder builder = TestOneof2.newBuilder(); - TestOneof2 message = builder.setFooMessage( - TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()).build(); + TestOneof2 message = + builder + .setFooMessage(TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()) + .build(); TestOneof2 message2 = TestOneof2.newBuilder().mergeFrom(message).build(); assertTrue(message2.hasFooMessage()); assertEquals(234, message2.getFooMessage().getQuxInt()); @@ -1429,8 +1459,10 @@ public class GeneratedMessageTest extends TestCase { // Message { TestOneof2.Builder builder = TestOneof2.newBuilder(); - TestOneof2 message = builder.setFooMessage( - TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()).build(); + TestOneof2 message = + builder + .setFooMessage(TestOneof2.NestedMessage.newBuilder().setQuxInt(234).build()) + .build(); ByteString serialized = message.toByteString(); TestOneof2 message2 = TestOneof2.parseFrom(serialized); assertTrue(message2.hasFooMessage()); @@ -1452,40 +1484,32 @@ public class GeneratedMessageTest extends TestCase { public void testGetRepeatedFieldBuilder() { Descriptor descriptor = TestAllTypes.getDescriptor(); - FieldDescriptor fieldDescriptor = - descriptor.findFieldByName("repeated_nested_message"); - FieldDescriptor foreignFieldDescriptor = - descriptor.findFieldByName("repeated_foreign_message"); - FieldDescriptor importFieldDescriptor = - descriptor.findFieldByName("repeated_import_message"); + FieldDescriptor fieldDescriptor = descriptor.findFieldByName("repeated_nested_message"); + FieldDescriptor foreignFieldDescriptor = descriptor.findFieldByName("repeated_foreign_message"); + FieldDescriptor importFieldDescriptor = descriptor.findFieldByName("repeated_import_message"); // Mutate the message with new field builder // Mutate nested message TestAllTypes.Builder builder1 = TestAllTypes.newBuilder(); - Message.Builder fieldBuilder1 = builder1.newBuilderForField( - fieldDescriptor); + Message.Builder fieldBuilder1 = builder1.newBuilderForField(fieldDescriptor); FieldDescriptor subFieldDescriptor1 = fieldBuilder1.getDescriptorForType().findFieldByName("bb"); fieldBuilder1.setField(subFieldDescriptor1, 1); builder1.addRepeatedField(fieldDescriptor, fieldBuilder1.build()); // Mutate foreign message - Message.Builder foreignFieldBuilder1 = builder1.newBuilderForField( - foreignFieldDescriptor); + Message.Builder foreignFieldBuilder1 = builder1.newBuilderForField(foreignFieldDescriptor); FieldDescriptor subForeignFieldDescriptor1 = foreignFieldBuilder1.getDescriptorForType().findFieldByName("c"); foreignFieldBuilder1.setField(subForeignFieldDescriptor1, 2); - builder1.addRepeatedField(foreignFieldDescriptor, - foreignFieldBuilder1.build()); + builder1.addRepeatedField(foreignFieldDescriptor, foreignFieldBuilder1.build()); // Mutate import message - Message.Builder importFieldBuilder1 = builder1.newBuilderForField( - importFieldDescriptor); + Message.Builder importFieldBuilder1 = builder1.newBuilderForField(importFieldDescriptor); FieldDescriptor subImportFieldDescriptor1 = importFieldBuilder1.getDescriptorForType().findFieldByName("d"); importFieldBuilder1.setField(subImportFieldDescriptor1, 3); - builder1.addRepeatedField(importFieldDescriptor, - importFieldBuilder1.build()); + builder1.addRepeatedField(importFieldDescriptor, importFieldBuilder1.build()); Message newMessage1 = builder1.build(); @@ -1493,29 +1517,24 @@ public class GeneratedMessageTest extends TestCase { // Mutate nested message TestAllTypes.Builder builder2 = TestAllTypes.newBuilder(); builder2.addRepeatedNestedMessageBuilder(); - Message.Builder fieldBuilder2 = builder2.getRepeatedFieldBuilder( - fieldDescriptor, 0); + Message.Builder fieldBuilder2 = builder2.getRepeatedFieldBuilder(fieldDescriptor, 0); FieldDescriptor subFieldDescriptor2 = fieldBuilder2.getDescriptorForType().findFieldByName("bb"); fieldBuilder2.setField(subFieldDescriptor2, 1); // Mutate foreign message - Message.Builder foreignFieldBuilder2 = builder2.newBuilderForField( - foreignFieldDescriptor); + Message.Builder foreignFieldBuilder2 = builder2.newBuilderForField(foreignFieldDescriptor); FieldDescriptor subForeignFieldDescriptor2 = foreignFieldBuilder2.getDescriptorForType().findFieldByName("c"); foreignFieldBuilder2.setField(subForeignFieldDescriptor2, 2); - builder2.addRepeatedField(foreignFieldDescriptor, - foreignFieldBuilder2.build()); + builder2.addRepeatedField(foreignFieldDescriptor, foreignFieldBuilder2.build()); // Mutate import message - Message.Builder importFieldBuilder2 = builder2.newBuilderForField( - importFieldDescriptor); + Message.Builder importFieldBuilder2 = builder2.newBuilderForField(importFieldDescriptor); FieldDescriptor subImportFieldDescriptor2 = importFieldBuilder2.getDescriptorForType().findFieldByName("d"); importFieldBuilder2.setField(subImportFieldDescriptor2, 3); - builder2.addRepeatedField(importFieldDescriptor, - importFieldBuilder2.build()); + builder2.addRepeatedField(importFieldDescriptor, importFieldBuilder2.build()); Message newMessage2 = builder2.build(); @@ -1525,10 +1544,9 @@ public class GeneratedMessageTest extends TestCase { public void testGetRepeatedFieldBuilderWithInitializedValue() { Descriptor descriptor = TestAllTypes.getDescriptor(); - FieldDescriptor fieldDescriptor = - descriptor.findFieldByName("repeated_nested_message"); + FieldDescriptor fieldDescriptor = descriptor.findFieldByName("repeated_nested_message"); - // Before setting field, builder is initialized by default value. + // Before setting field, builder is initialized by default value. TestAllTypes.Builder builder = TestAllTypes.newBuilder(); builder.addRepeatedNestedMessageBuilder(); NestedMessage.Builder fieldBuilder = @@ -1537,12 +1555,10 @@ public class GeneratedMessageTest extends TestCase { // Setting field value with new field builder instance. builder = TestAllTypes.newBuilder(); - NestedMessage.Builder newFieldBuilder = - builder.addRepeatedNestedMessageBuilder(); + NestedMessage.Builder newFieldBuilder = builder.addRepeatedNestedMessageBuilder(); newFieldBuilder.setBb(2); // Then get the field builder instance by getRepeatedFieldBuilder(). - fieldBuilder = - (NestedMessage.Builder) builder.getRepeatedFieldBuilder(fieldDescriptor, 0); + fieldBuilder = (NestedMessage.Builder) builder.getRepeatedFieldBuilder(fieldDescriptor, 0); // It should contain new value. assertEquals(2, fieldBuilder.getBb()); // These two builder should be equal. @@ -1559,8 +1575,7 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.getRepeatedFieldBuilder( - descriptor.findFieldByName("repeated_nested_enum"), 0); + builder.getRepeatedFieldBuilder(descriptor.findFieldByName("repeated_nested_enum"), 0); fail("Exception was not thrown"); } catch (UnsupportedOperationException e) { // We expect this exception. @@ -1572,15 +1587,13 @@ public class GeneratedMessageTest extends TestCase { // We expect this exception. } try { - builder.getRepeatedFieldBuilder( - descriptor.findFieldByName("optional_nested_enum"), 0); + builder.getRepeatedFieldBuilder(descriptor.findFieldByName("optional_nested_enum"), 0); fail("Exception was not thrown"); } catch (UnsupportedOperationException e) { // We expect this exception. } try { - builder.getRepeatedFieldBuilder( - descriptor.findFieldByName("optional_nested_message"), 0); + builder.getRepeatedFieldBuilder(descriptor.findFieldByName("optional_nested_message"), 0); fail("Exception was not thrown"); } catch (UnsupportedOperationException e) { // We expect this exception. diff --git a/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java b/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java index d8e97d4f..d6943e02 100644 --- a/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java @@ -45,10 +45,8 @@ import junit.framework.TestCase; */ public class IntArrayListTest extends TestCase { - private static final IntArrayList UNARY_LIST = - newImmutableIntArrayList(1); - private static final IntArrayList TERTIARY_LIST = - newImmutableIntArrayList(1, 2, 3); + private static final IntArrayList UNARY_LIST = newImmutableIntArrayList(1); + private static final IntArrayList TERTIARY_LIST = newImmutableIntArrayList(1, 2, 3); private IntArrayList list; @@ -225,9 +223,7 @@ public class IntArrayListTest extends TestCase { for (int i = 0; i < 6; i++) { list.add(Integer.valueOf(5 + i)); } - assertEquals( - asList(0, 1, 4, 2, 3, 5, 6, 7, 8, 9, 10), - list); + assertEquals(asList(0, 1, 4, 2, 3, 5, 6, 7, 8, 9, 10), list); try { list.add(-1, 5); @@ -312,7 +308,7 @@ public class IntArrayListTest extends TestCase { assertEquals(0, toRemove.size()); } - private void assertImmutable(IntArrayList list) { + private void assertImmutable(IntList list) { if (list.contains(1)) { throw new RuntimeException("Cannot test the immutability of lists that contain 1."); } diff --git a/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java b/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java index 756049b4..2518f20d 100644 --- a/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java +++ b/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java @@ -39,45 +39,36 @@ import static com.google.protobuf.IsValidUtf8TestUtil.testBytes; import com.google.protobuf.IsValidUtf8TestUtil.ByteStringFactory; import com.google.protobuf.IsValidUtf8TestUtil.Shard; - import junit.framework.TestCase; /** - * Tests cases for {@link ByteString#isValidUtf8()}. This includes three - * brute force tests that actually test every permutation of one byte, two byte, - * and three byte sequences to ensure that the method produces the right result - * for every possible byte encoding where "right" means it's consistent with - * java's UTF-8 string encoding/decoding such that the method returns true for - * any sequence that will round trip when converted to a String and then back to - * bytes and will return false for any sequence that will not round trip. - * See also {@link IsValidUtf8FourByteTest}. It also includes some - * other more targeted tests. + * Tests cases for {@link ByteString#isValidUtf8()}. This includes three brute force tests that + * actually test every permutation of one byte, two byte, and three byte sequences to ensure that + * the method produces the right result for every possible byte encoding where "right" means it's + * consistent with java's UTF-8 string encoding/decoding such that the method returns true for any + * sequence that will round trip when converted to a String and then back to bytes and will return + * false for any sequence that will not round trip. See also {@link IsValidUtf8FourByteTest}. It + * also includes some other more targeted tests. * * @author jonp@google.com (Jon Perlow) * @author martinrb@google.com (Martin Buchholz) */ public class IsValidUtf8Test extends TestCase { - /** - * Tests that round tripping of all two byte permutations work. - */ + /** Tests that round tripping of all two byte permutations work. */ public void testIsValidUtf8_1Byte() { testBytes(LITERAL_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT); testBytes(HEAP_NIO_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT); testBytes(DIRECT_NIO_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT); } - /** - * Tests that round tripping of all two byte permutations work. - */ + /** Tests that round tripping of all two byte permutations work. */ public void testIsValidUtf8_2Bytes() { testBytes(LITERAL_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT); testBytes(HEAP_NIO_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT); testBytes(DIRECT_NIO_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT); } - /** - * Tests that round tripping of all three byte permutations work. - */ + /** Tests that round tripping of all three byte permutations work. */ public void testIsValidUtf8_3Bytes() { // Travis' OOM killer doesn't like this test if (System.getenv("TRAVIS") == null) { @@ -88,10 +79,9 @@ public class IsValidUtf8Test extends TestCase { } /** - * Tests that round tripping of a sample of four byte permutations work. - * All permutations are prohibitively expensive to test for automated runs; - * {@link IsValidUtf8FourByteTest} is used for full coverage. This method - * tests specific four-byte cases. + * Tests that round tripping of a sample of four byte permutations work. All permutations are + * prohibitively expensive to test for automated runs; {@link IsValidUtf8FourByteTest} is used for + * full coverage. This method tests specific four-byte cases. */ public void testIsValidUtf8_4BytesSamples() { // Valid 4 byte. @@ -106,9 +96,7 @@ public class IsValidUtf8Test extends TestCase { assertInvalidUtf8(0xF4, 0x90, 0xAD, 0xA2); } - /** - * Tests some hard-coded test cases. - */ + /** Tests some hard-coded test cases. */ public void testSomeSequences() { // Empty assertTrue(asBytes("").isValidUtf8()); @@ -149,11 +137,12 @@ public class IsValidUtf8Test extends TestCase { assertTrue(not ^ leaf.isValidUtf8()); assertTrue(not ^ sub.isValidUtf8()); ByteString[] ropes = { - RopeByteString.newInstanceForTest(ByteString.EMPTY, leaf), - RopeByteString.newInstanceForTest(ByteString.EMPTY, sub), - RopeByteString.newInstanceForTest(leaf, ByteString.EMPTY), - RopeByteString.newInstanceForTest(sub, ByteString.EMPTY), - RopeByteString.newInstanceForTest(sub, leaf)}; + RopeByteString.newInstanceForTest(ByteString.EMPTY, leaf), + RopeByteString.newInstanceForTest(ByteString.EMPTY, sub), + RopeByteString.newInstanceForTest(leaf, ByteString.EMPTY), + RopeByteString.newInstanceForTest(sub, ByteString.EMPTY), + RopeByteString.newInstanceForTest(sub, leaf) + }; for (ByteString rope : ropes) { assertTrue(not ^ rope.isValidUtf8()); } diff --git a/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java b/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java index 1bcf63e7..2c086e11 100644 --- a/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java +++ b/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java @@ -50,8 +50,7 @@ import java.util.Random; import java.util.logging.Logger; /** - * Shared testing code for {@link IsValidUtf8Test} and - * {@link IsValidUtf8FourByteTest}. + * Shared testing code for {@link IsValidUtf8Test} and {@link IsValidUtf8FourByteTest}. * * @author jonp@google.com (Jon Perlow) * @author martinrb@google.com (Martin Buchholz) @@ -65,44 +64,47 @@ final class IsValidUtf8TestUtil { ByteString newByteString(byte[] bytes); } - static final ByteStringFactory LITERAL_FACTORY = new ByteStringFactory() { - @Override - public ByteString newByteString(byte[] bytes) { - return ByteString.wrap(bytes); - } - }; + static final ByteStringFactory LITERAL_FACTORY = + new ByteStringFactory() { + @Override + public ByteString newByteString(byte[] bytes) { + return ByteString.wrap(bytes); + } + }; - static final ByteStringFactory HEAP_NIO_FACTORY = new ByteStringFactory() { - @Override - public ByteString newByteString(byte[] bytes) { - return new NioByteString(ByteBuffer.wrap(bytes)); - } - }; + static final ByteStringFactory HEAP_NIO_FACTORY = + new ByteStringFactory() { + @Override + public ByteString newByteString(byte[] bytes) { + return new NioByteString(ByteBuffer.wrap(bytes)); + } + }; private static ThreadLocal<SoftReference<ByteBuffer>> directBuffer = new ThreadLocal<SoftReference<ByteBuffer>>(); /** - * Factory for direct {@link ByteBuffer} instances. To reduce direct memory usage, this - * uses a thread local direct buffer. This means that each call will overwrite the buffer's - * contents from the previous call, so the calling code must be careful not to continue using - * a buffer returned from a previous invocation. + * Factory for direct {@link ByteBuffer} instances. To reduce direct memory usage, this uses a + * thread local direct buffer. This means that each call will overwrite the buffer's contents from + * the previous call, so the calling code must be careful not to continue using a buffer returned + * from a previous invocation. */ - static final ByteStringFactory DIRECT_NIO_FACTORY = new ByteStringFactory() { - @Override - public ByteString newByteString(byte[] bytes) { - SoftReference<ByteBuffer> ref = directBuffer.get(); - ByteBuffer buffer = ref == null ? null : ref.get(); - if (buffer == null || buffer.capacity() < bytes.length) { - buffer = ByteBuffer.allocateDirect(bytes.length); - directBuffer.set(new SoftReference<ByteBuffer>(buffer)); - } - buffer.clear(); - buffer.put(bytes); - buffer.flip(); - return new NioByteString(buffer); - } - }; + static final ByteStringFactory DIRECT_NIO_FACTORY = + new ByteStringFactory() { + @Override + public ByteString newByteString(byte[] bytes) { + SoftReference<ByteBuffer> ref = directBuffer.get(); + ByteBuffer buffer = ref == null ? null : ref.get(); + if (buffer == null || buffer.capacity() < bytes.length) { + buffer = ByteBuffer.allocateDirect(bytes.length); + directBuffer.set(new SoftReference<ByteBuffer>(buffer)); + } + buffer.clear(); + buffer.put(bytes); + buffer.flip(); + return new NioByteString(buffer); + } + }; // 128 - [chars 0x0000 to 0x007f] static final long ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS = 0x007f - 0x0000 + 1; @@ -116,9 +118,10 @@ final class IsValidUtf8TestUtil { // 18,304 static final long EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT = // Both bytes are one byte characters - (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 2) + - // The possible number of two byte characters - TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS; + (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 2) + + + // The possible number of two byte characters + TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS; // 2048 static final long THREE_BYTE_SURROGATES = 2 * 1024; @@ -130,11 +133,13 @@ final class IsValidUtf8TestUtil { // 2,650,112 static final long EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT = // All one byte characters - (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 3) + - // One two byte character and a one byte character - 2 * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS + - // Three byte characters - THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS; + (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 3) + + + // One two byte character and a one byte character + 2 * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS + + + // Three byte characters + THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS; // 1,048,576 [chars 0x10000L to 0x10FFFF] static final long FOUR_BYTE_ROUNDTRIPPABLE_CHARACTERS = 0x10FFFF - 0x10000L + 1; @@ -142,17 +147,22 @@ final class IsValidUtf8TestUtil { // 289,571,839 static final long EXPECTED_FOUR_BYTE_ROUNDTRIPPABLE_COUNT = // All one byte characters - (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 4) + - // One and three byte characters - 2 * THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS + - // Two two byte characters - TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS + - // Permutations of one and two byte characters - 3 * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS - * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS - + - // Four byte characters - FOUR_BYTE_ROUNDTRIPPABLE_CHARACTERS; + (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 4) + + + // One and three byte characters + 2 * THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS + + + // Two two byte characters + TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS + + + // Permutations of one and two byte characters + 3 + * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS + * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS + * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS + + + // Four byte characters + FOUR_BYTE_ROUNDTRIPPABLE_CHARACTERS; static final class Shard { final long index; @@ -160,7 +170,6 @@ final class IsValidUtf8TestUtil { final long lim; final long expected; - public Shard(long index, long start, long lim, long expected) { assertTrue(start < lim); this.index = index; @@ -206,7 +215,6 @@ final class IsValidUtf8TestUtil { static final List<Shard> FOUR_BYTE_SHARDS = generateFourByteShards(128, FOUR_BYTE_SHARDS_EXPECTED_ROUNTRIPPABLES); - private static List<Shard> generateFourByteShards(int numShards, long[] expected) { assertEquals(numShards, expected.length); List<Shard> shards = new ArrayList<Shard>(numShards); @@ -220,8 +228,7 @@ final class IsValidUtf8TestUtil { } /** - * Helper to run the loop to test all the permutations for the number of bytes - * specified. + * Helper to run the loop to test all the permutations for the number of bytes specified. * * @param factory the factory for {@link ByteString} instances. * @param numBytes the number of bytes in the byte array @@ -232,16 +239,15 @@ final class IsValidUtf8TestUtil { } /** - * Helper to run the loop to test all the permutations for the number of bytes - * specified. This overload is useful for debugging to get the loop to start - * at a certain character. + * Helper to run the loop to test all the permutations for the number of bytes specified. This + * overload is useful for debugging to get the loop to start at a certain character. * * @param factory the factory for {@link ByteString} instances. * @param numBytes the number of bytes in the byte array * @param expectedCount the expected number of roundtrippable permutations * @param start the starting bytes encoded as a long as big-endian - * @param lim the limit of bytes to process encoded as a long as big-endian, - * or -1 to mean the max limit for numBytes + * @param lim the limit of bytes to process encoded as a long as big-endian, or -1 to mean the max + * limit for numBytes */ static void testBytes( ByteStringFactory factory, int numBytes, long expectedCount, long start, long lim) { @@ -301,9 +307,10 @@ final class IsValidUtf8TestUtil { assertEquals(isRoundTrippable, (state3 == Utf8.COMPLETE)); // Test ropes built out of small partial sequences - ByteString rope = RopeByteString.newInstanceForTest( - bs.substring(0, i), - RopeByteString.newInstanceForTest(bs.substring(i, j), bs.substring(j, numBytes))); + ByteString rope = + RopeByteString.newInstanceForTest( + bs.substring(0, i), + RopeByteString.newInstanceForTest(bs.substring(i, j), bs.substring(j, numBytes))); assertSame(RopeByteString.class, rope.getClass()); ByteString[] byteStrings = {bs, bs.substring(0, numBytes), rope}; @@ -336,27 +343,28 @@ final class IsValidUtf8TestUtil { } /** - * Variation of {@link #testBytes} that does less allocation using the - * low-level encoders/decoders directly. Checked in because it's useful for - * debugging when trying to process bytes faster, but since it doesn't use the - * actual String class, it's possible for incompatibilities to develop + * Variation of {@link #testBytes} that does less allocation using the low-level encoders/decoders + * directly. Checked in because it's useful for debugging when trying to process bytes faster, but + * since it doesn't use the actual String class, it's possible for incompatibilities to develop * (although unlikely). * * @param factory the factory for {@link ByteString} instances. * @param numBytes the number of bytes in the byte array * @param expectedCount the expected number of roundtrippable permutations * @param start the starting bytes encoded as a long as big-endian - * @param lim the limit of bytes to process encoded as a long as big-endian, - * or -1 to mean the max limit for numBytes + * @param lim the limit of bytes to process encoded as a long as big-endian, or -1 to mean the max + * limit for numBytes */ static void testBytesUsingByteBuffers( ByteStringFactory factory, int numBytes, long expectedCount, long start, long lim) { CharsetDecoder decoder = - Internal.UTF_8.newDecoder() + Internal.UTF_8 + .newDecoder() .onMalformedInput(CodingErrorAction.REPLACE) .onUnmappableCharacter(CodingErrorAction.REPLACE); CharsetEncoder encoder = - Internal.UTF_8.newEncoder() + Internal.UTF_8 + .newEncoder() .onMalformedInput(CodingErrorAction.REPLACE) .onUnmappableCharacter(CodingErrorAction.REPLACE); byte[] bytes = new byte[numBytes]; @@ -434,8 +442,10 @@ final class IsValidUtf8TestUtil { } private static void outputFailure(long byteChar, byte[] bytes, byte[] after, int len) { - fail("Failure: (" + Long.toHexString(byteChar) + ") " + toHexString(bytes) + " => " - + toHexString(after, len)); + fail( + String.format( + "Failure: (%s) %s => %s", + Long.toHexString(byteChar), toHexString(bytes), toHexString(after, len))); } private static String toHexString(byte[] b) { diff --git a/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java b/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java index f27e8e51..a3901e91 100644 --- a/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java +++ b/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java @@ -42,8 +42,7 @@ import junit.framework.TestCase; public class LazyFieldTest extends TestCase { public void testHashCode() { MessageLite message = TestUtil.getAllSet(); - LazyField lazyField = - createLazyFieldFromMessage(message); + LazyField lazyField = createLazyFieldFromMessage(message); assertEquals(message.hashCode(), lazyField.hashCode()); lazyField.getValue(); assertEquals(message.hashCode(), lazyField.hashCode()); @@ -102,8 +101,8 @@ public class LazyFieldTest extends TestCase { private LazyField createLazyFieldFromMessage(MessageLite message) { ByteString bytes = message.toByteString(); - return new LazyField(message.getDefaultInstanceForType(), - TestUtil.getExtensionRegistry(), bytes); + return new LazyField( + message.getDefaultInstanceForType(), TestUtil.getExtensionRegistry(), bytes); } private void changeValue(LazyField lazyField) { @@ -114,7 +113,6 @@ public class LazyFieldTest extends TestCase { } private void assertNotEqual(Object unexpected, Object actual) { - assertFalse(unexpected == actual - || (unexpected != null && unexpected.equals(actual))); + assertFalse(unexpected == actual || (unexpected != null && unexpected.equals(actual))); } } diff --git a/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java b/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java index 968ca206..c5880d50 100644 --- a/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java +++ b/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java @@ -44,8 +44,6 @@ import junit.framework.TestCase; */ public class LazyMessageLiteTest extends TestCase { - private Parser<LazyInnerMessageLite> originalLazyInnerMessageLiteParser; - @Override protected void setUp() throws Exception { super.setUp(); @@ -57,19 +55,16 @@ public class LazyMessageLiteTest extends TestCase { } public void testSetValues() { - LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder() - .setNum(3) - .build(); - LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder() - .setNum(2) - .setNested(nested) - .build(); - LazyMessageLite outer = LazyMessageLite.newBuilder() - .setNum(1) - .setInner(inner) - .setOneofNum(123) - .setOneofInner(inner) - .build(); + LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder().setNum(3).build(); + LazyInnerMessageLite inner = + LazyInnerMessageLite.newBuilder().setNum(2).setNested(nested).build(); + LazyMessageLite outer = + LazyMessageLite.newBuilder() + .setNum(1) + .setInner(inner) + .setOneofNum(123) + .setOneofInner(inner) + .build(); assertEquals(1, outer.getNum()); assertEquals(421, outer.getNumWithDefault()); @@ -90,44 +85,43 @@ public class LazyMessageLiteTest extends TestCase { } public void testSetRepeatedValues() { - LazyMessageLite outer = LazyMessageLite.newBuilder() - .setNum(1) - .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119)) - .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122)) - .build(); + LazyMessageLite outer = + LazyMessageLite.newBuilder() + .setNum(1) + .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119)) + .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122)) + .build(); assertEquals(1, outer.getNum()); assertEquals(2, outer.getRepeatedInnerCount()); assertEquals(119, outer.getRepeatedInner(0).getNum()); assertEquals(122, outer.getRepeatedInner(1).getNum()); } - + public void testRepeatedMutability() throws Exception { - LazyMessageLite outer = LazyMessageLite.newBuilder() - .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119)) - .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122)) - .build(); - + LazyMessageLite outer = + LazyMessageLite.newBuilder() + .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119)) + .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122)) + .build(); + outer = LazyMessageLite.parseFrom(outer.toByteArray()); try { outer.getRepeatedInnerList().set(1, null); fail(); - } catch (UnsupportedOperationException expected) {} + } catch (UnsupportedOperationException expected) { + } } public void testAddAll() { - ArrayList<LazyInnerMessageLite> inners = new ArrayList<LazyInnerMessageLite>(); + ArrayList<LazyInnerMessageLite> inners = new ArrayList<>(); int count = 4; for (int i = 0; i < count; i++) { - LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder() - .setNum(i) - .build(); + LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder().setNum(i).build(); inners.add(inner); } - LazyMessageLite outer = LazyMessageLite.newBuilder() - .addAllRepeatedInner(inners) - .build(); + LazyMessageLite outer = LazyMessageLite.newBuilder().addAllRepeatedInner(inners).build(); assertEquals(count, outer.getRepeatedInnerCount()); for (int i = 0; i < count; i++) { assertEquals(i, outer.getRepeatedInner(i).getNum()); @@ -135,8 +129,7 @@ public class LazyMessageLiteTest extends TestCase { } public void testGetDefaultValues() { - LazyMessageLite outer = LazyMessageLite.newBuilder() - .build(); + LazyMessageLite outer = LazyMessageLite.getDefaultInstance(); assertEquals(0, outer.getNum()); assertEquals(421, outer.getNumWithDefault()); @@ -156,15 +149,12 @@ public class LazyMessageLiteTest extends TestCase { } public void testClearValues() { - LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder() - .setNum(115) - .build(); + LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder().setNum(115).build(); LazyMessageLite.Builder outerBuilder = LazyMessageLite.newBuilder(); assertEquals(0, outerBuilder.build().getNum()); - // Set/Clear num outerBuilder.setNum(100); @@ -178,9 +168,9 @@ public class LazyMessageLiteTest extends TestCase { assertEquals(421, outerBuilder.build().getNumWithDefault()); assertFalse(outerBuilder.build().hasInner()); - // Set/Clear all - outerBuilder.setNum(100) + outerBuilder + .setNum(100) .setInner(inner) .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119)) .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122)) @@ -210,23 +200,17 @@ public class LazyMessageLiteTest extends TestCase { } public void testMergeValues() { - LazyMessageLite outerBase = LazyMessageLite.newBuilder() - .setNumWithDefault(122) - .build(); - - LazyInnerMessageLite innerMerging = LazyInnerMessageLite.newBuilder() - .setNum(115) - .build(); - LazyMessageLite outerMerging = LazyMessageLite.newBuilder() - .setNum(119) - .setInner(innerMerging) - .setOneofInner(innerMerging) - .build(); - - LazyMessageLite merged = LazyMessageLite - .newBuilder(outerBase) - .mergeFrom(outerMerging) - .build(); + LazyMessageLite outerBase = LazyMessageLite.newBuilder().setNumWithDefault(122).build(); + + LazyInnerMessageLite innerMerging = LazyInnerMessageLite.newBuilder().setNum(115).build(); + LazyMessageLite outerMerging = + LazyMessageLite.newBuilder() + .setNum(119) + .setInner(innerMerging) + .setOneofInner(innerMerging) + .build(); + + LazyMessageLite merged = LazyMessageLite.newBuilder(outerBase).mergeFrom(outerMerging).build(); assertEquals(119, merged.getNum()); assertEquals(122, merged.getNumWithDefault()); assertEquals(115, merged.getInner().getNum()); @@ -236,23 +220,18 @@ public class LazyMessageLiteTest extends TestCase { } public void testMergeDefaultValues() { - LazyInnerMessageLite innerBase = LazyInnerMessageLite.newBuilder() - .setNum(115) - .build(); - LazyMessageLite outerBase = LazyMessageLite.newBuilder() - .setNum(119) - .setNumWithDefault(122) - .setInner(innerBase) - .setOneofInner(innerBase) - .build(); - - LazyMessageLite outerMerging = LazyMessageLite.newBuilder() - .build(); - - LazyMessageLite merged = LazyMessageLite - .newBuilder(outerBase) - .mergeFrom(outerMerging) - .build(); + LazyInnerMessageLite innerBase = LazyInnerMessageLite.newBuilder().setNum(115).build(); + LazyMessageLite outerBase = + LazyMessageLite.newBuilder() + .setNum(119) + .setNumWithDefault(122) + .setInner(innerBase) + .setOneofInner(innerBase) + .build(); + + LazyMessageLite outerMerging = LazyMessageLite.getDefaultInstance(); + + LazyMessageLite merged = LazyMessageLite.newBuilder(outerBase).mergeFrom(outerMerging).build(); // Merging default-instance shouldn't overwrite values in the base message. assertEquals(119, merged.getNum()); assertEquals(122, merged.getNumWithDefault()); @@ -264,7 +243,7 @@ public class LazyMessageLiteTest extends TestCase { // Regression test for b/28198805. public void testMergeOneofMessages() throws Exception { - LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder().build(); + LazyInnerMessageLite inner = LazyInnerMessageLite.getDefaultInstance(); LazyMessageLite outer = LazyMessageLite.newBuilder().setOneofInner(inner).build(); ByteString data1 = outer.toByteString(); @@ -280,18 +259,11 @@ public class LazyMessageLiteTest extends TestCase { } public void testSerialize() throws InvalidProtocolBufferException { - LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder() - .setNum(3) - .build(); - LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder() - .setNum(2) - .setNested(nested) - .build(); - LazyMessageLite outer = LazyMessageLite.newBuilder() - .setNum(1) - .setInner(inner) - .setOneofInner(inner) - .build(); + LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder().setNum(3).build(); + LazyInnerMessageLite inner = + LazyInnerMessageLite.newBuilder().setNum(2).setNested(nested).build(); + LazyMessageLite outer = + LazyMessageLite.newBuilder().setNum(1).setInner(inner).setOneofInner(inner).build(); ByteString bytes = outer.toByteString(); assertEquals(bytes.size(), outer.getSerializedSize()); @@ -299,18 +271,18 @@ public class LazyMessageLiteTest extends TestCase { LazyMessageLite deserialized = LazyMessageLite.parseFrom(bytes); assertEquals(1, deserialized.getNum()); - assertEquals(421, deserialized.getNumWithDefault()); + assertEquals(421, deserialized.getNumWithDefault()); - assertEquals(2, deserialized.getInner().getNum()); - assertEquals(42, deserialized.getInner().getNumWithDefault()); + assertEquals(2, deserialized.getInner().getNum()); + assertEquals(42, deserialized.getInner().getNumWithDefault()); - assertEquals(3, deserialized.getInner().getNested().getNum()); - assertEquals(4, deserialized.getInner().getNested().getNumWithDefault()); + assertEquals(3, deserialized.getInner().getNested().getNum()); + assertEquals(4, deserialized.getInner().getNested().getNumWithDefault()); - assertEquals(2, deserialized.getOneofInner().getNum()); - assertEquals(42, deserialized.getOneofInner().getNumWithDefault()); - assertEquals(3, deserialized.getOneofInner().getNested().getNum()); - assertEquals(4, deserialized.getOneofInner().getNested().getNumWithDefault()); + assertEquals(2, deserialized.getOneofInner().getNum()); + assertEquals(42, deserialized.getOneofInner().getNumWithDefault()); + assertEquals(3, deserialized.getOneofInner().getNested().getNum()); + assertEquals(4, deserialized.getOneofInner().getNested().getNumWithDefault()); assertEquals(bytes, deserialized.toByteString()); } @@ -318,8 +290,7 @@ public class LazyMessageLiteTest extends TestCase { public void testExtensions() throws Exception { LazyInnerMessageLite.Builder innerBuilder = LazyInnerMessageLite.newBuilder(); innerBuilder.setExtension( - LazyExtension.extension, LazyExtension.newBuilder() - .setName("name").build()); + LazyExtension.extension, LazyExtension.newBuilder().setName("name").build()); assertTrue(innerBuilder.hasExtension(LazyExtension.extension)); assertEquals("name", innerBuilder.getExtension(LazyExtension.extension).getName()); @@ -327,8 +298,7 @@ public class LazyMessageLiteTest extends TestCase { assertTrue(innerMessage.hasExtension(LazyExtension.extension)); assertEquals("name", innerMessage.getExtension(LazyExtension.extension).getName()); - LazyMessageLite lite = LazyMessageLite.newBuilder() - .setInner(innerMessage).build(); + LazyMessageLite lite = LazyMessageLite.newBuilder().setInner(innerMessage).build(); assertTrue(lite.getInner().hasExtension(LazyExtension.extension)); assertEquals("name", lite.getInner().getExtension(LazyExtension.extension).getName()); } diff --git a/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java b/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java index 2fc3124d..24d0038b 100644 --- a/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java @@ -46,13 +46,13 @@ import junit.framework.TestCase; */ public class LazyStringArrayListTest extends TestCase { - private static String STRING_A = "A"; - private static String STRING_B = "B"; - private static String STRING_C = "C"; + private static final String STRING_A = "A"; + private static final String STRING_B = "B"; + private static final String STRING_C = "C"; - private static ByteString BYTE_STRING_A = ByteString.copyFromUtf8("A"); - private static ByteString BYTE_STRING_B = ByteString.copyFromUtf8("B"); - private static ByteString BYTE_STRING_C = ByteString.copyFromUtf8("C"); + private static final ByteString BYTE_STRING_A = ByteString.copyFromUtf8("A"); + private static final ByteString BYTE_STRING_B = ByteString.copyFromUtf8("B"); + private static final ByteString BYTE_STRING_C = ByteString.copyFromUtf8("C"); public void testJustStrings() { LazyStringArrayList list = new LazyStringArrayList(); @@ -175,7 +175,7 @@ public class LazyStringArrayListTest extends TestCase { assertSame(BYTE_STRING_B, list2.getByteString(1)); assertSame(BYTE_STRING_C, list2.getByteString(2)); } - + public void testModificationWithIteration() { LazyStringArrayList list = new LazyStringArrayList(); list.addAll(asList(STRING_A, STRING_B, STRING_C)); @@ -183,12 +183,12 @@ public class LazyStringArrayListTest extends TestCase { assertEquals(3, list.size()); assertEquals(STRING_A, list.get(0)); assertEquals(STRING_A, iterator.next()); - + // Does not structurally modify. iterator = list.iterator(); list.set(0, STRING_B); iterator.next(); - + list.remove(0); try { iterator.next(); @@ -196,7 +196,7 @@ public class LazyStringArrayListTest extends TestCase { } catch (ConcurrentModificationException e) { // expected } - + iterator = list.iterator(); list.add(0, STRING_C); try { @@ -206,7 +206,7 @@ public class LazyStringArrayListTest extends TestCase { // expected } } - + public void testMakeImmutable() { LazyStringArrayList list = new LazyStringArrayList(); list.add(STRING_A); @@ -214,52 +214,52 @@ public class LazyStringArrayListTest extends TestCase { list.add(STRING_C); list.makeImmutable(); assertGenericListImmutable(list, STRING_A); - + // LazyStringArrayList has extra methods not covered in the generic // assertion. - + try { list.add(BYTE_STRING_A.toByteArray()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.add(BYTE_STRING_A); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAllByteArray(Collections.singletonList(BYTE_STRING_A.toByteArray())); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAllByteString(asList(BYTE_STRING_A)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.mergeFrom(new LazyStringArrayList()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.set(0, BYTE_STRING_A.toByteArray()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.set(0, BYTE_STRING_A); fail(); @@ -267,20 +267,20 @@ public class LazyStringArrayListTest extends TestCase { // expected } } - + public void testImmutabilityPropagation() { LazyStringArrayList list = new LazyStringArrayList(); list.add(STRING_A); list.makeImmutable(); assertGenericListImmutable(list.asByteStringList(), BYTE_STRING_A); - + // Arrays use reference equality so need to retrieve the underlying value // to properly test deep immutability. List<byte[]> byteArrayList = list.asByteArrayList(); assertGenericListImmutable(byteArrayList, byteArrayList.get(0)); } - + @SuppressWarnings("unchecked") private static <T> void assertGenericListImmutable(List<T> list, T value) { try { @@ -289,21 +289,21 @@ public class LazyStringArrayListTest extends TestCase { } catch (UnsupportedOperationException e) { // expected } - + try { list.add(0, value); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(asList(value)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(0, asList(value)); fail(); @@ -317,42 +317,42 @@ public class LazyStringArrayListTest extends TestCase { } catch (UnsupportedOperationException e) { // expected } - + try { list.remove(0); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.remove(value); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.removeAll(asList(value)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.retainAll(asList()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.retainAll(asList()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.set(0, value); fail(); diff --git a/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java b/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java index 006e4933..18c9c74e 100644 --- a/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java +++ b/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java @@ -30,44 +30,42 @@ package com.google.protobuf; - import protobuf_unittest.UnittestProto; import java.io.IOException; import junit.framework.TestCase; /** - * Tests to make sure the lazy conversion of UTF8-encoded byte arrays to - * strings works correctly. + * Tests to make sure the lazy conversion of UTF8-encoded byte arrays to strings works correctly. * * @author jonp@google.com (Jon Perlow) */ public class LazyStringEndToEndTest extends TestCase { - private static ByteString TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8 = - ByteString.copyFrom(new byte[] { - 114, 4, -1, 0, -1, 0, -30, 2, 4, -1, - 0, -1, 0, -30, 2, 4, -1, 0, -1, 0, }); + private static final ByteString TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8 = + ByteString.copyFrom( + new byte[] { + 114, 4, -1, 0, -1, 0, -30, 2, 4, -1, + 0, -1, 0, -30, 2, 4, -1, 0, -1, 0, + }); private ByteString encodedTestAllTypes; @Override protected void setUp() throws Exception { super.setUp(); - this.encodedTestAllTypes = UnittestProto.TestAllTypes.newBuilder() - .setOptionalString("foo") - .addRepeatedString("bar") - .addRepeatedString("baz") - .build() - .toByteString(); + this.encodedTestAllTypes = + UnittestProto.TestAllTypes.newBuilder() + .setOptionalString("foo") + .addRepeatedString("bar") + .addRepeatedString("baz") + .build() + .toByteString(); } - /** - * Tests that an invalid UTF8 string will roundtrip through a parse - * and serialization. - */ + /** Tests that an invalid UTF8 string will roundtrip through a parse and serialization. */ public void testParseAndSerialize() throws InvalidProtocolBufferException { - UnittestProto.TestAllTypes tV2 = UnittestProto.TestAllTypes.parseFrom( - TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8); + UnittestProto.TestAllTypes tV2 = + UnittestProto.TestAllTypes.parseFrom(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8); ByteString bytes = tV2.toByteString(); assertEquals(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8, bytes); @@ -77,33 +75,31 @@ public class LazyStringEndToEndTest extends TestCase { } public void testParseAndWrite() throws IOException { - UnittestProto.TestAllTypes tV2 = UnittestProto.TestAllTypes.parseFrom( - TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8); + UnittestProto.TestAllTypes tV2 = + UnittestProto.TestAllTypes.parseFrom(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8); byte[] sink = new byte[TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8.size()]; CodedOutputStream outputStream = CodedOutputStream.newInstance(sink); tV2.writeTo(outputStream); outputStream.flush(); - assertEquals( - TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8, - ByteString.copyFrom(sink)); + assertEquals(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8, ByteString.copyFrom(sink)); } - + public void testCaching() { String a = "a"; String b = "b"; String c = "c"; - UnittestProto.TestAllTypes proto = UnittestProto.TestAllTypes.newBuilder() - .setOptionalString(a) - .addRepeatedString(b) - .addRepeatedString(c) - .build(); + UnittestProto.TestAllTypes proto = + UnittestProto.TestAllTypes.newBuilder() + .setOptionalString(a) + .addRepeatedString(b) + .addRepeatedString(c) + .build(); // String should be the one we passed it. assertSame(a, proto.getOptionalString()); assertSame(b, proto.getRepeatedString(0)); assertSame(c, proto.getRepeatedString(1)); - // Ensure serialization keeps strings cached. proto.toByteString(); @@ -114,8 +110,7 @@ public class LazyStringEndToEndTest extends TestCase { } public void testNoStringCachingIfOnlyBytesAccessed() throws Exception { - UnittestProto.TestAllTypes proto = - UnittestProto.TestAllTypes.parseFrom(encodedTestAllTypes); + UnittestProto.TestAllTypes proto = UnittestProto.TestAllTypes.parseFrom(encodedTestAllTypes); ByteString optional = proto.getOptionalStringBytes(); assertSame(optional, proto.getOptionalStringBytes()); assertSame(optional, proto.toBuilder().getOptionalStringBytes()); diff --git a/java/core/src/test/java/com/google/protobuf/LiteTest.java b/java/core/src/test/java/com/google/protobuf/LiteTest.java index 5ab80ca2..b20114e0 100644 --- a/java/core/src/test/java/com/google/protobuf/LiteTest.java +++ b/java/core/src/test/java/com/google/protobuf/LiteTest.java @@ -57,6 +57,8 @@ import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestOneofEquals; import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestRecursiveOneof; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; import java.lang.reflect.Field; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -2378,4 +2380,63 @@ public class LiteTest extends TestCase { } catch (NullPointerException expected) { } } + + public void testSerializeToOutputStreamThrowsIOException() { + try { + TestAllTypesLite.newBuilder() + .setOptionalBytes(ByteString.copyFromUtf8("hello")) + .build() + .writeTo( + new OutputStream() { + + @Override + public void write(int b) throws IOException { + throw new IOException(); + } + }); + fail(); + } catch (IOException expected) { + } + } + + public void testUnpairedSurrogatesReplacedByQuestionMark() throws InvalidProtocolBufferException { + String testString = "foo \ud83d bar"; + String expectedString = "foo ? bar"; + + TestAllTypesLite testMessage = + TestAllTypesLite.newBuilder().setOptionalString(testString).build(); + ByteString serializedMessage = testMessage.toByteString(); + + // Behavior is compatible with String.getBytes("UTF-8"), which replaces + // unpaired surrogates with a question mark. + TestAllTypesLite parsedMessage = TestAllTypesLite.parseFrom(serializedMessage); + assertEquals(expectedString, parsedMessage.getOptionalString()); + + // Conversion happens during serialization. + ByteString expectedBytes = ByteString.copyFromUtf8(expectedString); + assertTrue( + String.format( + "Expected serializedMessage (%s) to contain \"%s\" (%s).", + encodeHex(serializedMessage), expectedString, encodeHex(expectedBytes)), + contains(serializedMessage, expectedBytes)); + } + + private String encodeHex(ByteString bytes) { + String hexDigits = "0123456789abcdef"; + StringBuilder stringBuilder = new StringBuilder(bytes.size() * 2); + for (byte b : bytes) { + stringBuilder.append(hexDigits.charAt((b & 0xf0) >> 4)); + stringBuilder.append(hexDigits.charAt(b & 0x0f)); + } + return stringBuilder.toString(); + } + + private boolean contains(ByteString a, ByteString b) { + for (int i = 0; i <= a.size() - b.size(); ++i) { + if (a.substring(i, i + b.size()).equals(b)) { + return true; + } + } + return false; + } } diff --git a/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java b/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java index eac47448..9e5adb70 100644 --- a/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java +++ b/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java @@ -46,9 +46,9 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; /** - * Test {@code LiteralByteString} by setting up a reference string in {@link #setUp()}. - * This class is designed to be extended for testing extensions of {@code LiteralByteString} - * such as {@code BoundedByteString}, see {@link BoundedByteStringTest}. + * Test {@code LiteralByteString} by setting up a reference string in {@link #setUp()}. This class + * is designed to be extended for testing extensions of {@code LiteralByteString} such as {@code + * BoundedByteString}, see {@link BoundedByteStringTest}. * * @author carlanton@google.com (Carl Haverl) */ @@ -114,7 +114,9 @@ public class LiteralByteStringTest extends TestCase { } public void testSize() { - assertEquals(classUnderTest + " must have the expected size", referenceBytes.length, + assertEquals( + classUnderTest + " must have the expected size", + referenceBytes.length, stringUnderTest.size()); } @@ -146,10 +148,9 @@ public class LiteralByteStringTest extends TestCase { try { // Copy one too many bytes - stringUnderTest.copyTo(destination, stringUnderTest.size() + 1 - length, - destinationOffset, length); - fail("Should have thrown an exception when copying too many bytes of a " - + classUnderTest); + stringUnderTest.copyTo( + destination, stringUnderTest.size() + 1 - length, destinationOffset, length); + fail("Should have thrown an exception when copying too many bytes of a " + classUnderTest); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -157,8 +158,9 @@ public class LiteralByteStringTest extends TestCase { try { // Copy with illegal negative sourceOffset stringUnderTest.copyTo(destination, -1, destinationOffset, length); - fail("Should have thrown an exception when given a negative sourceOffset in " - + classUnderTest); + fail( + "Should have thrown an exception when given a negative sourceOffset in " + + classUnderTest); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -166,8 +168,9 @@ public class LiteralByteStringTest extends TestCase { try { // Copy with illegal negative destinationOffset stringUnderTest.copyTo(destination, 0, -1, length); - fail("Should have thrown an exception when given a negative destinationOffset in " - + classUnderTest); + fail( + "Should have thrown an exception when given a negative destinationOffset in " + + classUnderTest); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -175,8 +178,7 @@ public class LiteralByteStringTest extends TestCase { try { // Copy with illegal negative size stringUnderTest.copyTo(destination, 0, 0, -1); - fail("Should have thrown an exception when given a negative size in " - + classUnderTest); + fail("Should have thrown an exception when given a negative size in " + classUnderTest); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -184,8 +186,9 @@ public class LiteralByteStringTest extends TestCase { try { // Copy with illegal too-large sourceOffset stringUnderTest.copyTo(destination, 2 * stringUnderTest.size(), 0, length); - fail("Should have thrown an exception when the destinationOffset is too large in " - + classUnderTest); + fail( + "Should have thrown an exception when the destinationOffset is too large in " + + classUnderTest); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -193,8 +196,9 @@ public class LiteralByteStringTest extends TestCase { try { // Copy with illegal too-large destinationOffset stringUnderTest.copyTo(destination, 0, 2 * destination.length, length); - fail("Should have thrown an exception when the destinationOffset is too large in " - + classUnderTest); + fail( + "Should have thrown an exception when the destinationOffset is too large in " + + classUnderTest); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -203,7 +207,8 @@ public class LiteralByteStringTest extends TestCase { public void testCopyTo_ByteBuffer() { ByteBuffer myBuffer = ByteBuffer.allocate(referenceBytes.length); stringUnderTest.copyTo(myBuffer); - assertTrue(classUnderTest + ".copyTo(ByteBuffer) must give back the same bytes", + assertTrue( + classUnderTest + ".copyTo(ByteBuffer) must give back the same bytes", Arrays.equals(referenceBytes, myBuffer.array())); } @@ -233,17 +238,15 @@ public class LiteralByteStringTest extends TestCase { } /** - * Discards {@code n} bytes of data from the input stream. This method - * will block until the full amount has been skipped. Does not close the - * stream. + * Discards {@code n} bytes of data from the input stream. This method will block until the full + * amount has been skipped. Does not close the stream. + * * <p>Copied from com.google.common.io.ByteStreams to avoid adding dependency. * * @param in the input stream to read from * @param n the number of bytes to skip - * @throws EOFException if this stream reaches the end before skipping all - * the bytes - * @throws IOException if an I/O error occurs, or the stream does not - * support skipping + * @throws EOFException if this stream reaches the end before skipping all the bytes + * @throws IOException if an I/O error occurs, or the stream does not support skipping */ static void skipFully(InputStream in, long n) throws IOException { long toSkip = n; @@ -253,8 +256,12 @@ public class LiteralByteStringTest extends TestCase { // Force a blocking read to avoid infinite loop if (in.read() == -1) { long skipped = toSkip - n; - throw new EOFException("reached end of stream after skipping " - + skipped + " bytes; " + toSkip + " bytes expected"); + throw new EOFException( + "reached end of stream after skipping " + + skipped + + " bytes; " + + toSkip + + " bytes expected"); } n--; } else { @@ -269,7 +276,8 @@ public class LiteralByteStringTest extends TestCase { assertTrue(byteBuffer.remaining() == referenceBytes.length); assertTrue(byteBuffer.isReadOnly()); byteBuffer.get(roundTripBytes); - assertTrue(classUnderTest + ".asReadOnlyByteBuffer() must give back the same bytes", + assertTrue( + classUnderTest + ".asReadOnlyByteBuffer() must give back the same bytes", Arrays.equals(referenceBytes, roundTripBytes)); } @@ -285,13 +293,15 @@ public class LiteralByteStringTest extends TestCase { bytesSeen += thisLength; } assertTrue(bytesSeen == referenceBytes.length); - assertTrue(classUnderTest + ".asReadOnlyByteBufferTest() must give back the same bytes", + assertTrue( + classUnderTest + ".asReadOnlyByteBufferTest() must give back the same bytes", Arrays.equals(referenceBytes, roundTripBytes)); } public void testToByteArray() { byte[] roundTripBytes = stringUnderTest.toByteArray(); - assertTrue(classUnderTest + ".toByteArray() must give back the same bytes", + assertTrue( + classUnderTest + ".toByteArray() must give back the same bytes", Arrays.equals(referenceBytes, roundTripBytes)); } @@ -299,78 +309,85 @@ public class LiteralByteStringTest extends TestCase { ByteArrayOutputStream bos = new ByteArrayOutputStream(); stringUnderTest.writeTo(bos); byte[] roundTripBytes = bos.toByteArray(); - assertTrue(classUnderTest + ".writeTo() must give back the same bytes", + assertTrue( + classUnderTest + ".writeTo() must give back the same bytes", Arrays.equals(referenceBytes, roundTripBytes)); } public void testWriteToShouldNotExposeInternalBufferToOutputStream() throws IOException { - OutputStream os = new OutputStream() { - @Override - public void write(byte[] b, int off, int len) { - Arrays.fill(b, off, off + len, (byte) 0); - } - - @Override - public void write(int b) { - throw new UnsupportedOperationException(); - } - }; + OutputStream os = + new OutputStream() { + @Override + public void write(byte[] b, int off, int len) { + Arrays.fill(b, off, off + len, (byte) 0); + } + + @Override + public void write(int b) { + throw new UnsupportedOperationException(); + } + }; stringUnderTest.writeTo(os); - assertTrue(classUnderTest + ".writeTo() must not grant access to underlying array", + assertTrue( + classUnderTest + ".writeTo() must not grant access to underlying array", Arrays.equals(referenceBytes, stringUnderTest.toByteArray())); } public void testWriteToInternalShouldExposeInternalBufferToOutputStream() throws IOException { - OutputStream os = new OutputStream() { - @Override - public void write(byte[] b, int off, int len) { - Arrays.fill(b, off, off + len, (byte) 0); - } - - @Override - public void write(int b) { - throw new UnsupportedOperationException(); - } - }; + OutputStream os = + new OutputStream() { + @Override + public void write(byte[] b, int off, int len) { + Arrays.fill(b, off, off + len, (byte) 0); + } + + @Override + public void write(int b) { + throw new UnsupportedOperationException(); + } + }; stringUnderTest.writeToInternal(os, 0, stringUnderTest.size()); byte[] allZeros = new byte[stringUnderTest.size()]; - assertTrue(classUnderTest + ".writeToInternal() must grant access to underlying array", + assertTrue( + classUnderTest + ".writeToInternal() must grant access to underlying array", Arrays.equals(allZeros, stringUnderTest.toByteArray())); } public void testWriteToShouldExposeInternalBufferToByteOutput() throws IOException { - ByteOutput out = new ByteOutput() { - @Override - public void write(byte value) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void write(byte[] value, int offset, int length) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void writeLazy(byte[] value, int offset, int length) throws IOException { - Arrays.fill(value, offset, offset + length, (byte) 0); - } - - @Override - public void write(ByteBuffer value) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void writeLazy(ByteBuffer value) throws IOException { - throw new UnsupportedOperationException(); - } - }; + ByteOutput out = + new ByteOutput() { + @Override + public void write(byte value) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void write(byte[] value, int offset, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void writeLazy(byte[] value, int offset, int length) throws IOException { + Arrays.fill(value, offset, offset + length, (byte) 0); + } + + @Override + public void write(ByteBuffer value) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void writeLazy(ByteBuffer value) throws IOException { + throw new UnsupportedOperationException(); + } + }; stringUnderTest.writeTo(out); byte[] allZeros = new byte[stringUnderTest.size()]; - assertTrue(classUnderTest + ".writeToInternal() must grant access to underlying array", + assertTrue( + classUnderTest + ".writeToInternal() must grant access to underlying array", Arrays.equals(allZeros, stringUnderTest.toByteArray())); } @@ -378,21 +395,22 @@ public class LiteralByteStringTest extends TestCase { ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteString.Output output = ByteString.newOutput(); stringUnderTest.writeTo(output); - assertEquals("Output Size returns correct result", - output.size(), stringUnderTest.size()); + assertEquals("Output Size returns correct result", output.size(), stringUnderTest.size()); output.writeTo(bos); - assertTrue("Output.writeTo() must give back the same bytes", + assertTrue( + "Output.writeTo() must give back the same bytes", Arrays.equals(referenceBytes, bos.toByteArray())); // write the output stream to itself! This should cause it to double output.writeTo(output); - assertEquals("Writing an output stream to itself is successful", - stringUnderTest.concat(stringUnderTest), output.toByteString()); + assertEquals( + "Writing an output stream to itself is successful", + stringUnderTest.concat(stringUnderTest), + output.toByteString()); output.reset(); assertEquals("Output.reset() resets the output", 0, output.size()); - assertEquals("Output.reset() resets the output", - ByteString.EMPTY, output.toByteString()); + assertEquals("Output.reset() resets the output", ByteString.EMPTY, output.toByteString()); } public void testToString() throws UnsupportedEncodingException { @@ -410,9 +428,10 @@ public class LiteralByteStringTest extends TestCase { } public void testToString_returnsCanonicalEmptyString() { - assertSame(classUnderTest + " must be the same string references", + assertSame( + classUnderTest + " must be the same string references", ByteString.EMPTY.toString(Internal.UTF_8), - ByteString.wrap(new byte[]{}).toString(Internal.UTF_8)); + ByteString.wrap(new byte[] {}).toString(Internal.UTF_8)); } public void testToString_raisesException() { @@ -434,17 +453,23 @@ public class LiteralByteStringTest extends TestCase { public void testEquals() { assertEquals(classUnderTest + " must not equal null", false, stringUnderTest.equals(null)); assertEquals(classUnderTest + " must equal self", stringUnderTest, stringUnderTest); - assertFalse(classUnderTest + " must not equal the empty string", + assertFalse( + classUnderTest + " must not equal the empty string", stringUnderTest.equals(ByteString.EMPTY)); - assertEquals(classUnderTest + " empty strings must be equal", - ByteString.wrap(new byte[]{}), stringUnderTest.substring(55, 55)); - assertEquals(classUnderTest + " must equal another string with the same value", - stringUnderTest, ByteString.wrap(referenceBytes)); + assertEquals( + classUnderTest + " empty strings must be equal", + ByteString.wrap(new byte[] {}), + stringUnderTest.substring(55, 55)); + assertEquals( + classUnderTest + " must equal another string with the same value", + stringUnderTest, + ByteString.wrap(referenceBytes)); byte[] mungedBytes = new byte[referenceBytes.length]; System.arraycopy(referenceBytes, 0, mungedBytes, 0, referenceBytes.length); mungedBytes[mungedBytes.length - 5] = (byte) (mungedBytes[mungedBytes.length - 5] ^ 0xFF); - assertFalse(classUnderTest + " must not equal every string with the same length", + assertFalse( + classUnderTest + " must not equal every string with the same length", stringUnderTest.equals(ByteString.wrap(mungedBytes))); } @@ -454,32 +479,35 @@ public class LiteralByteStringTest extends TestCase { } public void testPeekCachedHashCode() { - assertEquals(classUnderTest + ".peekCachedHashCode() should return zero at first", 0, + assertEquals( + classUnderTest + ".peekCachedHashCode() should return zero at first", + 0, stringUnderTest.peekCachedHashCode()); stringUnderTest.hashCode(); - assertEquals(classUnderTest + ".peekCachedHashCode should return zero at first", - expectedHashCode, stringUnderTest.peekCachedHashCode()); + assertEquals( + classUnderTest + ".peekCachedHashCode should return zero at first", + expectedHashCode, + stringUnderTest.peekCachedHashCode()); } public void testPartialHash() { // partialHash() is more strenuously tested elsewhere by testing hashes of substrings. // This test would fail if the expected hash were 1. It's not. int hash = stringUnderTest.partialHash(stringUnderTest.size(), 0, stringUnderTest.size()); - assertEquals(classUnderTest + ".partialHash() must yield expected hashCode", - expectedHashCode, hash); + assertEquals( + classUnderTest + ".partialHash() must yield expected hashCode", expectedHashCode, hash); } public void testNewInput() throws IOException { InputStream input = stringUnderTest.newInput(); - assertEquals("InputStream.available() returns correct value", - stringUnderTest.size(), input.available()); + assertEquals( + "InputStream.available() returns correct value", stringUnderTest.size(), input.available()); boolean stillEqual = true; for (byte referenceByte : referenceBytes) { int expectedInt = (referenceByte & 0xFF); stillEqual = (expectedInt == input.read()); } - assertEquals("InputStream.available() returns correct value", - 0, input.available()); + assertEquals("InputStream.available() returns correct value", 0, input.available()); assertTrue(classUnderTest + " must give the same bytes from the InputStream", stillEqual); assertEquals(classUnderTest + " InputStream must now be exhausted", -1, input.read()); } @@ -490,43 +518,44 @@ public class LiteralByteStringTest extends TestCase { int nearEndIndex = stringSize * 2 / 3; long skipped1 = input.skip(nearEndIndex); assertEquals("InputStream.skip()", skipped1, nearEndIndex); - assertEquals("InputStream.available()", - stringSize - skipped1, input.available()); + assertEquals("InputStream.available()", stringSize - skipped1, input.available()); assertTrue("InputStream.mark() is available", input.markSupported()); input.mark(0); - assertEquals("InputStream.skip(), read()", - stringUnderTest.byteAt(nearEndIndex) & 0xFF, input.read()); - assertEquals("InputStream.available()", - stringSize - skipped1 - 1, input.available()); + assertEquals( + "InputStream.skip(), read()", stringUnderTest.byteAt(nearEndIndex) & 0xFF, input.read()); + assertEquals("InputStream.available()", stringSize - skipped1 - 1, input.available()); long skipped2 = input.skip(stringSize); - assertEquals("InputStream.skip() incomplete", - skipped2, stringSize - skipped1 - 1); + assertEquals("InputStream.skip() incomplete", skipped2, stringSize - skipped1 - 1); assertEquals("InputStream.skip(), no more input", 0, input.available()); assertEquals("InputStream.skip(), no more input", -1, input.read()); input.reset(); - assertEquals("InputStream.reset() succeded", - stringSize - skipped1, input.available()); - assertEquals("InputStream.reset(), read()", - stringUnderTest.byteAt(nearEndIndex) & 0xFF, input.read()); + assertEquals("InputStream.reset() succeded", stringSize - skipped1, input.available()); + assertEquals( + "InputStream.reset(), read()", stringUnderTest.byteAt(nearEndIndex) & 0xFF, input.read()); } public void testNewCodedInput() throws IOException { CodedInputStream cis = stringUnderTest.newCodedInput(); byte[] roundTripBytes = cis.readRawBytes(referenceBytes.length); - assertTrue(classUnderTest + " must give the same bytes back from the CodedInputStream", + assertTrue( + classUnderTest + " must give the same bytes back from the CodedInputStream", Arrays.equals(referenceBytes, roundTripBytes)); assertTrue(classUnderTest + " CodedInputStream must now be exhausted", cis.isAtEnd()); } /** - * Make sure we keep things simple when concatenating with empty. See also - * {@link ByteStringTest#testConcat_empty()}. + * Make sure we keep things simple when concatenating with empty. See also {@link + * ByteStringTest#testConcat_empty()}. */ public void testConcat_empty() { - assertSame(classUnderTest + " concatenated with empty must give " + classUnderTest, - stringUnderTest.concat(ByteString.EMPTY), stringUnderTest); - assertSame("empty concatenated with " + classUnderTest + " must give " + classUnderTest, - ByteString.EMPTY.concat(stringUnderTest), stringUnderTest); + assertSame( + classUnderTest + " concatenated with empty must give " + classUnderTest, + stringUnderTest.concat(ByteString.EMPTY), + stringUnderTest); + assertSame( + "empty concatenated with " + classUnderTest + " must give " + classUnderTest, + ByteString.EMPTY.concat(stringUnderTest), + stringUnderTest); } public void testJavaSerialization() throws Exception { diff --git a/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java b/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java index e50c7d1e..4b5e6c78 100644 --- a/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java @@ -45,10 +45,8 @@ import junit.framework.TestCase; */ public class LongArrayListTest extends TestCase { - private static final LongArrayList UNARY_LIST = - newImmutableLongArrayList(1); - private static final LongArrayList TERTIARY_LIST = - newImmutableLongArrayList(1, 2, 3); + private static final LongArrayList UNARY_LIST = newImmutableLongArrayList(1); + private static final LongArrayList TERTIARY_LIST = newImmutableLongArrayList(1, 2, 3); private LongArrayList list; @@ -225,9 +223,7 @@ public class LongArrayListTest extends TestCase { for (int i = 0; i < 6; i++) { list.add(Long.valueOf(5 + i)); } - assertEquals( - asList(0L, 1L, 4L, 2L, 3L, 5L, 6L, 7L, 8L, 9L, 10L), - list); + assertEquals(asList(0L, 1L, 4L, 2L, 3L, 5L, 6L, 7L, 8L, 9L, 10L), list); try { list.add(-1, 5L); @@ -312,7 +308,7 @@ public class LongArrayListTest extends TestCase { assertEquals(0, toRemove.size()); } - private void assertImmutable(LongArrayList list) { + private void assertImmutable(LongList list) { if (list.contains(1L)) { throw new RuntimeException("Cannot test the immutability of lists that contain 1."); } diff --git a/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java b/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java index da9195f9..41fef073 100644 --- a/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java +++ b/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java @@ -43,9 +43,7 @@ import java.util.HashMap; import java.util.Map; import junit.framework.TestCase; -/** - * Unit tests for map fields. - */ +/** Unit tests for map fields. */ public final class MapForProto2LiteTest extends TestCase { private void setMapValues(TestMap.Builder builder) { @@ -53,23 +51,18 @@ public final class MapForProto2LiteTest extends TestCase { .putInt32ToInt32Field(1, 11) .putInt32ToInt32Field(2, 22) .putInt32ToInt32Field(3, 33) - .putInt32ToStringField(1, "11") .putInt32ToStringField(2, "22") .putInt32ToStringField(3, "33") - .putInt32ToBytesField(1, TestUtil.toBytes("11")) .putInt32ToBytesField(2, TestUtil.toBytes("22")) .putInt32ToBytesField(3, TestUtil.toBytes("33")) - .putInt32ToEnumField(1, TestMap.EnumValue.FOO) .putInt32ToEnumField(2, TestMap.EnumValue.BAR) .putInt32ToEnumField(3, TestMap.EnumValue.BAZ) - .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build()) .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build()) .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build()) - .putStringToInt32Field("1", 11) .putStringToInt32Field("2", 22) .putStringToInt32Field("3", 33); @@ -129,23 +122,18 @@ public final class MapForProto2LiteTest extends TestCase { .putInt32ToInt32Field(1, 111) .removeInt32ToInt32Field(2) .putInt32ToInt32Field(4, 44) - .putInt32ToStringField(1, "111") .removeInt32ToStringField(2) .putInt32ToStringField(4, "44") - .putInt32ToBytesField(1, TestUtil.toBytes("111")) .removeInt32ToBytesField(2) .putInt32ToBytesField(4, TestUtil.toBytes("44")) - .putInt32ToEnumField(1, TestMap.EnumValue.BAR) .removeInt32ToEnumField(2) .putInt32ToEnumField(4, TestMap.EnumValue.QUX) - .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build()) .removeInt32ToMessageField(2) .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build()) - .putStringToInt32Field("1", 111) .removeStringToInt32Field("2") .putStringToInt32Field("4", 44); @@ -265,8 +253,7 @@ public final class MapForProto2LiteTest extends TestCase { } public void testMutableMapLifecycle() { - TestMap.Builder builder = TestMap.newBuilder() - .putInt32ToInt32Field(1, 2); + TestMap.Builder builder = TestMap.newBuilder().putInt32ToInt32Field(1, 2); assertEquals(newMap(1, 2), builder.build().getInt32ToInt32Field()); assertEquals(newMap(1, 2), builder.getInt32ToInt32Field()); builder.putInt32ToInt32Field(2, 3); @@ -277,8 +264,7 @@ public final class MapForProto2LiteTest extends TestCase { assertEquals(newMap(1, TestMap.EnumValue.BAR), builder.getInt32ToEnumField()); builder.putInt32ToEnumField(2, TestMap.EnumValue.FOO); assertEquals( - newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO), - builder.getInt32ToEnumField()); + newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO), builder.getInt32ToEnumField()); builder.putInt32ToStringField(1, "1"); assertEquals(newMap(1, "1"), builder.build().getInt32ToStringField()); @@ -287,14 +273,18 @@ public final class MapForProto2LiteTest extends TestCase { assertEquals(newMap(1, "1", 2, "2"), builder.getInt32ToStringField()); builder.putInt32ToMessageField(1, TestMap.MessageValue.getDefaultInstance()); - assertEquals(newMap(1, TestMap.MessageValue.getDefaultInstance()), + assertEquals( + newMap(1, TestMap.MessageValue.getDefaultInstance()), builder.build().getInt32ToMessageField()); - assertEquals(newMap(1, TestMap.MessageValue.getDefaultInstance()), - builder.getInt32ToMessageField()); + assertEquals( + newMap(1, TestMap.MessageValue.getDefaultInstance()), builder.getInt32ToMessageField()); builder.putInt32ToMessageField(2, TestMap.MessageValue.getDefaultInstance()); assertEquals( - newMap(1, TestMap.MessageValue.getDefaultInstance(), - 2, TestMap.MessageValue.getDefaultInstance()), + newMap( + 1, + TestMap.MessageValue.getDefaultInstance(), + 2, + TestMap.MessageValue.getDefaultInstance()), builder.getInt32ToMessageField()); } @@ -405,30 +395,22 @@ public final class MapForProto2LiteTest extends TestCase { ByteString bytes = TestUtil.toBytes("SOME BYTES"); String stringKey = "a string key"; - TestMap map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToInt32Field(5, bytes) - .build()); + TestMap map = + tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToInt32Field(5, bytes).build()); assertEquals(0, map.getInt32ToInt32FieldOrDefault(5, -1)); - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToStringField(stringKey, 5) - .build()); + map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToStringField(stringKey, 5).build()); assertEquals("", map.getInt32ToStringFieldOrDefault(0, null)); - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToBytesField(stringKey, 5) - .build()); + map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToBytesField(stringKey, 5).build()); assertEquals(map.getInt32ToBytesFieldOrDefault(0, null), ByteString.EMPTY); - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToEnumField(stringKey, bytes) - .build()); + map = + tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToEnumField(stringKey, bytes).build()); assertEquals(TestMap.EnumValue.FOO, map.getInt32ToEnumFieldOrDefault(0, null)); try { - tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToMessageField(stringKey, bytes) - .build()); + tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToMessageField(stringKey, bytes).build()); fail(); } catch (InvalidProtocolBufferException expected) { assertTrue(expected.getUnfinishedMessage() instanceof TestMap); @@ -436,9 +418,9 @@ public final class MapForProto2LiteTest extends TestCase { assertTrue(map.getInt32ToMessageField().isEmpty()); } - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putStringToInt32Field(stringKey, bytes) - .build()); + map = + tryParseTestMap( + BizarroTestMap.newBuilder().putStringToInt32Field(stringKey, bytes).build()); assertEquals(0, map.getStringToInt32FieldOrDefault(stringKey, -1)); } @@ -458,16 +440,18 @@ public final class MapForProto2LiteTest extends TestCase { // We can't control the order of elements in a HashMap. The best we can do // here is to add elements in different order. - TestMap.Builder b1 = TestMap.newBuilder() - .putInt32ToInt32Field(1, 2) - .putInt32ToInt32Field(3, 4) - .putInt32ToInt32Field(5, 6); + TestMap.Builder b1 = + TestMap.newBuilder() + .putInt32ToInt32Field(1, 2) + .putInt32ToInt32Field(3, 4) + .putInt32ToInt32Field(5, 6); TestMap m1 = b1.build(); - TestMap.Builder b2 = TestMap.newBuilder() - .putInt32ToInt32Field(5, 6) - .putInt32ToInt32Field(1, 2) - .putInt32ToInt32Field(3, 4); + TestMap.Builder b2 = + TestMap.newBuilder() + .putInt32ToInt32Field(5, 6) + .putInt32ToInt32Field(1, 2) + .putInt32ToInt32Field(3, 4); TestMap m2 = b2.build(); assertEquals(m1, m2); @@ -482,9 +466,8 @@ public final class MapForProto2LiteTest extends TestCase { } public void testUnknownEnumValues() throws Exception { - TestUnknownEnumValue.Builder builder = TestUnknownEnumValue.newBuilder() - .putInt32ToInt32Field(1, 1) - .putInt32ToInt32Field(2, 54321); + TestUnknownEnumValue.Builder builder = + TestUnknownEnumValue.newBuilder().putInt32ToInt32Field(1, 1).putInt32ToInt32Field(2, 54321); ByteString data = builder.build().toByteString(); TestMap message = TestMap.parseFrom(data); @@ -494,8 +477,7 @@ public final class MapForProto2LiteTest extends TestCase { assertEquals(TestMap.EnumValue.BAR, message.getInt32ToEnumField().get(1)); // Serializing and parsing should preserve the unknown entry. data = message.toByteString(); - TestUnknownEnumValue messageWithUnknownEnums = - TestUnknownEnumValue.parseFrom(data); + TestUnknownEnumValue messageWithUnknownEnums = TestUnknownEnumValue.parseFrom(data); assertEquals(2, messageWithUnknownEnums.getInt32ToInt32Field().size()); assertEquals(1, messageWithUnknownEnums.getInt32ToInt32Field().get(1).intValue()); assertEquals(54321, messageWithUnknownEnums.getInt32ToInt32Field().get(2).intValue()); @@ -506,18 +488,19 @@ public final class MapForProto2LiteTest extends TestCase { setMapValues(builder); TestMap message = builder.build(); - assertEquals(Arrays.asList("1", "2", "3"), + assertEquals( + Arrays.asList("1", "2", "3"), new ArrayList<String>(message.getStringToInt32Field().keySet())); } private static <K, V> Map<K, V> newMap(K key1, V value1) { - Map<K, V> map = new HashMap<K, V>(); + Map<K, V> map = new HashMap<>(); map.put(key1, value1); return map; } private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) { - Map<K, V> map = new HashMap<K, V>(); + Map<K, V> map = new HashMap<>(); map.put(key1, value1); map.put(key2, value2); return map; @@ -527,18 +510,10 @@ public final class MapForProto2LiteTest extends TestCase { TestMap.Builder builder = TestMap.newBuilder(); setMapValues(builder); TestMap message = builder.build(); - assertEquals( - message.getStringToInt32Field(), - message.getStringToInt32FieldMap()); - assertEquals( - message.getInt32ToBytesField(), - message.getInt32ToBytesFieldMap()); - assertEquals( - message.getInt32ToEnumField(), - message.getInt32ToEnumFieldMap()); - assertEquals( - message.getInt32ToMessageField(), - message.getInt32ToMessageFieldMap()); + assertEquals(message.getStringToInt32Field(), message.getStringToInt32FieldMap()); + assertEquals(message.getInt32ToBytesField(), message.getInt32ToBytesFieldMap()); + assertEquals(message.getInt32ToEnumField(), message.getInt32ToEnumFieldMap()); + assertEquals(message.getInt32ToMessageField(), message.getInt32ToMessageFieldMap()); } public void testContains() { @@ -629,7 +604,8 @@ public final class MapForProto2LiteTest extends TestCase { assertEquals(TestMap.EnumValue.FOO, testMapOrBuilder.getInt32ToEnumFieldOrDefault(1, null)); assertNull(testMapOrBuilder.getInt32ToEnumFieldOrDefault(-1, null)); - assertEquals(MessageValue.newBuilder().setValue(11).build(), + assertEquals( + MessageValue.newBuilder().setValue(11).build(), testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null)); assertNull(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null)); @@ -687,7 +663,8 @@ public final class MapForProto2LiteTest extends TestCase { // expected } - assertEquals(MessageValue.newBuilder().setValue(11).build(), + assertEquals( + MessageValue.newBuilder().setValue(11).build(), testMapOrBuilder.getInt32ToMessageFieldOrThrow(1)); try { testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1); diff --git a/java/core/src/test/java/com/google/protobuf/MapTest.java b/java/core/src/test/java/com/google/protobuf/MapTest.java index 58efce92..ef8b27e8 100644 --- a/java/core/src/test/java/com/google/protobuf/MapTest.java +++ b/java/core/src/test/java/com/google/protobuf/MapTest.java @@ -31,6 +31,7 @@ package com.google.protobuf; import static org.junit.Assert.assertArrayEquals; + import com.google.protobuf.Descriptors.Descriptor; import com.google.protobuf.Descriptors.EnumDescriptor; import com.google.protobuf.Descriptors.EnumValueDescriptor; @@ -51,9 +52,7 @@ import java.util.List; import java.util.Map; import junit.framework.TestCase; -/** - * Unit tests for map fields. - */ +/** Unit tests for map fields. */ public class MapTest extends TestCase { private void setMapValuesUsingMutableMap(TestMap.Builder builder) { @@ -90,23 +89,18 @@ public class MapTest extends TestCase { .putInt32ToInt32Field(1, 11) .putInt32ToInt32Field(2, 22) .putInt32ToInt32Field(3, 33) - .putInt32ToStringField(1, "11") .putInt32ToStringField(2, "22") .putInt32ToStringField(3, "33") - .putInt32ToBytesField(1, TestUtil.toBytes("11")) .putInt32ToBytesField(2, TestUtil.toBytes("22")) .putInt32ToBytesField(3, TestUtil.toBytes("33")) - .putInt32ToEnumField(1, TestMap.EnumValue.FOO) .putInt32ToEnumField(2, TestMap.EnumValue.BAR) .putInt32ToEnumField(3, TestMap.EnumValue.BAZ) - .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build()) .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build()) .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build()) - .putStringToInt32Field("1", 11) .putStringToInt32Field("2", 22) .putStringToInt32Field("3", 33); @@ -201,23 +195,18 @@ public class MapTest extends TestCase { .putInt32ToInt32Field(1, 111) .removeInt32ToInt32Field(2) .putInt32ToInt32Field(4, 44) - .putInt32ToStringField(1, "111") .removeInt32ToStringField(2) .putInt32ToStringField(4, "44") - .putInt32ToBytesField(1, TestUtil.toBytes("111")) .removeInt32ToBytesField(2) .putInt32ToBytesField(4, TestUtil.toBytes("44")) - .putInt32ToEnumField(1, TestMap.EnumValue.BAR) .removeInt32ToEnumField(2) .putInt32ToEnumField(4, TestMap.EnumValue.QUX) - .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build()) .removeInt32ToMessageField(2) .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build()) - .putStringToInt32Field("1", 111) .removeStringToInt32Field("2") .putStringToInt32Field("4", 44); @@ -435,7 +424,6 @@ public class MapTest extends TestCase { assertEquals(newMap(1, 2), builder.build().getInt32ToInt32Field()); } - public void testGettersAndSetters() throws Exception { TestMap.Builder builder = TestMap.newBuilder(); TestMap message = builder.build(); @@ -470,16 +458,17 @@ public class MapTest extends TestCase { } public void testPutAllForUnknownEnumValues() throws Exception { - TestMap source = TestMap.newBuilder() - .putAllInt32ToEnumFieldValue(newMap( - 0, 0, - 1, 1, - 2, 1000)) // unknown value. - .build(); + TestMap source = + TestMap.newBuilder() + .putAllInt32ToEnumFieldValue( + newMap( + 0, 0, + 1, 1, + 2, 1000)) // unknown value. + .build(); - TestMap destination = TestMap.newBuilder() - .putAllInt32ToEnumFieldValue(source.getInt32ToEnumFieldValue()) - .build(); + TestMap destination = + TestMap.newBuilder().putAllInt32ToEnumFieldValue(source.getInt32ToEnumFieldValue()).build(); assertEquals(0, destination.getInt32ToEnumFieldValue().get(0).intValue()); assertEquals(1, destination.getInt32ToEnumFieldValue().get(1).intValue()); @@ -488,10 +477,11 @@ public class MapTest extends TestCase { } public void testPutForUnknownEnumValues() throws Exception { - TestMap.Builder builder = TestMap.newBuilder() - .putInt32ToEnumFieldValue(0, 0) - .putInt32ToEnumFieldValue(1, 1) - .putInt32ToEnumFieldValue(2, 1000); // unknown value. + TestMap.Builder builder = + TestMap.newBuilder() + .putInt32ToEnumFieldValue(0, 0) + .putInt32ToEnumFieldValue(1, 1) + .putInt32ToEnumFieldValue(2, 1000); // unknown value. TestMap message = builder.build(); assertEquals(0, message.getInt32ToEnumFieldValueOrThrow(0)); assertEquals(1, message.getInt32ToEnumFieldValueOrThrow(1)); @@ -573,30 +563,22 @@ public class MapTest extends TestCase { ByteString bytes = TestUtil.toBytes("SOME BYTES"); String stringKey = "a string key"; - TestMap map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToInt32Field(5, bytes) - .build()); + TestMap map = + tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToInt32Field(5, bytes).build()); assertEquals(0, map.getInt32ToInt32FieldOrDefault(5, -1)); - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToStringField(stringKey, 5) - .build()); + map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToStringField(stringKey, 5).build()); assertEquals("", map.getInt32ToStringFieldOrDefault(0, null)); - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToBytesField(stringKey, 5) - .build()); + map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToBytesField(stringKey, 5).build()); assertEquals(map.getInt32ToBytesFieldOrDefault(0, null), ByteString.EMPTY); - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToEnumField(stringKey, bytes) - .build()); + map = + tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToEnumField(stringKey, bytes).build()); assertEquals(TestMap.EnumValue.FOO, map.getInt32ToEnumFieldOrDefault(0, null)); try { - tryParseTestMap(BizarroTestMap.newBuilder() - .putInt32ToMessageField(stringKey, bytes) - .build()); + tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToMessageField(stringKey, bytes).build()); fail(); } catch (InvalidProtocolBufferException expected) { assertTrue(expected.getUnfinishedMessage() instanceof TestMap); @@ -604,9 +586,9 @@ public class MapTest extends TestCase { assertTrue(map.getInt32ToMessageField().isEmpty()); } - map = tryParseTestMap(BizarroTestMap.newBuilder() - .putStringToInt32Field(stringKey, bytes) - .build()); + map = + tryParseTestMap( + BizarroTestMap.newBuilder().putStringToInt32Field(stringKey, bytes).build()); assertEquals(0, map.getStringToInt32FieldOrDefault(stringKey, -1)); } @@ -626,16 +608,18 @@ public class MapTest extends TestCase { // We can't control the order of elements in a HashMap. The best we can do // here is to add elements in different order. - TestMap.Builder b1 = TestMap.newBuilder() - .putInt32ToInt32Field(1, 2) - .putInt32ToInt32Field(3, 4) - .putInt32ToInt32Field(5, 6); + TestMap.Builder b1 = + TestMap.newBuilder() + .putInt32ToInt32Field(1, 2) + .putInt32ToInt32Field(3, 4) + .putInt32ToInt32Field(5, 6); TestMap m1 = b1.build(); - TestMap.Builder b2 = TestMap.newBuilder() - .putInt32ToInt32Field(5, 6) - .putInt32ToInt32Field(1, 2) - .putInt32ToInt32Field(3, 4); + TestMap.Builder b2 = + TestMap.newBuilder() + .putInt32ToInt32Field(5, 6) + .putInt32ToInt32Field(1, 2) + .putInt32ToInt32Field(3, 4); TestMap m2 = b2.build(); assertEquals(m1, m2); @@ -657,8 +641,7 @@ public class MapTest extends TestCase { } public void testNestedBuilderOnChangeEventPropagation() { - TestOnChangeEventPropagation.Builder parent = - TestOnChangeEventPropagation.newBuilder(); + TestOnChangeEventPropagation.Builder parent = TestOnChangeEventPropagation.newBuilder(); parent.getOptionalMessageBuilder().putInt32ToInt32Field(1, 2); TestOnChangeEventPropagation message = parent.build(); assertEquals(2, message.getOptionalMessage().getInt32ToInt32Field().get(1).intValue()); @@ -689,16 +672,14 @@ public class MapTest extends TestCase { public void testNestedBuilderOnChangeEventPropagationReflection() { FieldDescriptor intMapField = f("int32_to_int32_field"); // Create an outer message builder with nested builder. - TestOnChangeEventPropagation.Builder parentBuilder = - TestOnChangeEventPropagation.newBuilder(); + TestOnChangeEventPropagation.Builder parentBuilder = TestOnChangeEventPropagation.newBuilder(); TestMap.Builder testMapBuilder = parentBuilder.getOptionalMessageBuilder(); // Create a map entry message. TestMap.Builder entryBuilder = TestMap.newBuilder().putInt32ToInt32Field(1, 1); // Put the entry into the nested builder. - testMapBuilder.addRepeatedField( - intMapField, entryBuilder.getRepeatedField(intMapField, 0)); + testMapBuilder.addRepeatedField(intMapField, entryBuilder.getRepeatedField(intMapField, 0)); // Should be able to observe the change. TestOnChangeEventPropagation message = parentBuilder.build(); @@ -707,13 +688,11 @@ public class MapTest extends TestCase { // Change the entry value. entryBuilder.putInt32ToInt32Field(1, 4); testMapBuilder = parentBuilder.getOptionalMessageBuilder(); - testMapBuilder.setRepeatedField( - intMapField, 0, entryBuilder.getRepeatedField(intMapField, 0)); + testMapBuilder.setRepeatedField(intMapField, 0, entryBuilder.getRepeatedField(intMapField, 0)); // Should be able to observe the change. message = parentBuilder.build(); - assertEquals(4, - message.getOptionalMessage().getInt32ToInt32Field().get(1).intValue()); + assertEquals(4, message.getOptionalMessage().getInt32ToInt32Field().get(1).intValue()); // Clear the nested builder. testMapBuilder = parentBuilder.getOptionalMessageBuilder(); @@ -761,8 +740,7 @@ public class MapTest extends TestCase { } } - private static <KeyType, ValueType> - Message newMapEntry(Message.Builder builder, String name, KeyType key, ValueType value) { + private static <K, V> Message newMapEntry(Message.Builder builder, String name, K key, V value) { FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name); Message.Builder entryBuilder = builder.newBuilderForField(field); FieldDescriptor keyField = entryBuilder.getDescriptorForType().findFieldByName("key"); @@ -781,10 +759,8 @@ public class MapTest extends TestCase { builder.setField(field, entryList); } - private static <KeyType, ValueType> - Map<KeyType, ValueType> mapForValues( - KeyType key1, ValueType value1, KeyType key2, ValueType value2) { - Map<KeyType, ValueType> map = new HashMap<KeyType, ValueType>(); + private static <K, V> Map<K, V> mapForValues(K key1, V value1, K key2, V value2) { + Map<K, V> map = new HashMap<K, V>(); map.put(key1, value1); map.put(key2, value2); return map; @@ -792,17 +768,19 @@ public class MapTest extends TestCase { public void testReflectionApi() throws Exception { // In reflection API, map fields are just repeated message fields. - TestMap.Builder builder = TestMap.newBuilder() - .putInt32ToInt32Field(1, 2) - .putInt32ToInt32Field(3, 4) - .putInt32ToMessageField(11, MessageValue.newBuilder().setValue(22).build()) - .putInt32ToMessageField(33, MessageValue.newBuilder().setValue(44).build()); + TestMap.Builder builder = + TestMap.newBuilder() + .putInt32ToInt32Field(1, 2) + .putInt32ToInt32Field(3, 4) + .putInt32ToMessageField(11, MessageValue.newBuilder().setValue(22).build()) + .putInt32ToMessageField(33, MessageValue.newBuilder().setValue(44).build()); TestMap message = builder.build(); // Test getField(), getRepeatedFieldCount(), getRepeatedField(). - assertHasMapValues(message, "int32_to_int32_field", - mapForValues(1, 2, 3, 4)); - assertHasMapValues(message, "int32_to_message_field", + assertHasMapValues(message, "int32_to_int32_field", mapForValues(1, 2, 3, 4)); + assertHasMapValues( + message, + "int32_to_message_field", mapForValues( 11, MessageValue.newBuilder().setValue(22).build(), 33, MessageValue.newBuilder().setValue(44).build())); @@ -815,9 +793,10 @@ public class MapTest extends TestCase { assertEquals(0, message.getInt32ToMessageField().size()); // Test setField() - setMapValues(builder, "int32_to_int32_field", - mapForValues(11, 22, 33, 44)); - setMapValues(builder, "int32_to_message_field", + setMapValues(builder, "int32_to_int32_field", mapForValues(11, 22, 33, 44)); + setMapValues( + builder, + "int32_to_message_field", mapForValues( 111, MessageValue.newBuilder().setValue(222).build(), 333, MessageValue.newBuilder().setValue(444).build())); @@ -828,20 +807,28 @@ public class MapTest extends TestCase { assertEquals(444, message.getInt32ToMessageField().get(333).getValue()); // Test addRepeatedField - builder.addRepeatedField(f("int32_to_int32_field"), - newMapEntry(builder, "int32_to_int32_field", 55, 66)); - builder.addRepeatedField(f("int32_to_message_field"), - newMapEntry(builder, "int32_to_message_field", 555, + builder.addRepeatedField( + f("int32_to_int32_field"), newMapEntry(builder, "int32_to_int32_field", 55, 66)); + builder.addRepeatedField( + f("int32_to_message_field"), + newMapEntry( + builder, + "int32_to_message_field", + 555, MessageValue.newBuilder().setValue(666).build())); message = builder.build(); assertEquals(66, message.getInt32ToInt32Field().get(55).intValue()); assertEquals(666, message.getInt32ToMessageField().get(555).getValue()); // Test addRepeatedField (overriding existing values) - builder.addRepeatedField(f("int32_to_int32_field"), - newMapEntry(builder, "int32_to_int32_field", 55, 55)); - builder.addRepeatedField(f("int32_to_message_field"), - newMapEntry(builder, "int32_to_message_field", 555, + builder.addRepeatedField( + f("int32_to_int32_field"), newMapEntry(builder, "int32_to_int32_field", 55, 55)); + builder.addRepeatedField( + f("int32_to_message_field"), + newMapEntry( + builder, + "int32_to_message_field", + 555, MessageValue.newBuilder().setValue(555).build())); message = builder.build(); assertEquals(55, message.getInt32ToInt32Field().get(55).intValue()); @@ -884,10 +871,9 @@ public class MapTest extends TestCase { setMapValuesUsingAccessors(builder); TestMap message = builder.build(); - Message dynamicDefaultInstance = - DynamicMessage.getDefaultInstance(TestMap.getDescriptor()); - Message dynamicMessage = dynamicDefaultInstance - .newBuilderForType().mergeFrom(message.toByteString()).build(); + Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor()); + Message dynamicMessage = + dynamicDefaultInstance.newBuilderForType().mergeFrom(message.toByteString()).build(); assertEquals(message, dynamicMessage); assertEquals(message.hashCode(), dynamicMessage.hashCode()); @@ -898,8 +884,7 @@ public class MapTest extends TestCase { public void testDynamicMessageUnsetKeyAndValue() throws Exception { FieldDescriptor field = f("int32_to_int32_field"); - Message dynamicDefaultInstance = - DynamicMessage.getDefaultInstance(TestMap.getDescriptor()); + Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor()); Message.Builder builder = dynamicDefaultInstance.newBuilderForType(); // Add an entry without key and value. builder.addRepeatedField(field, builder.newBuilderForField(field).build()); @@ -916,8 +901,7 @@ public class MapTest extends TestCase { // of map entries when comparing/hashing map fields. // We use DynamicMessage to test reflection based equals()/hashCode(). - Message dynamicDefaultInstance = - DynamicMessage.getDefaultInstance(TestMap.getDescriptor()); + Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor()); FieldDescriptor field = f("int32_to_int32_field"); Message.Builder b1 = dynamicDefaultInstance.newBuilderForType(); @@ -944,19 +928,18 @@ public class MapTest extends TestCase { } public void testUnknownEnumValues() throws Exception { - TestMap.Builder builder = TestMap.newBuilder() - .putAllInt32ToEnumFieldValue(newMap( - 0, 0, - 1, 1, - 2, 1000)); // unknown value. + TestMap.Builder builder = + TestMap.newBuilder() + .putAllInt32ToEnumFieldValue( + newMap( + 0, 0, + 1, 1, + 2, 1000)); // unknown value. TestMap message = builder.build(); - assertEquals(TestMap.EnumValue.FOO, - message.getInt32ToEnumField().get(0)); - assertEquals(TestMap.EnumValue.BAR, - message.getInt32ToEnumField().get(1)); - assertEquals(TestMap.EnumValue.UNRECOGNIZED, - message.getInt32ToEnumField().get(2)); + assertEquals(TestMap.EnumValue.FOO, message.getInt32ToEnumField().get(0)); + assertEquals(TestMap.EnumValue.BAR, message.getInt32ToEnumField().get(1)); + assertEquals(TestMap.EnumValue.UNRECOGNIZED, message.getInt32ToEnumField().get(2)); assertEquals(1000, message.getInt32ToEnumFieldValue().get(2).intValue()); // Unknown enum values should be preserved after: @@ -977,7 +960,7 @@ public class MapTest extends TestCase { assertFalse(message.equals(message2)); // Unknown values will be converted to UNRECOGNIZED so the resulted enum map // should be the same. - assertTrue(message.getInt32ToEnumField().equals(message2.getInt32ToEnumField())); + assertEquals(message2.getInt32ToEnumField(), message.getInt32ToEnumField()); } public void testUnknownEnumValuesInReflectionApi() throws Exception { @@ -985,13 +968,13 @@ public class MapTest extends TestCase { EnumDescriptor enumDescriptor = TestMap.EnumValue.getDescriptor(); FieldDescriptor field = descriptor.findFieldByName("int32_to_enum_field"); - Map<Integer, Integer> data = newMap( - 0, 0, - 1, 1, - 2, 1000); // unknown value + Map<Integer, Integer> data = + newMap( + 0, 0, + 1, 1, + 2, 1000); // unknown value - TestMap.Builder builder = TestMap.newBuilder() - .putAllInt32ToEnumFieldValue(data); + TestMap.Builder builder = TestMap.newBuilder().putAllInt32ToEnumFieldValue(data); // Try to read unknown enum values using reflection API. for (int i = 0; i < builder.getRepeatedFieldCount(field); i++) { @@ -1001,8 +984,8 @@ public class MapTest extends TestCase { assertEquals(data.get(key).intValue(), value); Message.Builder mapEntryBuilder = mapEntry.toBuilder(); // Increase the value by 1. - setFieldValue(mapEntryBuilder, "value", - enumDescriptor.findValueByNumberCreatingIfUnknown(value + 1)); + setFieldValue( + mapEntryBuilder, "value", enumDescriptor.findValueByNumberCreatingIfUnknown(value + 1)); builder.setRepeatedField(field, i, mapEntryBuilder.build()); } @@ -1018,7 +1001,8 @@ public class MapTest extends TestCase { setMapValuesUsingAccessors(builder); TestMap message = builder.build(); - assertEquals(Arrays.asList("1", "2", "3"), + assertEquals( + Arrays.asList("1", "2", "3"), new ArrayList<String>(message.getStringToInt32Field().keySet())); } @@ -1026,21 +1010,11 @@ public class MapTest extends TestCase { TestMap.Builder builder = TestMap.newBuilder(); setMapValuesUsingAccessors(builder); TestMap message = builder.build(); - assertEquals( - message.getStringToInt32Field(), - message.getStringToInt32FieldMap()); - assertEquals( - message.getInt32ToBytesField(), - message.getInt32ToBytesFieldMap()); - assertEquals( - message.getInt32ToEnumField(), - message.getInt32ToEnumFieldMap()); - assertEquals( - message.getInt32ToEnumFieldValue(), - message.getInt32ToEnumFieldValueMap()); - assertEquals( - message.getInt32ToMessageField(), - message.getInt32ToMessageFieldMap()); + assertEquals(message.getStringToInt32Field(), message.getStringToInt32FieldMap()); + assertEquals(message.getInt32ToBytesField(), message.getInt32ToBytesFieldMap()); + assertEquals(message.getInt32ToEnumField(), message.getInt32ToEnumFieldMap()); + assertEquals(message.getInt32ToEnumFieldValue(), message.getInt32ToEnumFieldValueMap()); + assertEquals(message.getInt32ToMessageField(), message.getInt32ToMessageFieldMap()); } public void testContains() { @@ -1133,10 +1107,11 @@ public class MapTest extends TestCase { assertEquals( TestMap.EnumValue.BAR.getNumber(), - (int) testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(2, -1)); + testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(2, -1)); assertEquals(-1, testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(-1000, -1)); - assertEquals(MessageValue.newBuilder().setValue(11).build(), + assertEquals( + MessageValue.newBuilder().setValue(11).build(), testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null)); assertNull(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null)); @@ -1203,7 +1178,8 @@ public class MapTest extends TestCase { // expected } - assertEquals(MessageValue.newBuilder().setValue(11).build(), + assertEquals( + MessageValue.newBuilder().setValue(11).build(), testMapOrBuilder.getInt32ToMessageFieldOrThrow(1)); try { testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1); @@ -1261,8 +1237,7 @@ public class MapTest extends TestCase { } builder.putInt32ToEnumFieldValue(1, TestMap.EnumValue.BAR.getNumber()); - assertEquals( - TestMap.EnumValue.BAR.getNumber(), builder.getInt32ToEnumFieldValueOrThrow(1)); + assertEquals(TestMap.EnumValue.BAR.getNumber(), builder.getInt32ToEnumFieldValueOrThrow(1)); builder.putInt32ToEnumFieldValue(1, -1); assertEquals(-1, builder.getInt32ToEnumFieldValueOrThrow(1)); assertEquals(TestMap.EnumValue.UNRECOGNIZED, builder.getInt32ToEnumFieldOrThrow(1)); @@ -1391,18 +1366,10 @@ public class MapTest extends TestCase { } input.popLimit(oldLimit); } - assertEquals( - Arrays.asList(-2, 0, 1, 4, 5), - int32Keys); - assertEquals( - Arrays.asList(-2, 0, 1, 4, 5), - uint32Keys); - assertEquals( - Arrays.asList(-2L, 0L, 1L, 4L, 5L), - int64Keys); - assertEquals( - Arrays.asList("", "bar", "baz", "foo", "hello", "world"), - stringKeys); + assertEquals(Arrays.asList(-2, 0, 1, 4, 5), int32Keys); + assertEquals(Arrays.asList(-2, 0, 1, 4, 5), uint32Keys); + assertEquals(Arrays.asList(-2L, 0L, 1L, 4L, 5L), int64Keys); + assertEquals(Arrays.asList("", "bar", "baz", "foo", "hello", "world"), stringKeys); } public void testInitFromPartialDynamicMessage() { @@ -1525,8 +1492,7 @@ public class MapTest extends TestCase { } try { - builder.putAllInt32ToMessageField( - MapTest.<Integer, MessageValue>newMap(4, null, 5, null)); + builder.putAllInt32ToMessageField(MapTest.<Integer, MessageValue>newMap(4, null, 5, null)); fail(); } catch (NullPointerException expected) { } diff --git a/java/core/src/test/java/com/google/protobuf/MessageTest.java b/java/core/src/test/java/com/google/protobuf/MessageTest.java index 4fc8f78e..760511b6 100644 --- a/java/core/src/test/java/com/google/protobuf/MessageTest.java +++ b/java/core/src/test/java/com/google/protobuf/MessageTest.java @@ -39,8 +39,7 @@ import java.util.List; import junit.framework.TestCase; /** - * Misc. unit tests for message operations that apply to both generated - * and dynamic messages. + * Misc. unit tests for message operations that apply to both generated and dynamic messages. * * @author kenton@google.com Kenton Varda */ @@ -49,30 +48,31 @@ public class MessageTest extends TestCase { // Message-merging tests. static final TestAllTypes MERGE_SOURCE = - TestAllTypes.newBuilder() - .setOptionalInt32(1) - .setOptionalString("foo") - .setOptionalForeignMessage(ForeignMessage.getDefaultInstance()) - .addRepeatedString("bar") - .build(); + TestAllTypes.newBuilder() + .setOptionalInt32(1) + .setOptionalString("foo") + .setOptionalForeignMessage(ForeignMessage.getDefaultInstance()) + .addRepeatedString("bar") + .build(); static final TestAllTypes MERGE_DEST = - TestAllTypes.newBuilder() - .setOptionalInt64(2) - .setOptionalString("baz") - .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(3).build()) - .addRepeatedString("qux") - .build(); + TestAllTypes.newBuilder() + .setOptionalInt64(2) + .setOptionalString("baz") + .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(3).build()) + .addRepeatedString("qux") + .build(); static final String MERGE_RESULT_TEXT = - "optional_int32: 1\n" + - "optional_int64: 2\n" + - "optional_string: \"foo\"\n" + - "optional_foreign_message {\n" + - " c: 3\n" + - "}\n" + - "repeated_string: \"qux\"\n" + - "repeated_string: \"bar\"\n"; + "" + + "optional_int32: 1\n" + + "optional_int64: 2\n" + + "optional_string: \"foo\"\n" + + "optional_foreign_message {\n" + + " c: 3\n" + + "}\n" + + "repeated_string: \"qux\"\n" + + "repeated_string: \"bar\"\n"; public void testParsingWithNullExtensionRegistry() throws Exception { try { @@ -83,23 +83,20 @@ public class MessageTest extends TestCase { } public void testMergeFrom() throws Exception { - TestAllTypes result = - TestAllTypes.newBuilder(MERGE_DEST) - .mergeFrom(MERGE_SOURCE).build(); + TestAllTypes result = TestAllTypes.newBuilder(MERGE_DEST).mergeFrom(MERGE_SOURCE).build(); assertEquals(MERGE_RESULT_TEXT, result.toString()); } /** - * Test merging a DynamicMessage into a GeneratedMessage. As long as they - * have the same descriptor, this should work, but it is an entirely different - * code path. + * Test merging a DynamicMessage into a GeneratedMessage. As long as they have the same + * descriptor, this should work, but it is an entirely different code path. */ public void testMergeFromDynamic() throws Exception { TestAllTypes result = - TestAllTypes.newBuilder(MERGE_DEST) - .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build()) - .build(); + TestAllTypes.newBuilder(MERGE_DEST) + .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build()) + .build(); assertEquals(MERGE_RESULT_TEXT, result.toString()); } @@ -107,9 +104,9 @@ public class MessageTest extends TestCase { /** Test merging two DynamicMessages. */ public void testDynamicMergeFrom() throws Exception { DynamicMessage result = - DynamicMessage.newBuilder(MERGE_DEST) - .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build()) - .build(); + DynamicMessage.newBuilder(MERGE_DEST) + .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build()) + .build(); assertEquals(MERGE_RESULT_TEXT, result.toString()); } @@ -117,10 +114,9 @@ public class MessageTest extends TestCase { // ================================================================= // Required-field-related tests. - private static final TestRequired TEST_REQUIRED_UNINITIALIZED = - TestRequired.getDefaultInstance(); + private static final TestRequired TEST_REQUIRED_UNINITIALIZED = TestRequired.getDefaultInstance(); private static final TestRequired TEST_REQUIRED_INITIALIZED = - TestRequired.newBuilder().setA(1).setB(2).setC(3).build(); + TestRequired.newBuilder().setA(1).setB(2).setC(3).build(); public void testRequired() throws Exception { TestRequired.Builder builder = TestRequired.newBuilder(); @@ -189,20 +185,18 @@ public class MessageTest extends TestCase { assertTrue(builder.isInitialized()); - builder.setField(descriptor.findFieldByName("optional_message"), - TEST_REQUIRED_UNINITIALIZED); + builder.setField(descriptor.findFieldByName("optional_message"), TEST_REQUIRED_UNINITIALIZED); assertFalse(builder.isInitialized()); - builder.setField(descriptor.findFieldByName("optional_message"), - TEST_REQUIRED_INITIALIZED); + builder.setField(descriptor.findFieldByName("optional_message"), TEST_REQUIRED_INITIALIZED); assertTrue(builder.isInitialized()); - builder.addRepeatedField(descriptor.findFieldByName("repeated_message"), - TEST_REQUIRED_UNINITIALIZED); + builder.addRepeatedField( + descriptor.findFieldByName("repeated_message"), TEST_REQUIRED_UNINITIALIZED); assertFalse(builder.isInitialized()); - builder.setRepeatedField(descriptor.findFieldByName("repeated_message"), 0, - TEST_REQUIRED_INITIALIZED); + builder.setRepeatedField( + descriptor.findFieldByName("repeated_message"), 0, TEST_REQUIRED_INITIALIZED); assertTrue(builder.isInitialized()); } @@ -224,35 +218,35 @@ public class MessageTest extends TestCase { public void testNestedUninitializedException() throws Exception { try { TestRequiredForeign.newBuilder() - .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED) - .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) - .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) - .build(); + .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED) + .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) + .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) + .build(); fail("Should have thrown an exception."); } catch (UninitializedMessageException e) { assertEquals( - "Message missing required fields: " + - "optional_message.a, " + - "optional_message.b, " + - "optional_message.c, " + - "repeated_message[0].a, " + - "repeated_message[0].b, " + - "repeated_message[0].c, " + - "repeated_message[1].a, " + - "repeated_message[1].b, " + - "repeated_message[1].c", - e.getMessage()); + "Message missing required fields: " + + "optional_message.a, " + + "optional_message.b, " + + "optional_message.c, " + + "repeated_message[0].a, " + + "repeated_message[0].b, " + + "repeated_message[0].c, " + + "repeated_message[1].a, " + + "repeated_message[1].b, " + + "repeated_message[1].c", + e.getMessage()); } } public void testBuildNestedPartial() throws Exception { // We're mostly testing that no exception is thrown. TestRequiredForeign message = - TestRequiredForeign.newBuilder() - .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED) - .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) - .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) - .buildPartial(); + TestRequiredForeign.newBuilder() + .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED) + .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) + .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) + .buildPartial(); assertFalse(message.isInitialized()); } @@ -267,28 +261,29 @@ public class MessageTest extends TestCase { public void testParseNestedUnititialized() throws Exception { ByteString data = - TestRequiredForeign.newBuilder() - .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED) - .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) - .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) - .buildPartial().toByteString(); + TestRequiredForeign.newBuilder() + .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED) + .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) + .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED) + .buildPartial() + .toByteString(); try { TestRequiredForeign.parseFrom(data); fail("Should have thrown an exception."); } catch (InvalidProtocolBufferException e) { assertEquals( - "Message missing required fields: " + - "optional_message.a, " + - "optional_message.b, " + - "optional_message.c, " + - "repeated_message[0].a, " + - "repeated_message[0].b, " + - "repeated_message[0].c, " + - "repeated_message[1].a, " + - "repeated_message[1].b, " + - "repeated_message[1].c", - e.getMessage()); + "Message missing required fields: " + + "optional_message.a, " + + "optional_message.b, " + + "optional_message.c, " + + "repeated_message[0].a, " + + "repeated_message[0].b, " + + "repeated_message[0].c, " + + "repeated_message[1].a, " + + "repeated_message[1].b, " + + "repeated_message[1].c", + e.getMessage()); } } @@ -303,9 +298,7 @@ public class MessageTest extends TestCase { public void testDynamicBuildPartial() throws Exception { // We're mostly testing that no exception is thrown. - DynamicMessage message = - DynamicMessage.newBuilder(TestRequired.getDescriptor()) - .buildPartial(); + DynamicMessage message = DynamicMessage.newBuilder(TestRequired.getDescriptor()).buildPartial(); assertFalse(message.isInitialized()); } @@ -318,43 +311,44 @@ public class MessageTest extends TestCase { assertEquals("Message missing required fields: a, b, c", e.getMessage()); } } - + /** Test reading unset repeated message from DynamicMessage. */ public void testDynamicRepeatedMessageNull() throws Exception { - Descriptors.Descriptor descriptor = TestRequired.getDescriptor(); + TestRequired.getDescriptor(); DynamicMessage result = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()) - .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build()) - .build(); + DynamicMessage.newBuilder(TestAllTypes.getDescriptor()) + .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build()) + .build(); - assertTrue(result.getField(result.getDescriptorForType() - .findFieldByName("repeated_foreign_message")) instanceof List<?>); + assertTrue( + result.getField(result.getDescriptorForType().findFieldByName("repeated_foreign_message")) + instanceof List<?>); assertEquals( 0, result.getRepeatedFieldCount( result.getDescriptorForType().findFieldByName("repeated_foreign_message"))); } - + /** Test reading repeated message from DynamicMessage. */ public void testDynamicRepeatedMessageNotNull() throws Exception { - - TestAllTypes REPEATED_NESTED = - TestAllTypes.newBuilder() - .setOptionalInt32(1) - .setOptionalString("foo") - .setOptionalForeignMessage(ForeignMessage.getDefaultInstance()) - .addRepeatedString("bar") - .addRepeatedForeignMessage(ForeignMessage.getDefaultInstance()) - .addRepeatedForeignMessage(ForeignMessage.getDefaultInstance()) - .build(); - Descriptors.Descriptor descriptor = TestRequired.getDescriptor(); + TestAllTypes repeatedNested = + TestAllTypes.newBuilder() + .setOptionalInt32(1) + .setOptionalString("foo") + .setOptionalForeignMessage(ForeignMessage.getDefaultInstance()) + .addRepeatedString("bar") + .addRepeatedForeignMessage(ForeignMessage.getDefaultInstance()) + .addRepeatedForeignMessage(ForeignMessage.getDefaultInstance()) + .build(); + TestRequired.getDescriptor(); DynamicMessage result = - DynamicMessage.newBuilder(TestAllTypes.getDescriptor()) - .mergeFrom(DynamicMessage.newBuilder(REPEATED_NESTED).build()) - .build(); + DynamicMessage.newBuilder(TestAllTypes.getDescriptor()) + .mergeFrom(DynamicMessage.newBuilder(repeatedNested).build()) + .build(); - assertTrue(result.getField(result.getDescriptorForType() - .findFieldByName("repeated_foreign_message")) instanceof List<?>); + assertTrue( + result.getField(result.getDescriptorForType().findFieldByName("repeated_foreign_message")) + instanceof List<?>); assertEquals( 2, result.getRepeatedFieldCount( diff --git a/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java b/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java index 03ed65a5..7bfeaf17 100644 --- a/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java +++ b/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java @@ -37,8 +37,8 @@ import java.util.List; import junit.framework.TestCase; /** - * Test cases that exercise end-to-end use cases involving - * {@link SingleFieldBuilder} and {@link RepeatedFieldBuilder}. + * Test cases that exercise end-to-end use cases involving {@link SingleFieldBuilder} and {@link + * RepeatedFieldBuilder}. * * @author jonp@google.com (Jon Perlow) */ @@ -46,20 +46,11 @@ public class NestedBuildersTest extends TestCase { public void testMessagesAndBuilders() { Vehicle.Builder vehicleBuilder = Vehicle.newBuilder(); - vehicleBuilder.addWheelBuilder() - .setRadius(4) - .setWidth(1); - vehicleBuilder.addWheelBuilder() - .setRadius(4) - .setWidth(2); - vehicleBuilder.addWheelBuilder() - .setRadius(4) - .setWidth(3); - vehicleBuilder.addWheelBuilder() - .setRadius(4) - .setWidth(4); - vehicleBuilder.getEngineBuilder() - .setLiters(10); + vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(1); + vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(2); + vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(3); + vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(4); + vehicleBuilder.getEngineBuilder().setLiters(10); Vehicle vehicle = vehicleBuilder.build(); assertEquals(4, vehicle.getWheelCount()); @@ -71,9 +62,7 @@ public class NestedBuildersTest extends TestCase { assertEquals(10, vehicle.getEngine().getLiters()); for (int i = 0; i < 4; i++) { - vehicleBuilder.getWheelBuilder(i) - .setRadius(5) - .setWidth(i + 10); + vehicleBuilder.getWheelBuilder(i).setRadius(5).setWidth(i + 10); } vehicleBuilder.getEngineBuilder().setLiters(20); @@ -89,18 +78,10 @@ public class NestedBuildersTest extends TestCase { public void testMessagesAreCached() { Vehicle.Builder vehicleBuilder = Vehicle.newBuilder(); - vehicleBuilder.addWheelBuilder() - .setRadius(1) - .setWidth(2); - vehicleBuilder.addWheelBuilder() - .setRadius(3) - .setWidth(4); - vehicleBuilder.addWheelBuilder() - .setRadius(5) - .setWidth(6); - vehicleBuilder.addWheelBuilder() - .setRadius(7) - .setWidth(8); + vehicleBuilder.addWheelBuilder().setRadius(1).setWidth(2); + vehicleBuilder.addWheelBuilder().setRadius(3).setWidth(4); + vehicleBuilder.addWheelBuilder().setRadius(5).setWidth(6); + vehicleBuilder.addWheelBuilder().setRadius(7).setWidth(8); // Make sure messages are cached. List<Wheel> wheels = new ArrayList<Wheel>(vehicleBuilder.getWheelList()); @@ -117,8 +98,7 @@ public class NestedBuildersTest extends TestCase { } // Change just one - vehicleBuilder.getWheelBuilder(3) - .setRadius(20).setWidth(20); + vehicleBuilder.getWheelBuilder(3).setRadius(20).setWidth(20); // Now get wheels and check that only that one changed for (int i = 0; i < wheels.size(); i++) { @@ -132,12 +112,8 @@ public class NestedBuildersTest extends TestCase { public void testRemove_WithNestedBuilders() { Vehicle.Builder vehicleBuilder = Vehicle.newBuilder(); - vehicleBuilder.addWheelBuilder() - .setRadius(1) - .setWidth(1); - vehicleBuilder.addWheelBuilder() - .setRadius(2) - .setWidth(2); + vehicleBuilder.addWheelBuilder().setRadius(1).setWidth(1); + vehicleBuilder.addWheelBuilder().setRadius(2).setWidth(2); vehicleBuilder.removeWheel(0); assertEquals(1, vehicleBuilder.getWheelCount()); @@ -146,12 +122,8 @@ public class NestedBuildersTest extends TestCase { public void testRemove_WithNestedMessages() { Vehicle.Builder vehicleBuilder = Vehicle.newBuilder(); - vehicleBuilder.addWheel(Wheel.newBuilder() - .setRadius(1) - .setWidth(1)); - vehicleBuilder.addWheel(Wheel.newBuilder() - .setRadius(2) - .setWidth(2)); + vehicleBuilder.addWheel(Wheel.newBuilder().setRadius(1).setWidth(1)); + vehicleBuilder.addWheel(Wheel.newBuilder().setRadius(2).setWidth(2)); vehicleBuilder.removeWheel(0); assertEquals(1, vehicleBuilder.getWheelCount()); @@ -159,14 +131,13 @@ public class NestedBuildersTest extends TestCase { } public void testMerge() { - Vehicle vehicle1 = Vehicle.newBuilder() - .addWheel(Wheel.newBuilder().setRadius(1).build()) - .addWheel(Wheel.newBuilder().setRadius(2).build()) - .build(); - - Vehicle vehicle2 = Vehicle.newBuilder() - .mergeFrom(vehicle1) - .build(); + Vehicle vehicle1 = + Vehicle.newBuilder() + .addWheel(Wheel.newBuilder().setRadius(1).build()) + .addWheel(Wheel.newBuilder().setRadius(2).build()) + .build(); + + Vehicle vehicle2 = Vehicle.newBuilder().mergeFrom(vehicle1).build(); // List should be the same -- no allocation assertSame(vehicle1.getWheelList(), vehicle2.getWheelList()); diff --git a/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java b/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java index c388bd05..4a68c8b8 100644 --- a/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java +++ b/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java @@ -48,9 +48,7 @@ import java.util.List; import java.util.NoSuchElementException; import junit.framework.TestCase; -/** - * Tests for {@link NioByteString}. - */ +/** Tests for {@link NioByteString}. */ public class NioByteStringTest extends TestCase { private static final ByteString EMPTY = new NioByteString(ByteBuffer.wrap(new byte[0])); private static final String CLASSNAME = NioByteString.class.getSimpleName(); @@ -108,8 +106,7 @@ public class NioByteStringTest extends TestCase { } public void testSize() { - assertEquals(CLASSNAME + " must have the expected size", BYTES.length, - testString.size()); + assertEquals(CLASSNAME + " must have the expected size", BYTES.length, testString.size()); } public void testGetTreeDepth() { @@ -140,10 +137,8 @@ public class NioByteStringTest extends TestCase { try { // Copy one too many bytes - testString.copyTo(destination, testString.size() + 1 - length, - destinationOffset, length); - fail("Should have thrown an exception when copying too many bytes of a " - + CLASSNAME); + testString.copyTo(destination, testString.size() + 1 - length, destinationOffset, length); + fail("Should have thrown an exception when copying too many bytes of a " + CLASSNAME); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -151,8 +146,7 @@ public class NioByteStringTest extends TestCase { try { // Copy with illegal negative sourceOffset testString.copyTo(destination, -1, destinationOffset, length); - fail("Should have thrown an exception when given a negative sourceOffset in " - + CLASSNAME); + fail("Should have thrown an exception when given a negative sourceOffset in " + CLASSNAME); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -160,8 +154,9 @@ public class NioByteStringTest extends TestCase { try { // Copy with illegal negative destinationOffset testString.copyTo(destination, 0, -1, length); - fail("Should have thrown an exception when given a negative destinationOffset in " - + CLASSNAME); + fail( + "Should have thrown an exception when given a negative destinationOffset in " + + CLASSNAME); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -169,8 +164,7 @@ public class NioByteStringTest extends TestCase { try { // Copy with illegal negative size testString.copyTo(destination, 0, 0, -1); - fail("Should have thrown an exception when given a negative size in " - + CLASSNAME); + fail("Should have thrown an exception when given a negative size in " + CLASSNAME); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -178,8 +172,9 @@ public class NioByteStringTest extends TestCase { try { // Copy with illegal too-large sourceOffset testString.copyTo(destination, 2 * testString.size(), 0, length); - fail("Should have thrown an exception when the destinationOffset is too large in " - + CLASSNAME); + fail( + "Should have thrown an exception when the destinationOffset is too large in " + + CLASSNAME); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -187,8 +182,9 @@ public class NioByteStringTest extends TestCase { try { // Copy with illegal too-large destinationOffset testString.copyTo(destination, 0, 2 * destination.length, length); - fail("Should have thrown an exception when the destinationOffset is too large in " - + CLASSNAME); + fail( + "Should have thrown an exception when the destinationOffset is too large in " + + CLASSNAME); } catch (IndexOutOfBoundsException expected) { // This is success } @@ -199,8 +195,8 @@ public class NioByteStringTest extends TestCase { ByteBuffer myBuffer = ByteBuffer.allocate(BYTES.length); testString.copyTo(myBuffer); myBuffer.flip(); - assertEquals(CLASSNAME + ".copyTo(ByteBuffer) must give back the same bytes", - backingBuffer, myBuffer); + assertEquals( + CLASSNAME + ".copyTo(ByteBuffer) must give back the same bytes", backingBuffer, myBuffer); // Target buffer bigger than required. myBuffer = ByteBuffer.allocate(testString.size() + 1); @@ -241,30 +237,31 @@ public class NioByteStringTest extends TestCase { skipFully(stream, fraction); // Skip a large fraction, but not all. assertEquals( CLASSNAME + ": after skipping to the 'middle', half the bytes are available", - (testString.size() - fraction), stream.available()); + (testString.size() - fraction), + stream.available()); stream.reset(); assertEquals( CLASSNAME + ": after resetting, all bytes are available", - testString.size(), stream.available()); + testString.size(), + stream.available()); skipFully(stream, testString.size()); // Skip to the end. assertEquals( CLASSNAME + ": after skipping to the end, no more bytes are available", - 0, stream.available()); + 0, + stream.available()); } /** - * Discards {@code n} bytes of data from the input stream. This method - * will block until the full amount has been skipped. Does not close the - * stream. + * Discards {@code n} bytes of data from the input stream. This method will block until the full + * amount has been skipped. Does not close the stream. + * * <p>Copied from com.google.common.io.ByteStreams to avoid adding dependency. * * @param in the input stream to read from * @param n the number of bytes to skip - * @throws EOFException if this stream reaches the end before skipping all - * the bytes - * @throws IOException if an I/O error occurs, or the stream does not - * support skipping + * @throws EOFException if this stream reaches the end before skipping all the bytes + * @throws IOException if an I/O error occurs, or the stream does not support skipping */ static void skipFully(InputStream in, long n) throws IOException { long toSkip = n; @@ -274,8 +271,12 @@ public class NioByteStringTest extends TestCase { // Force a blocking read to avoid infinite loop if (in.read() == -1) { long skipped = toSkip - n; - throw new EOFException("reached end of stream after skipping " - + skipped + " bytes; " + toSkip + " bytes expected"); + throw new EOFException( + "reached end of stream after skipping " + + skipped + + " bytes; " + + toSkip + + " bytes expected"); } n--; } else { @@ -290,7 +291,8 @@ public class NioByteStringTest extends TestCase { assertTrue(byteBuffer.remaining() == BYTES.length); assertTrue(byteBuffer.isReadOnly()); byteBuffer.get(roundTripBytes); - assertTrue(CLASSNAME + ".asReadOnlyByteBuffer() must give back the same bytes", + assertTrue( + CLASSNAME + ".asReadOnlyByteBuffer() must give back the same bytes", Arrays.equals(BYTES, roundTripBytes)); } @@ -306,13 +308,15 @@ public class NioByteStringTest extends TestCase { bytesSeen += thisLength; } assertTrue(bytesSeen == BYTES.length); - assertTrue(CLASSNAME + ".asReadOnlyByteBufferTest() must give back the same bytes", + assertTrue( + CLASSNAME + ".asReadOnlyByteBufferTest() must give back the same bytes", Arrays.equals(BYTES, roundTripBytes)); } public void testToByteArray() { byte[] roundTripBytes = testString.toByteArray(); - assertTrue(CLASSNAME + ".toByteArray() must give back the same bytes", + assertTrue( + CLASSNAME + ".toByteArray() must give back the same bytes", Arrays.equals(BYTES, roundTripBytes)); } @@ -320,80 +324,87 @@ public class NioByteStringTest extends TestCase { ByteArrayOutputStream bos = new ByteArrayOutputStream(); testString.writeTo(bos); byte[] roundTripBytes = bos.toByteArray(); - assertTrue(CLASSNAME + ".writeTo() must give back the same bytes", + assertTrue( + CLASSNAME + ".writeTo() must give back the same bytes", Arrays.equals(BYTES, roundTripBytes)); } public void testWriteToShouldNotExposeInternalBufferToOutputStream() throws IOException { - OutputStream os = new OutputStream() { - @Override - public void write(byte[] b, int off, int len) { - Arrays.fill(b, off, off + len, (byte) 0); - } - - @Override - public void write(int b) { - throw new UnsupportedOperationException(); - } - }; + OutputStream os = + new OutputStream() { + @Override + public void write(byte[] b, int off, int len) { + Arrays.fill(b, off, off + len, (byte) 0); + } + + @Override + public void write(int b) { + throw new UnsupportedOperationException(); + } + }; byte[] original = Arrays.copyOf(BYTES, BYTES.length); testString.writeTo(os); - assertTrue(CLASSNAME + ".writeTo() must NOT grant access to underlying buffer", + assertTrue( + CLASSNAME + ".writeTo() must NOT grant access to underlying buffer", Arrays.equals(original, BYTES)); } public void testWriteToInternalShouldExposeInternalBufferToOutputStream() throws IOException { - OutputStream os = new OutputStream() { - @Override - public void write(byte[] b, int off, int len) { - Arrays.fill(b, off, off + len, (byte) 0); - } - - @Override - public void write(int b) { - throw new UnsupportedOperationException(); - } - }; + OutputStream os = + new OutputStream() { + @Override + public void write(byte[] b, int off, int len) { + Arrays.fill(b, off, off + len, (byte) 0); + } + + @Override + public void write(int b) { + throw new UnsupportedOperationException(); + } + }; testString.writeToInternal(os, 0, testString.size()); byte[] allZeros = new byte[testString.size()]; - assertTrue(CLASSNAME + ".writeToInternal() must grant access to underlying buffer", + assertTrue( + CLASSNAME + ".writeToInternal() must grant access to underlying buffer", Arrays.equals(allZeros, backingBuffer.array())); } public void testWriteToShouldExposeInternalBufferToByteOutput() throws IOException { - ByteOutput out = new ByteOutput() { - @Override - public void write(byte value) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void write(byte[] value, int offset, int length) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void writeLazy(byte[] value, int offset, int length) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void write(ByteBuffer value) throws IOException { - throw new UnsupportedOperationException(); - } - - @Override - public void writeLazy(ByteBuffer value) throws IOException { - Arrays.fill(value.array(), value.arrayOffset(), value.arrayOffset() + value.limit(), - (byte) 0); - } - }; + ByteOutput out = + new ByteOutput() { + @Override + public void write(byte value) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void write(byte[] value, int offset, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void writeLazy(byte[] value, int offset, int length) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void write(ByteBuffer value) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public void writeLazy(ByteBuffer value) throws IOException { + Arrays.fill( + value.array(), value.arrayOffset(), value.arrayOffset() + value.limit(), (byte) 0); + } + }; testString.writeTo(out); byte[] allZeros = new byte[testString.size()]; - assertTrue(CLASSNAME + ".writeTo() must grant access to underlying buffer", + assertTrue( + CLASSNAME + ".writeTo() must grant access to underlying buffer", Arrays.equals(allZeros, backingBuffer.array())); } @@ -401,21 +412,21 @@ public class NioByteStringTest extends TestCase { ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteString.Output output = ByteString.newOutput(); testString.writeTo(output); - assertEquals("Output Size returns correct result", - output.size(), testString.size()); + assertEquals("Output Size returns correct result", output.size(), testString.size()); output.writeTo(bos); - assertTrue("Output.writeTo() must give back the same bytes", - Arrays.equals(BYTES, bos.toByteArray())); + assertTrue( + "Output.writeTo() must give back the same bytes", Arrays.equals(BYTES, bos.toByteArray())); // write the output stream to itself! This should cause it to double output.writeTo(output); - assertEquals("Writing an output stream to itself is successful", - testString.concat(testString), output.toByteString()); + assertEquals( + "Writing an output stream to itself is successful", + testString.concat(testString), + output.toByteString()); output.reset(); assertEquals("Output.reset() resets the output", 0, output.size()); - assertEquals("Output.reset() resets the output", - EMPTY, output.toByteString()); + assertEquals("Output.reset() resets the output", EMPTY, output.toByteString()); } public void testToString() { @@ -433,7 +444,8 @@ public class NioByteStringTest extends TestCase { } public void testToString_returnsCanonicalEmptyString() { - assertSame(CLASSNAME + " must be the same string references", + assertSame( + CLASSNAME + " must be the same string references", EMPTY.toString(UTF_8), new NioByteString(ByteBuffer.wrap(new byte[0])).toString(UTF_8)); } @@ -457,33 +469,34 @@ public class NioByteStringTest extends TestCase { public void testEquals() { assertEquals(CLASSNAME + " must not equal null", false, testString.equals(null)); assertEquals(CLASSNAME + " must equal self", testString, testString); - assertFalse(CLASSNAME + " must not equal the empty string", - testString.equals(EMPTY)); - assertEquals(CLASSNAME + " empty strings must be equal", - EMPTY, testString.substring(55, 55)); - assertEquals(CLASSNAME + " must equal another string with the same value", - testString, new NioByteString(backingBuffer)); + assertFalse(CLASSNAME + " must not equal the empty string", testString.equals(EMPTY)); + assertEquals(CLASSNAME + " empty strings must be equal", EMPTY, testString.substring(55, 55)); + assertEquals( + CLASSNAME + " must equal another string with the same value", + testString, + new NioByteString(backingBuffer)); byte[] mungedBytes = mungedBytes(); - assertFalse(CLASSNAME + " must not equal every string with the same length", + assertFalse( + CLASSNAME + " must not equal every string with the same length", testString.equals(new NioByteString(ByteBuffer.wrap(mungedBytes)))); } public void testEqualsLiteralByteString() { ByteString literal = ByteString.copyFrom(BYTES); - assertEquals(CLASSNAME + " must equal LiteralByteString with same value", literal, - testString); - assertEquals(CLASSNAME + " must equal LiteralByteString with same value", testString, - literal); - assertFalse(CLASSNAME + " must not equal the empty string", - testString.equals(ByteString.EMPTY)); - assertEquals(CLASSNAME + " empty strings must be equal", - ByteString.EMPTY, testString.substring(55, 55)); + assertEquals(CLASSNAME + " must equal LiteralByteString with same value", literal, testString); + assertEquals(CLASSNAME + " must equal LiteralByteString with same value", testString, literal); + assertFalse( + CLASSNAME + " must not equal the empty string", testString.equals(ByteString.EMPTY)); + assertEquals( + CLASSNAME + " empty strings must be equal", ByteString.EMPTY, testString.substring(55, 55)); literal = ByteString.copyFrom(mungedBytes()); - assertFalse(CLASSNAME + " must not equal every LiteralByteString with the same length", + assertFalse( + CLASSNAME + " must not equal every LiteralByteString with the same length", testString.equals(literal)); - assertFalse(CLASSNAME + " must not equal every LiteralByteString with the same length", + assertFalse( + CLASSNAME + " must not equal every LiteralByteString with the same length", literal.equals(testString)); } @@ -492,22 +505,25 @@ public class NioByteStringTest extends TestCase { ByteString p2 = ByteString.copyFrom(BYTES, 5, BYTES.length - 5); ByteString rope = p1.concat(p2); - assertEquals(CLASSNAME + " must equal RopeByteString with same value", rope, - testString); - assertEquals(CLASSNAME + " must equal RopeByteString with same value", testString, - rope); - assertFalse(CLASSNAME + " must not equal the empty string", + assertEquals(CLASSNAME + " must equal RopeByteString with same value", rope, testString); + assertEquals(CLASSNAME + " must equal RopeByteString with same value", testString, rope); + assertFalse( + CLASSNAME + " must not equal the empty string", testString.equals(ByteString.EMPTY.concat(ByteString.EMPTY))); - assertEquals(CLASSNAME + " empty strings must be equal", - ByteString.EMPTY.concat(ByteString.EMPTY), testString.substring(55, 55)); + assertEquals( + CLASSNAME + " empty strings must be equal", + ByteString.EMPTY.concat(ByteString.EMPTY), + testString.substring(55, 55)); byte[] mungedBytes = mungedBytes(); p1 = ByteString.copyFrom(mungedBytes, 0, 5); p2 = ByteString.copyFrom(mungedBytes, 5, mungedBytes.length - 5); rope = p1.concat(p2); - assertFalse(CLASSNAME + " must not equal every RopeByteString with the same length", + assertFalse( + CLASSNAME + " must not equal every RopeByteString with the same length", testString.equals(rope)); - assertFalse(CLASSNAME + " must not equal every RopeByteString with the same length", + assertFalse( + CLASSNAME + " must not equal every RopeByteString with the same length", rope.equals(testString)); } @@ -525,32 +541,34 @@ public class NioByteStringTest extends TestCase { public void testPeekCachedHashCode() { ByteString newString = new NioByteString(backingBuffer); - assertEquals(CLASSNAME + ".peekCachedHashCode() should return zero at first", 0, + assertEquals( + CLASSNAME + ".peekCachedHashCode() should return zero at first", + 0, newString.peekCachedHashCode()); newString.hashCode(); - assertEquals(CLASSNAME + ".peekCachedHashCode should return zero at first", - EXPECTED_HASH, newString.peekCachedHashCode()); + assertEquals( + CLASSNAME + ".peekCachedHashCode should return zero at first", + EXPECTED_HASH, + newString.peekCachedHashCode()); } public void testPartialHash() { // partialHash() is more strenuously tested elsewhere by testing hashes of substrings. // This test would fail if the expected hash were 1. It's not. int hash = testString.partialHash(testString.size(), 0, testString.size()); - assertEquals(CLASSNAME + ".partialHash() must yield expected hashCode", - EXPECTED_HASH, hash); + assertEquals(CLASSNAME + ".partialHash() must yield expected hashCode", EXPECTED_HASH, hash); } public void testNewInput() throws IOException { InputStream input = testString.newInput(); - assertEquals("InputStream.available() returns correct value", - testString.size(), input.available()); + assertEquals( + "InputStream.available() returns correct value", testString.size(), input.available()); boolean stillEqual = true; for (byte referenceByte : BYTES) { int expectedInt = (referenceByte & 0xFF); stillEqual = (expectedInt == input.read()); } - assertEquals("InputStream.available() returns correct value", - 0, input.available()); + assertEquals("InputStream.available() returns correct value", 0, input.available()); assertTrue(CLASSNAME + " must give the same bytes from the InputStream", stillEqual); assertEquals(CLASSNAME + " InputStream must now be exhausted", -1, input.read()); } @@ -561,43 +579,44 @@ public class NioByteStringTest extends TestCase { int nearEndIndex = stringSize * 2 / 3; long skipped1 = input.skip(nearEndIndex); assertEquals("InputStream.skip()", skipped1, nearEndIndex); - assertEquals("InputStream.available()", - stringSize - skipped1, input.available()); + assertEquals("InputStream.available()", stringSize - skipped1, input.available()); assertTrue("InputStream.mark() is available", input.markSupported()); input.mark(0); - assertEquals("InputStream.skip(), read()", - testString.byteAt(nearEndIndex) & 0xFF, input.read()); - assertEquals("InputStream.available()", - stringSize - skipped1 - 1, input.available()); + assertEquals( + "InputStream.skip(), read()", testString.byteAt(nearEndIndex) & 0xFF, input.read()); + assertEquals("InputStream.available()", stringSize - skipped1 - 1, input.available()); long skipped2 = input.skip(stringSize); - assertEquals("InputStream.skip() incomplete", - skipped2, stringSize - skipped1 - 1); + assertEquals("InputStream.skip() incomplete", skipped2, stringSize - skipped1 - 1); assertEquals("InputStream.skip(), no more input", 0, input.available()); assertEquals("InputStream.skip(), no more input", -1, input.read()); input.reset(); - assertEquals("InputStream.reset() succeded", - stringSize - skipped1, input.available()); - assertEquals("InputStream.reset(), read()", - testString.byteAt(nearEndIndex) & 0xFF, input.read()); + assertEquals("InputStream.reset() succeded", stringSize - skipped1, input.available()); + assertEquals( + "InputStream.reset(), read()", testString.byteAt(nearEndIndex) & 0xFF, input.read()); } public void testNewCodedInput() throws IOException { CodedInputStream cis = testString.newCodedInput(); byte[] roundTripBytes = cis.readRawBytes(BYTES.length); - assertTrue(CLASSNAME + " must give the same bytes back from the CodedInputStream", + assertTrue( + CLASSNAME + " must give the same bytes back from the CodedInputStream", Arrays.equals(BYTES, roundTripBytes)); assertTrue(CLASSNAME + " CodedInputStream must now be exhausted", cis.isAtEnd()); } /** - * Make sure we keep things simple when concatenating with empty. See also - * {@link ByteStringTest#testConcat_empty()}. + * Make sure we keep things simple when concatenating with empty. See also {@link + * ByteStringTest#testConcat_empty()}. */ public void testConcat_empty() { - assertSame(CLASSNAME + " concatenated with empty must give " + CLASSNAME, - testString.concat(EMPTY), testString); - assertSame("empty concatenated with " + CLASSNAME + " must give " + CLASSNAME, - EMPTY.concat(testString), testString); + assertSame( + CLASSNAME + " concatenated with empty must give " + CLASSNAME, + testString.concat(EMPTY), + testString); + assertSame( + "empty concatenated with " + CLASSNAME + " must give " + CLASSNAME, + EMPTY.concat(testString), + testString); } public void testJavaSerialization() throws Exception { diff --git a/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java b/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java index e376b1cd..20b93809 100644 --- a/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java +++ b/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java @@ -48,9 +48,9 @@ import org.junit.runners.JUnit4; /** * Tests the exceptions thrown when parsing from a stream. The methods on the {@link Parser} * interface are specified to only throw {@link InvalidProtocolBufferException}. But we really want - * to distinguish between invalid protos vs. actual I/O errors (like failures reading from a - * socket, etc.). So, when we're not using the parser directly, an {@link IOException} should be - * thrown where appropriate, instead of always an {@link InvalidProtocolBufferException}. + * to distinguish between invalid protos vs. actual I/O errors (like failures reading from a socket, + * etc.). So, when we're not using the parser directly, an {@link IOException} should be thrown + * where appropriate, instead of always an {@link InvalidProtocolBufferException}. * * @author jh@squareup.com (Joshua Humphries) */ @@ -61,7 +61,7 @@ public class ParseExceptionsTest { DescriptorProto parse(InputStream in) throws IOException; } - private byte serializedProto[]; + private byte[] serializedProto; private void setup() { serializedProto = DescriptorProto.getDescriptor().toProto().toByteArray(); @@ -77,7 +77,8 @@ public class ParseExceptionsTest { serializedProto = bos.toByteArray(); } - @Test public void message_parseFrom_InputStream() { + @Test + public void message_parseFrom_InputStream() { setup(); verifyExceptions( new ParseTester() { @@ -88,7 +89,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseFrom_InputStreamAndExtensionRegistry() { + @Test + public void message_parseFrom_InputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -99,7 +101,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseFrom_CodedInputStream() { + @Test + public void message_parseFrom_CodedInputStream() { setup(); verifyExceptions( new ParseTester() { @@ -110,7 +113,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseFrom_CodedInputStreamAndExtensionRegistry() { + @Test + public void message_parseFrom_CodedInputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -122,7 +126,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseDelimitedFrom_InputStream() { + @Test + public void message_parseDelimitedFrom_InputStream() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -133,7 +138,8 @@ public class ParseExceptionsTest { }); } - @Test public void message_parseDelimitedFrom_InputStreamAndExtensionRegistry() { + @Test + public void message_parseDelimitedFrom_InputStreamAndExtensionRegistry() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -144,7 +150,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_InputStream() { + @Test + public void messageBuilder_mergeFrom_InputStream() { setup(); verifyExceptions( new ParseTester() { @@ -155,7 +162,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_InputStreamAndExtensionRegistry() { + @Test + public void messageBuilder_mergeFrom_InputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -168,7 +176,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_CodedInputStream() { + @Test + public void messageBuilder_mergeFrom_CodedInputStream() { setup(); verifyExceptions( new ParseTester() { @@ -179,7 +188,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeFrom_CodedInputStreamAndExtensionRegistry() { + @Test + public void messageBuilder_mergeFrom_CodedInputStreamAndExtensionRegistry() { setup(); verifyExceptions( new ParseTester() { @@ -192,7 +202,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeDelimitedFrom_InputStream() { + @Test + public void messageBuilder_mergeDelimitedFrom_InputStream() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -205,7 +216,8 @@ public class ParseExceptionsTest { }); } - @Test public void messageBuilder_mergeDelimitedFrom_InputStreamAndExtensionRegistry() { + @Test + public void messageBuilder_mergeDelimitedFrom_InputStreamAndExtensionRegistry() { setupDelimited(); verifyExceptions( new ParseTester() { @@ -221,7 +233,8 @@ public class ParseExceptionsTest { private void verifyExceptions(ParseTester parseTester) { // No exception try { - assertEquals(DescriptorProto.getDescriptor().toProto(), + assertEquals( + DescriptorProto.getDescriptor().toProto(), parseTester.parse(new ByteArrayInputStream(serializedProto))); } catch (IOException e) { fail("No exception expected: " + e); @@ -253,14 +266,16 @@ public class ParseExceptionsTest { return new FilterInputStream(i) { int count = 0; - @Override public int read() throws IOException { + @Override + public int read() throws IOException { if (count++ >= 50) { throw new IOException("I'm broken!"); } return super.read(); } - @Override public int read(byte b[], int off, int len) throws IOException { + @Override + public int read(byte[] b, int off, int len) throws IOException { if ((count += len) >= 50) { throw new IOException("I'm broken!"); } diff --git a/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java b/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java index af717bfd..67b2881a 100644 --- a/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java +++ b/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java @@ -38,37 +38,35 @@ import java.util.Iterator; import java.util.List; import junit.framework.TestCase; -/** - * Tests for {@link ProtobufArrayList}. - */ +/** Tests for {@link ProtobufArrayList}. */ public class ProtobufArrayListTest extends TestCase { - + private static final ProtobufArrayList<Integer> UNARY_LIST = newImmutableProtoArrayList(1); private static final ProtobufArrayList<Integer> TERTIARY_LIST = newImmutableProtoArrayList(1, 2, 3); - + private ProtobufArrayList<Integer> list; - + @Override protected void setUp() throws Exception { list = new ProtobufArrayList<Integer>(); } - + public void testEmptyListReturnsSameInstance() { assertSame(ProtobufArrayList.emptyList(), ProtobufArrayList.emptyList()); } - + public void testEmptyListIsImmutable() { assertImmutable(ProtobufArrayList.<Integer>emptyList()); } - + public void testModificationWithIteration() { list.addAll(asList(1, 2, 3, 4)); Iterator<Integer> iterator = list.iterator(); assertEquals(4, list.size()); assertEquals(1, (int) list.get(0)); assertEquals(1, (int) iterator.next()); - + list.remove(0); try { iterator.next(); @@ -76,7 +74,7 @@ public class ProtobufArrayListTest extends TestCase { } catch (ConcurrentModificationException e) { // expected } - + iterator = list.iterator(); list.set(0, 1); try { @@ -85,7 +83,7 @@ public class ProtobufArrayListTest extends TestCase { } catch (ConcurrentModificationException e) { // expected } - + iterator = list.iterator(); list.add(0, 0); try { @@ -95,7 +93,7 @@ public class ProtobufArrayListTest extends TestCase { // expected } } - + public void testMakeImmutable() { list.add(2); list.add(4); @@ -104,107 +102,213 @@ public class ProtobufArrayListTest extends TestCase { list.makeImmutable(); assertImmutable(list); } - + public void testRemove() { - list.add(2); - list.add(4); - list.add(6); + list.addAll(TERTIARY_LIST); + assertEquals(1, (int) list.remove(0)); + assertEquals(asList(2, 3), list); - list.remove(1); - assertEquals(asList(2, 6), list); + assertTrue(list.remove(Integer.valueOf(3))); + assertEquals(asList(2), list); - list.remove(1); + assertFalse(list.remove(Integer.valueOf(3))); assertEquals(asList(2), list); - list.remove(0); + assertEquals(2, (int) list.remove(0)); assertEquals(asList(), list); + + try { + list.remove(-1); + fail(); + } catch (IndexOutOfBoundsException e) { + // expected + } + + try { + list.remove(0); + } catch (IndexOutOfBoundsException e) { + // expected + } } - + public void testGet() { - list.add(2); - list.add(6); - - assertEquals(2, (int) list.get(0)); - assertEquals(6, (int) list.get(1)); + assertEquals(1, (int) TERTIARY_LIST.get(0)); + assertEquals(2, (int) TERTIARY_LIST.get(1)); + assertEquals(3, (int) TERTIARY_LIST.get(2)); + + try { + TERTIARY_LIST.get(-1); + fail(); + } catch (IndexOutOfBoundsException e) { + // expected + } + + try { + TERTIARY_LIST.get(3); + fail(); + } catch (IndexOutOfBoundsException e) { + // expected + } } - + public void testSet() { list.add(2); - list.add(6); - - list.set(0, 1); + list.add(4); + + assertEquals(2, (int) list.set(0, 3)); + assertEquals(3, (int) list.get(0)); + + assertEquals(4, (int) list.set(1, 0)); + assertEquals(0, (int) list.get(1)); + + try { + list.set(-1, 0); + fail(); + } catch (IndexOutOfBoundsException e) { + // expected + } + + try { + list.set(2, 0); + fail(); + } catch (IndexOutOfBoundsException e) { + // expected + } + } + + public void testAdd() { + assertEquals(0, list.size()); + + assertTrue(list.add(2)); + assertEquals(asList(2), list); + + assertTrue(list.add(3)); + list.add(0, 4); + assertEquals(asList(4, 2, 3), list); + + list.add(0, 1); + list.add(0, 0); + // Force a resize by getting up to 11 elements. + for (int i = 0; i < 6; i++) { + list.add(Integer.valueOf(5 + i)); + } + assertEquals(asList(0, 1, 4, 2, 3, 5, 6, 7, 8, 9, 10), list); + + try { + list.add(-1, 5); + } catch (IndexOutOfBoundsException e) { + // expected + } + + try { + list.add(4, 5); + } catch (IndexOutOfBoundsException e) { + // expected + } + } + + public void testAddAll() { + assertEquals(0, list.size()); + + assertTrue(list.addAll(Collections.singleton(1))); + assertEquals(1, list.size()); assertEquals(1, (int) list.get(0)); - list.set(1, 2); - assertEquals(2, (int) list.get(1)); + + assertTrue(list.addAll(asList(2, 3, 4, 5, 6))); + assertEquals(asList(1, 2, 3, 4, 5, 6), list); + + assertTrue(list.addAll(TERTIARY_LIST)); + assertEquals(asList(1, 2, 3, 4, 5, 6, 1, 2, 3), list); + + assertFalse(list.addAll(Collections.<Integer>emptyList())); + assertFalse(list.addAll(IntArrayList.emptyList())); + } + + public void testSize() { + assertEquals(0, ProtobufArrayList.emptyList().size()); + assertEquals(1, UNARY_LIST.size()); + assertEquals(3, TERTIARY_LIST.size()); + + list.add(3); + list.add(4); + list.add(6); + list.add(8); + assertEquals(4, list.size()); + + list.remove(0); + assertEquals(3, list.size()); + + list.add(17); + assertEquals(4, list.size()); } private void assertImmutable(List<Integer> list) { if (list.contains(1)) { throw new RuntimeException("Cannot test the immutability of lists that contain 1."); } - + try { list.add(1); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.add(0, 1); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(Collections.<Integer>emptyList()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(Collections.singletonList(1)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(new ProtobufArrayList<Integer>()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(UNARY_LIST); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(0, Collections.singleton(1)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(0, UNARY_LIST); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.addAll(0, Collections.<Integer>emptyList()); fail(); } catch (UnsupportedOperationException e) { // expected - } + } try { list.clear(); @@ -219,56 +323,56 @@ public class ProtobufArrayListTest extends TestCase { } catch (UnsupportedOperationException e) { // expected } - + try { list.remove(new Object()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.removeAll(Collections.emptyList()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.removeAll(Collections.singleton(1)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.removeAll(UNARY_LIST); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.retainAll(Collections.emptyList()); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.retainAll(Collections.singleton(1)); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.retainAll(UNARY_LIST); fail(); } catch (UnsupportedOperationException e) { // expected } - + try { list.set(0, 0); fail(); @@ -276,7 +380,7 @@ public class ProtobufArrayListTest extends TestCase { // expected } } - + private static ProtobufArrayList<Integer> newImmutableProtoArrayList(int... elements) { ProtobufArrayList<Integer> list = new ProtobufArrayList<Integer>(); for (int element : elements) { diff --git a/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java b/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java index edbd0afd..c42813c8 100644 --- a/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java +++ b/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java @@ -37,9 +37,8 @@ import java.util.List; import junit.framework.TestCase; /** - * Tests for {@link RepeatedFieldBuilderV3}. This tests basic functionality. - * More extensive testing is provided via other tests that exercise the - * builder. + * Tests for {@link RepeatedFieldBuilderV3}. This tests basic functionality. More extensive testing is + * provided via other tests that exercise the builder. * * @author jonp@google.com (Jon Perlow) */ @@ -47,8 +46,8 @@ public class RepeatedFieldBuilderV3Test extends TestCase { public void testBasicUse() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent); + RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + newRepeatedFieldBuilderV3(mockParent); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build()); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build()); assertEquals(0, builder.getMessage(0).getOptionalInt32()); @@ -68,8 +67,8 @@ public class RepeatedFieldBuilderV3Test extends TestCase { public void testGoingBackAndForth() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent); + RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + newRepeatedFieldBuilderV3(mockParent); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build()); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build()); assertEquals(0, builder.getMessage(0).getOptionalInt32()); @@ -89,7 +88,7 @@ public class RepeatedFieldBuilderV3Test extends TestCase { list = builder.build(); assertEquals(2, list.size()); assertEquals(0, list.get(0).getOptionalInt32()); - assertEquals("foo", list.get(0).getOptionalString()); + assertEquals("foo", list.get(0).getOptionalString()); assertEquals(1, list.get(1).getOptionalInt32()); assertIsUnmodifiable(list); assertEquals(1, mockParent.getInvalidationCount()); @@ -97,12 +96,11 @@ public class RepeatedFieldBuilderV3Test extends TestCase { public void testVariousMethods() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent); + RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + newRepeatedFieldBuilderV3(mockParent); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build()); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(2).build()); - builder.addBuilder(0, TestAllTypes.getDefaultInstance()) - .setOptionalInt32(0); + builder.addBuilder(0, TestAllTypes.getDefaultInstance()).setOptionalInt32(0); builder.addBuilder(TestAllTypes.getDefaultInstance()).setOptionalInt32(3); assertEquals(0, builder.getMessage(0).getOptionalInt32()); @@ -139,11 +137,10 @@ public class RepeatedFieldBuilderV3Test extends TestCase { public void testLists() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent); + RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + newRepeatedFieldBuilderV3(mockParent); builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build()); - builder.addMessage(0, - TestAllTypes.newBuilder().setOptionalInt32(0).build()); + builder.addMessage(0, TestAllTypes.newBuilder().setOptionalInt32(0).build()); assertEquals(0, builder.getMessage(0).getOptionalInt32()); assertEquals(1, builder.getMessage(1).getOptionalInt32()); @@ -178,11 +175,9 @@ public class RepeatedFieldBuilderV3Test extends TestCase { } } - private RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> + private RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> newRepeatedFieldBuilderV3(GeneratedMessage.BuilderParent parent) { - return new RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder>(Collections.<TestAllTypes>emptyList(), false, - parent, false); + return new RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>( + Collections.<TestAllTypes>emptyList(), false, parent, false); } } diff --git a/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java b/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java index dc56f2e9..d7262161 100644 --- a/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java +++ b/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java @@ -34,8 +34,8 @@ import java.io.UnsupportedEncodingException; import java.util.Iterator; /** - * This class tests {@link RopeByteString#substring(int, int)} by inheriting the tests from - * {@link LiteralByteStringTest}. Only a couple of methods are overridden. + * This class tests {@link RopeByteString#substring(int, int)} by inheriting the tests from {@link + * LiteralByteStringTest}. Only a couple of methods are overridden. * * @author carlanton@google.com (Carl Haverl) */ @@ -61,8 +61,8 @@ public class RopeByteStringSubstringTest extends LiteralByteStringTest { @Override public void testGetTreeDepth() { - assertEquals(classUnderTest + " must have the expected tree depth", - 3, stringUnderTest.getTreeDepth()); + assertEquals( + classUnderTest + " must have the expected tree depth", 3, stringUnderTest.getTreeDepth()); } @Override @@ -84,15 +84,18 @@ public class RopeByteStringSubstringTest extends LiteralByteStringTest { testString = testString.substring(2, testString.length() - 6); unicode = unicode.substring(2, unicode.size() - 6); - assertEquals(classUnderTest + " from string must have the expected type", - classUnderTest, getActualClassName(unicode)); + assertEquals( + classUnderTest + " from string must have the expected type", + classUnderTest, + getActualClassName(unicode)); String roundTripString = unicode.toString(UTF_8); - assertEquals(classUnderTest + " unicode bytes must match", - testString, roundTripString); + assertEquals(classUnderTest + " unicode bytes must match", testString, roundTripString); ByteString flatString = ByteString.copyFromUtf8(testString); assertEquals(classUnderTest + " string must equal the flat string", flatString, unicode); - assertEquals(classUnderTest + " string must must have same hashCode as the flat string", - flatString.hashCode(), unicode.hashCode()); + assertEquals( + classUnderTest + " string must must have same hashCode as the flat string", + flatString.hashCode(), + unicode.hashCode()); } @Override @@ -114,14 +117,17 @@ public class RopeByteStringSubstringTest extends LiteralByteStringTest { testString = testString.substring(2, testString.length() - 6); unicode = unicode.substring(2, unicode.size() - 6); - assertEquals(classUnderTest + " from string must have the expected type", - classUnderTest, getActualClassName(unicode)); + assertEquals( + classUnderTest + " from string must have the expected type", + classUnderTest, + getActualClassName(unicode)); String roundTripString = unicode.toString(Internal.UTF_8); - assertEquals(classUnderTest + " unicode bytes must match", - testString, roundTripString); + assertEquals(classUnderTest + " unicode bytes must match", testString, roundTripString); ByteString flatString = ByteString.copyFromUtf8(testString); assertEquals(classUnderTest + " string must equal the flat string", flatString, unicode); - assertEquals(classUnderTest + " string must must have same hashCode as the flat string", - flatString.hashCode(), unicode.hashCode()); + assertEquals( + classUnderTest + " string must must have same hashCode as the flat string", + flatString.hashCode(), + unicode.hashCode()); } } diff --git a/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java b/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java index 4ec3a409..59e8ede1 100644 --- a/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java +++ b/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java @@ -40,8 +40,8 @@ import java.util.Arrays; import java.util.Iterator; /** - * This class tests {@link RopeByteString} by inheriting the tests from - * {@link LiteralByteStringTest}. Only a couple of methods are overridden. + * This class tests {@link RopeByteString} by inheriting the tests from {@link + * LiteralByteStringTest}. Only a couple of methods are overridden. * * <p>A full test of the result of {@link RopeByteString#substring(int, int)} is found in the * separate class {@link RopeByteStringSubstringTest}. @@ -64,8 +64,8 @@ public class RopeByteStringTest extends LiteralByteStringTest { @Override public void testGetTreeDepth() { - assertEquals(classUnderTest + " must have the expected tree depth", - 4, stringUnderTest.getTreeDepth()); + assertEquals( + classUnderTest + " must have the expected tree depth", 4, stringUnderTest.getTreeDepth()); } public void testBalance() { @@ -79,17 +79,22 @@ public class RopeByteStringTest extends LiteralByteStringTest { concatenated = concatenated.concat(ByteString.copyFrom(testBytes, i * pieceSize, pieceSize)); } - assertEquals(classUnderTest + " from string must have the expected type", - classUnderTest, getActualClassName(concatenated)); - assertTrue(classUnderTest + " underlying bytes must match after balancing", + assertEquals( + classUnderTest + " from string must have the expected type", + classUnderTest, + getActualClassName(concatenated)); + assertTrue( + classUnderTest + " underlying bytes must match after balancing", Arrays.equals(testBytes, concatenated.toByteArray())); ByteString testString = ByteString.copyFrom(testBytes); - assertTrue(classUnderTest + " balanced string must equal flat string", - concatenated.equals(testString)); - assertTrue(classUnderTest + " flat string must equal balanced string", - testString.equals(concatenated)); - assertEquals(classUnderTest + " balanced string must have same hash code as flat string", - testString.hashCode(), concatenated.hashCode()); + assertEquals( + classUnderTest + " balanced string must equal flat string", testString, concatenated); + assertEquals( + classUnderTest + " flat string must equal balanced string", concatenated, testString); + assertEquals( + classUnderTest + " balanced string must have same hash code as flat string", + testString.hashCode(), + concatenated.hashCode()); } @Override @@ -107,15 +112,18 @@ public class RopeByteStringTest extends LiteralByteStringTest { } String testString = builder.toString(); - assertEquals(classUnderTest + " from string must have the expected type", - classUnderTest, getActualClassName(unicode)); + assertEquals( + classUnderTest + " from string must have the expected type", + classUnderTest, + getActualClassName(unicode)); String roundTripString = unicode.toString(UTF_8); - assertEquals(classUnderTest + " unicode bytes must match", - testString, roundTripString); + assertEquals(classUnderTest + " unicode bytes must match", testString, roundTripString); ByteString flatString = ByteString.copyFromUtf8(testString); assertEquals(classUnderTest + " string must equal the flat string", flatString, unicode); - assertEquals(classUnderTest + " string must must have same hashCode as the flat string", - flatString.hashCode(), unicode.hashCode()); + assertEquals( + classUnderTest + " string must must have same hashCode as the flat string", + flatString.hashCode(), + unicode.hashCode()); } @Override @@ -133,30 +141,34 @@ public class RopeByteStringTest extends LiteralByteStringTest { } String testString = builder.toString(); - assertEquals(classUnderTest + " from string must have the expected type", - classUnderTest, getActualClassName(unicode)); + assertEquals( + classUnderTest + " from string must have the expected type", + classUnderTest, + getActualClassName(unicode)); String roundTripString = unicode.toString(Internal.UTF_8); - assertEquals(classUnderTest + " unicode bytes must match", - testString, roundTripString); + assertEquals(classUnderTest + " unicode bytes must match", testString, roundTripString); ByteString flatString = ByteString.copyFromUtf8(testString); assertEquals(classUnderTest + " string must equal the flat string", flatString, unicode); - assertEquals(classUnderTest + " string must must have same hashCode as the flat string", - flatString.hashCode(), unicode.hashCode()); + assertEquals( + classUnderTest + " string must must have same hashCode as the flat string", + flatString.hashCode(), + unicode.hashCode()); } @Override public void testToString_returnsCanonicalEmptyString() { RopeByteString ropeByteString = RopeByteString.newInstanceForTest(ByteString.EMPTY, ByteString.EMPTY); - assertSame(classUnderTest + " must be the same string references", - ByteString.EMPTY.toString(Internal.UTF_8), ropeByteString.toString(Internal.UTF_8)); + assertSame( + classUnderTest + " must be the same string references", + ByteString.EMPTY.toString(Internal.UTF_8), + ropeByteString.toString(Internal.UTF_8)); } @Override public void testToString_raisesException() { try { - ByteString byteString = - RopeByteString.newInstanceForTest(ByteString.EMPTY, ByteString.EMPTY); + ByteString byteString = RopeByteString.newInstanceForTest(ByteString.EMPTY, ByteString.EMPTY); byteString.toString("invalid"); fail("Should have thrown an exception."); } catch (UnsupportedEncodingException expected) { @@ -164,8 +176,9 @@ public class RopeByteStringTest extends LiteralByteStringTest { } try { - ByteString byteString = RopeByteString.concatenate(ByteString.copyFromUtf8("foo"), - ByteString.copyFromUtf8("bar")); + ByteString byteString = + RopeByteString.concatenate( + ByteString.copyFromUtf8("foo"), ByteString.copyFromUtf8("bar")); byteString.toString("invalid"); fail("Should have thrown an exception."); } catch (UnsupportedEncodingException expected) { diff --git a/java/core/src/test/java/com/google/protobuf/ServiceTest.java b/java/core/src/test/java/com/google/protobuf/ServiceTest.java index b895ad8d..1e583329 100644 --- a/java/core/src/test/java/com/google/protobuf/ServiceTest.java +++ b/java/core/src/test/java/com/google/protobuf/ServiceTest.java @@ -41,7 +41,6 @@ import protobuf_unittest.UnittestProto.FooRequest; import protobuf_unittest.UnittestProto.FooResponse; import protobuf_unittest.UnittestProto.TestAllTypes; import protobuf_unittest.UnittestProto.TestService; - import java.util.HashSet; import java.util.Set; import junit.framework.TestCase; @@ -270,30 +269,27 @@ public class ServiceTest extends TestCase { } - // ================================================================= /** - * wrapsCallback() is an EasyMock argument predicate. wrapsCallback(c) - * matches a callback if calling that callback causes c to be called. - * In other words, c wraps the given callback. + * wrapsCallback() is an EasyMock argument predicate. wrapsCallback(c) matches a callback if + * calling that callback causes c to be called. In other words, c wraps the given callback. */ - private <Type extends Message> RpcCallback<Type> wrapsCallback( - MockCallback<?> callback) { + private <T extends Message> RpcCallback<T> wrapsCallback(MockCallback<?> callback) { EasyMock.reportMatcher(new WrapsCallback(callback)); return null; } /** The parameter to wrapsCallback() must be a MockCallback. */ - private static class MockCallback<Type extends Message> - implements RpcCallback<Type> { + private static class MockCallback<T extends Message> implements RpcCallback<T> { private boolean called = false; public boolean isCalled() { return called; } public void reset() { called = false; } + @Override - public void run(Type message) { + public void run(T message) { called = true; } } diff --git a/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java b/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java index e3a8d4f4..f2ae8f9b 100644 --- a/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java +++ b/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java @@ -32,13 +32,11 @@ package com.google.protobuf; import protobuf_unittest.UnittestProto.TestAllTypes; import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder; - import junit.framework.TestCase; /** - * Tests for {@link SingleFieldBuilderV3}. This tests basic functionality. - * More extensive testing is provided via other tests that exercise the - * builder. + * Tests for {@link SingleFieldBuilderV3}. This tests basic functionality. More extensive testing is + * provided via other tests that exercise the builder. * * @author jonp@google.com (Jon Perlow) */ @@ -46,16 +44,11 @@ public class SingleFieldBuilderV3Test extends TestCase { public void testBasicUseAndInvalidations() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = - new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder>( - TestAllTypes.getDefaultInstance(), - mockParent, - false); + SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>( + TestAllTypes.getDefaultInstance(), mockParent, false); assertSame(TestAllTypes.getDefaultInstance(), builder.getMessage()); - assertEquals(TestAllTypes.getDefaultInstance(), - builder.getBuilder().buildPartial()); + assertEquals(TestAllTypes.getDefaultInstance(), builder.getBuilder().buildPartial()); assertEquals(0, mockParent.getInvalidationCount()); builder.getBuilder().setOptionalInt32(10); @@ -71,18 +64,13 @@ public class SingleFieldBuilderV3Test extends TestCase { // Test that we don't keep getting invalidations on every change builder.getBuilder().setOptionalInt32(30); assertEquals(1, mockParent.getInvalidationCount()); - } public void testSetMessage() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = - new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder>( - TestAllTypes.getDefaultInstance(), - mockParent, - false); + SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>( + TestAllTypes.getDefaultInstance(), mockParent, false); builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build()); assertEquals(0, builder.getMessage().getOptionalInt32()); @@ -102,13 +90,9 @@ public class SingleFieldBuilderV3Test extends TestCase { public void testClear() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = - new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder>( - TestAllTypes.getDefaultInstance(), - mockParent, - false); + SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>( + TestAllTypes.getDefaultInstance(), mockParent, false); builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build()); assertNotSame(TestAllTypes.getDefaultInstance(), builder.getMessage()); builder.clear(); @@ -122,13 +106,9 @@ public class SingleFieldBuilderV3Test extends TestCase { public void testMerge() { TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent(); - SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder> builder = - new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, - TestAllTypesOrBuilder>( - TestAllTypes.getDefaultInstance(), - mockParent, - false); + SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder = + new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>( + TestAllTypes.getDefaultInstance(), mockParent, false); // Merge into default field. builder.mergeFrom(TestAllTypes.getDefaultInstance()); @@ -136,20 +116,14 @@ public class SingleFieldBuilderV3Test extends TestCase { // Merge into non-default field on existing builder. builder.getBuilder().setOptionalInt32(2); - builder.mergeFrom(TestAllTypes.newBuilder() - .setOptionalDouble(4.0) - .buildPartial()); + builder.mergeFrom(TestAllTypes.newBuilder().setOptionalDouble(4.0).buildPartial()); assertEquals(2, builder.getMessage().getOptionalInt32()); - assertEquals(4.0, builder.getMessage().getOptionalDouble()); + assertEquals(4.0, builder.getMessage().getOptionalDouble(), 0.0); // Merge into non-default field on existing message - builder.setMessage(TestAllTypes.newBuilder() - .setOptionalInt32(10) - .buildPartial()); - builder.mergeFrom(TestAllTypes.newBuilder() - .setOptionalDouble(5.0) - .buildPartial()); + builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(10).buildPartial()); + builder.mergeFrom(TestAllTypes.newBuilder().setOptionalDouble(5.0).buildPartial()); assertEquals(10, builder.getMessage().getOptionalInt32()); - assertEquals(5.0, builder.getMessage().getOptionalDouble()); + assertEquals(5.0, builder.getMessage().getOptionalDouble(), 0.0); } } diff --git a/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java b/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java index a7f8342d..a1a7194b 100644 --- a/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java +++ b/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java @@ -40,9 +40,7 @@ import java.util.Set; import java.util.TreeSet; import junit.framework.TestCase; -/** - * @author darick@google.com Darick Tong - */ +/** @author darick@google.com Darick Tong */ public class SmallSortedMapTest extends TestCase { // java.util.AbstractMap.SimpleEntry is private in JDK 1.5. We re-implement it // here for JDK 1.5 users. @@ -78,16 +76,16 @@ public class SmallSortedMapTest extends TestCase { @Override public boolean equals(Object o) { - if (!(o instanceof Map.Entry)) + if (!(o instanceof Map.Entry)) { return false; + } Map.Entry e = (Map.Entry) o; return eq(key, e.getKey()) && eq(value, e.getValue()); } @Override public int hashCode() { - return ((key == null) ? 0 : key.hashCode()) ^ - ((value == null) ? 0 : value.hashCode()); + return ((key == null) ? 0 : key.hashCode()) ^ ((value == null) ? 0 : value.hashCode()); } } @@ -101,14 +99,10 @@ public class SmallSortedMapTest extends TestCase { private void runPutAndGetTest(int numElements) { // Test with even and odd arraySize - SmallSortedMap<Integer, Integer> map1 = - SmallSortedMap.newInstanceForTest(3); - SmallSortedMap<Integer, Integer> map2 = - SmallSortedMap.newInstanceForTest(4); - SmallSortedMap<Integer, Integer> map3 = - SmallSortedMap.newInstanceForTest(3); - SmallSortedMap<Integer, Integer> map4 = - SmallSortedMap.newInstanceForTest(4); + SmallSortedMap<Integer, Integer> map1 = SmallSortedMap.newInstanceForTest(3); + SmallSortedMap<Integer, Integer> map2 = SmallSortedMap.newInstanceForTest(4); + SmallSortedMap<Integer, Integer> map3 = SmallSortedMap.newInstanceForTest(3); + SmallSortedMap<Integer, Integer> map4 = SmallSortedMap.newInstanceForTest(4); // Test with puts in ascending order. for (int i = 0; i < numElements; i++) { @@ -136,7 +130,7 @@ public class SmallSortedMapTest extends TestCase { for (SmallSortedMap<Integer, Integer> map : allMaps) { assertEquals(numElements, map.size()); for (int i = 0; i < numElements; i++) { - assertEquals(new Integer(i + 1), map.get(i)); + assertEquals(Integer.valueOf(i + 1), map.get(i)); } } @@ -152,7 +146,7 @@ public class SmallSortedMapTest extends TestCase { assertNull(map.remove(i + 1)); } for (int i = 0; i < 6; i++) { - assertEquals(new Integer(i + 1), map.put(i, i + 2)); + assertEquals(Integer.valueOf(i + 1), map.put(i, i + 2)); } } @@ -165,22 +159,22 @@ public class SmallSortedMapTest extends TestCase { assertEquals(3, map.getNumArrayEntries()); assertEquals(3, map.getNumOverflowEntries()); - assertEquals(6, map.size()); + assertEquals(6, map.size()); assertEquals(makeSortedKeySet(0, 1, 2, 3, 4, 5), map.keySet()); - assertEquals(new Integer(2), map.remove(1)); + assertEquals(Integer.valueOf(2), map.remove(1)); assertEquals(3, map.getNumArrayEntries()); assertEquals(2, map.getNumOverflowEntries()); - assertEquals(5, map.size()); + assertEquals(5, map.size()); assertEquals(makeSortedKeySet(0, 2, 3, 4, 5), map.keySet()); - assertEquals(new Integer(5), map.remove(4)); + assertEquals(Integer.valueOf(5), map.remove(4)); assertEquals(3, map.getNumArrayEntries()); assertEquals(1, map.getNumOverflowEntries()); - assertEquals(4, map.size()); + assertEquals(4, map.size()); assertEquals(makeSortedKeySet(0, 2, 3, 5), map.keySet()); - assertEquals(new Integer(4), map.remove(3)); + assertEquals(Integer.valueOf(4), map.remove(3)); assertEquals(3, map.getNumArrayEntries()); assertEquals(0, map.getNumOverflowEntries()); assertEquals(3, map.size()); @@ -191,7 +185,7 @@ public class SmallSortedMapTest extends TestCase { assertEquals(0, map.getNumOverflowEntries()); assertEquals(3, map.size()); - assertEquals(new Integer(1), map.remove(0)); + assertEquals(Integer.valueOf(1), map.remove(0)); assertEquals(2, map.getNumArrayEntries()); assertEquals(0, map.getNumOverflowEntries()); assertEquals(2, map.size()); @@ -216,16 +210,15 @@ public class SmallSortedMapTest extends TestCase { assertEquals(3, map.getNumArrayEntries()); for (int i = 0; i < 3; i++) { Map.Entry<Integer, Integer> entry = map.getArrayEntryAt(i); - assertEquals(new Integer(i), entry.getKey()); - assertEquals(new Integer(i + 1), entry.getValue()); + assertEquals(Integer.valueOf(i), entry.getKey()); + assertEquals(Integer.valueOf(i + 1), entry.getValue()); } - Iterator<Map.Entry<Integer, Integer>> it = - map.getOverflowEntries().iterator(); + Iterator<Map.Entry<Integer, Integer>> it = map.getOverflowEntries().iterator(); for (int i = 3; i < 6; i++) { assertTrue(it.hasNext()); Map.Entry<Integer, Integer> entry = it.next(); - assertEquals(new Integer(i), entry.getKey()); - assertEquals(new Integer(i + 1), entry.getValue()); + assertEquals(Integer.valueOf(i), entry.getKey()); + assertEquals(Integer.valueOf(i + 1), entry.getValue()); } assertFalse(it.hasNext()); } @@ -237,10 +230,8 @@ public class SmallSortedMapTest extends TestCase { } Set<Map.Entry<Integer, Integer>> entrySet = map.entrySet(); for (int i = 0; i < 6; i++) { - assertTrue( - entrySet.contains(new SimpleEntry<Integer, Integer>(i, i + 1))); - assertFalse( - entrySet.contains(new SimpleEntry<Integer, Integer>(i, i))); + assertTrue(entrySet.contains(new SimpleEntry<Integer, Integer>(i, i + 1))); + assertFalse(entrySet.contains(new SimpleEntry<Integer, Integer>(i, i))); } } @@ -248,13 +239,12 @@ public class SmallSortedMapTest extends TestCase { SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3); Set<Map.Entry<Integer, Integer>> entrySet = map.entrySet(); for (int i = 0; i < 6; i++) { - Map.Entry<Integer, Integer> entry = - new SimpleEntry<Integer, Integer>(i, i + 1); + Map.Entry<Integer, Integer> entry = new SimpleEntry<Integer, Integer>(i, i + 1); assertTrue(entrySet.add(entry)); assertFalse(entrySet.add(entry)); } for (int i = 0; i < 6; i++) { - assertEquals(new Integer(i + 1), map.get(i)); + assertEquals(Integer.valueOf(i + 1), map.get(i)); } assertEquals(3, map.getNumArrayEntries()); assertEquals(3, map.getNumOverflowEntries()); @@ -268,8 +258,7 @@ public class SmallSortedMapTest extends TestCase { assertNull(map.put(i, i + 1)); } for (int i = 0; i < 6; i++) { - Map.Entry<Integer, Integer> entry = - new SimpleEntry<Integer, Integer>(i, i + 1); + Map.Entry<Integer, Integer> entry = new SimpleEntry<Integer, Integer>(i, i + 1); assertTrue(entrySet.remove(entry)); assertFalse(entrySet.remove(entry)); } @@ -284,7 +273,7 @@ public class SmallSortedMapTest extends TestCase { for (int i = 0; i < 6; i++) { assertNull(map.put(i, i + 1)); } - map.entrySet().clear(); + map.clear(); assertTrue(map.isEmpty()); assertEquals(0, map.getNumArrayEntries()); assertEquals(0, map.getNumOverflowEntries()); @@ -300,8 +289,8 @@ public class SmallSortedMapTest extends TestCase { for (int i = 0; i < 6; i++) { assertTrue(it.hasNext()); Map.Entry<Integer, Integer> entry = it.next(); - assertEquals(new Integer(i), entry.getKey()); - assertEquals(new Integer(i + 1), entry.getValue()); + assertEquals(Integer.valueOf(i), entry.getKey()); + assertEquals(Integer.valueOf(i + 1), entry.getValue()); } assertFalse(it.hasNext()); } @@ -332,7 +321,7 @@ public class SmallSortedMapTest extends TestCase { entry.setValue(i + 23); } for (int i = 0; i < 6; i++) { - assertEquals(new Integer(i + 23), map.get(i)); + assertEquals(Integer.valueOf(i + 23), map.get(i)); } } @@ -342,7 +331,7 @@ public class SmallSortedMapTest extends TestCase { assertNull(map.put(i, i + 1)); } map.makeImmutable(); - assertEquals(new Integer(1), map.get(0)); + assertEquals(Integer.valueOf(1), map.get(0)); assertEquals(6, map.size()); try { diff --git a/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java b/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java index 4af55429..3d82c5f9 100644 --- a/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java +++ b/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java @@ -33,9 +33,9 @@ package com.google.protobuf; import junit.framework.TestCase; /** - * Tests that proto2 api generation doesn't cause compile errors when - * compiling protocol buffers that have names that would otherwise conflict - * if not fully qualified (like @Deprecated and @Override). + * Tests that proto2 api generation doesn't cause compile errors when compiling protocol buffers + * that have names that would otherwise conflict if not fully qualified (like @Deprecated + * and @Override). * * @author jonp@google.com (Jon Perlow) */ @@ -48,17 +48,11 @@ public class TestBadIdentifiers extends TestCase { } public void testGetDescriptor() { - Descriptors.FileDescriptor fileDescriptor = - TestBadIdentifiersProto.getDescriptor(); - String descriptorField = TestBadIdentifiersProto.Descriptor - .getDefaultInstance().getDescriptor(); - Descriptors.Descriptor protoDescriptor = TestBadIdentifiersProto.Descriptor - .getDefaultInstance().getDescriptorForType(); - String nestedDescriptorField = TestBadIdentifiersProto.Descriptor - .NestedDescriptor.getDefaultInstance().getDescriptor(); - Descriptors.Descriptor nestedProtoDescriptor = TestBadIdentifiersProto - .Descriptor.NestedDescriptor.getDefaultInstance() - .getDescriptorForType(); + TestBadIdentifiersProto.getDescriptor(); + TestBadIdentifiersProto.Descriptor.getDefaultInstance().getDescriptor(); + TestBadIdentifiersProto.Descriptor.getDefaultInstance().getDescriptorForType(); + TestBadIdentifiersProto.Descriptor.NestedDescriptor.getDefaultInstance().getDescriptor(); + TestBadIdentifiersProto.Descriptor.NestedDescriptor.getDefaultInstance().getDescriptorForType(); } public void testConflictingFieldNames() throws Exception { @@ -87,10 +81,16 @@ public class TestBadIdentifiers extends TestCase { assertEquals(0, message.getInt32FieldList31()); assertEquals(0, message.getInt64FieldCount()); - assertEquals(0L, message.getExtension( - TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldCount).longValue()); - assertEquals(0L, message.getExtension( - TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldList).longValue()); + assertEquals( + 0L, + message + .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldCount) + .longValue()); + assertEquals( + 0L, + message + .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldList) + .longValue()); assertEquals("", message.getFieldName32()); assertEquals("", message.getFieldName33()); diff --git a/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java b/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java index 37f94c03..798d7ca6 100644 --- a/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java +++ b/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java @@ -75,9 +75,15 @@ public final class TestBadIdentifiersLite extends TestCase { assertEquals(0, message.getInt32FieldList31()); assertEquals(0, message.getInt64FieldCount()); - assertEquals(0L, message.getExtension( - TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldCount).longValue()); - assertEquals(0L, message.getExtension( - TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldList).longValue()); + assertEquals( + 0L, + message + .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldCount) + .longValue()); + assertEquals( + 0L, + message + .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldList) + .longValue()); } } diff --git a/java/core/src/test/java/com/google/protobuf/TestUtil.java b/java/core/src/test/java/com/google/protobuf/TestUtil.java index b4bc3a3d..48ee9574 100644 --- a/java/core/src/test/java/com/google/protobuf/TestUtil.java +++ b/java/core/src/test/java/com/google/protobuf/TestUtil.java @@ -130,8 +130,6 @@ import static protobuf_unittest.UnittestProto.defaultFixed64Extension; import static protobuf_unittest.UnittestProto.defaultFloatExtension; import static protobuf_unittest.UnittestProto.defaultForeignEnumExtension; import static protobuf_unittest.UnittestProto.defaultImportEnumExtension; -// The static imports are to avoid 100+ char lines. The following is roughly equivalent to -// import static protobuf_unittest.UnittestProto.*; import static protobuf_unittest.UnittestProto.defaultInt32Extension; import static protobuf_unittest.UnittestProto.defaultInt64Extension; import static protobuf_unittest.UnittestProto.defaultNestedEnumExtension; @@ -239,14 +237,12 @@ import java.io.RandomAccessFile; import junit.framework.Assert; /** - * Contains methods for setting all fields of {@code TestAllTypes} to - * some values as well as checking that all the fields are set to those values. - * These are useful for testing various protocol message features, e.g. - * set all fields of a message, serialize it, parse it, and check that all - * fields are set. + * Contains methods for setting all fields of {@code TestAllTypes} to some values as well as + * checking that all the fields are set to those values. These are useful for testing various + * protocol message features, e.g. set all fields of a message, serialize it, parse it, and check + * that all fields are set. * - * <p>This code is not to be used outside of {@code com.google.protobuf} and - * subpackages. + * <p>This code is not to be used outside of {@code com.google.protobuf} and subpackages. * * @author kenton@google.com Kenton Varda */ @@ -263,16 +259,16 @@ public final class TestUtil { return ByteString.copyFrom(str.getBytes(Internal.UTF_8)); } - /** - * Dirties the message by resetting the momoized serialized size. - */ + // BEGIN FULL-RUNTIME + /** Dirties the message by resetting the momoized serialized size. */ public static void resetMemoizedSize(AbstractMessage message) { message.memoizedSize = -1; } + // END FULL-RUNTIME /** - * Get a {@code TestAllTypes} with all fields set as they would be by - * {@link #setAllFields(TestAllTypes.Builder)}. + * Get a {@code TestAllTypes} with all fields set as they would be by {@link + * #setAllFields(TestAllTypes.Builder)}. */ public static TestAllTypes getAllSet() { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); @@ -281,8 +277,8 @@ public final class TestUtil { } /** - * Get a {@code TestAllTypes.Builder} with all fields set as they would be by - * {@link #setAllFields(TestAllTypes.Builder)}. + * Get a {@code TestAllTypes.Builder} with all fields set as they would be by {@link + * #setAllFields(TestAllTypes.Builder)}. */ public static TestAllTypes.Builder getAllSetBuilder() { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); @@ -291,8 +287,8 @@ public final class TestUtil { } /** - * Get a {@code TestAllExtensions} with all fields set as they would be by - * {@link #setAllExtensions(TestAllExtensions.Builder)}. + * Get a {@code TestAllExtensions} with all fields set as they would be by {@link + * #setAllExtensions(TestAllExtensions.Builder)}. */ public static TestAllExtensions getAllExtensionsSet() { TestAllExtensions.Builder builder = TestAllExtensions.newBuilder(); @@ -318,146 +314,126 @@ public final class TestUtil { return builder.build(); } - /** - * Set every field of {@code message} to the values expected by - * {@code assertAllFieldsSet()}. - */ + /** Set every field of {@code message} to the values expected by {@code assertAllFieldsSet()}. */ public static void setAllFields(TestAllTypes.Builder message) { - message.setOptionalInt32 (101); - message.setOptionalInt64 (102); - message.setOptionalUint32 (103); - message.setOptionalUint64 (104); - message.setOptionalSint32 (105); - message.setOptionalSint64 (106); - message.setOptionalFixed32 (107); - message.setOptionalFixed64 (108); + message.setOptionalInt32(101); + message.setOptionalInt64(102); + message.setOptionalUint32(103); + message.setOptionalUint64(104); + message.setOptionalSint32(105); + message.setOptionalSint64(106); + message.setOptionalFixed32(107); + message.setOptionalFixed64(108); message.setOptionalSfixed32(109); message.setOptionalSfixed64(110); - message.setOptionalFloat (111); - message.setOptionalDouble (112); - message.setOptionalBool (true); - message.setOptionalString ("115"); - message.setOptionalBytes (toBytes("116")); - - message.setOptionalGroup( - TestAllTypes.OptionalGroup.newBuilder().setA(117).build()); - message.setOptionalNestedMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(118).build()); - message.setOptionalForeignMessage( - ForeignMessage.newBuilder().setC(119).build()); - message.setOptionalImportMessage( - ImportMessage.newBuilder().setD(120).build()); - message.setOptionalPublicImportMessage( - PublicImportMessage.newBuilder().setE(126).build()); - message.setOptionalLazyMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(127).build()); - - message.setOptionalNestedEnum (TestAllTypes.NestedEnum.BAZ); + message.setOptionalFloat(111); + message.setOptionalDouble(112); + message.setOptionalBool(true); + message.setOptionalString("115"); + message.setOptionalBytes(toBytes("116")); + + message.setOptionalGroup(TestAllTypes.OptionalGroup.newBuilder().setA(117).build()); + message.setOptionalNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(118).build()); + message.setOptionalForeignMessage(ForeignMessage.newBuilder().setC(119).build()); + message.setOptionalImportMessage(ImportMessage.newBuilder().setD(120).build()); + message.setOptionalPublicImportMessage(PublicImportMessage.newBuilder().setE(126).build()); + message.setOptionalLazyMessage(TestAllTypes.NestedMessage.newBuilder().setBb(127).build()); + + message.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAZ); message.setOptionalForeignEnum(ForeignEnum.FOREIGN_BAZ); - message.setOptionalImportEnum (ImportEnum.IMPORT_BAZ); + message.setOptionalImportEnum(ImportEnum.IMPORT_BAZ); message.setOptionalStringPiece("124"); message.setOptionalCord("125"); // ----------------------------------------------------------------- - message.addRepeatedInt32 (201); - message.addRepeatedInt64 (202); - message.addRepeatedUint32 (203); - message.addRepeatedUint64 (204); - message.addRepeatedSint32 (205); - message.addRepeatedSint64 (206); - message.addRepeatedFixed32 (207); - message.addRepeatedFixed64 (208); + message.addRepeatedInt32(201); + message.addRepeatedInt64(202); + message.addRepeatedUint32(203); + message.addRepeatedUint64(204); + message.addRepeatedSint32(205); + message.addRepeatedSint64(206); + message.addRepeatedFixed32(207); + message.addRepeatedFixed64(208); message.addRepeatedSfixed32(209); message.addRepeatedSfixed64(210); - message.addRepeatedFloat (211); - message.addRepeatedDouble (212); - message.addRepeatedBool (true); - message.addRepeatedString ("215"); - message.addRepeatedBytes (toBytes("216")); - - message.addRepeatedGroup( - TestAllTypes.RepeatedGroup.newBuilder().setA(217).build()); - message.addRepeatedNestedMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); - message.addRepeatedForeignMessage( - ForeignMessage.newBuilder().setC(219).build()); - message.addRepeatedImportMessage( - ImportMessage.newBuilder().setD(220).build()); - message.addRepeatedLazyMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(227).build()); - - message.addRepeatedNestedEnum (TestAllTypes.NestedEnum.BAR); + message.addRepeatedFloat(211); + message.addRepeatedDouble(212); + message.addRepeatedBool(true); + message.addRepeatedString("215"); + message.addRepeatedBytes(toBytes("216")); + + message.addRepeatedGroup(TestAllTypes.RepeatedGroup.newBuilder().setA(217).build()); + message.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); + message.addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(219).build()); + message.addRepeatedImportMessage(ImportMessage.newBuilder().setD(220).build()); + message.addRepeatedLazyMessage(TestAllTypes.NestedMessage.newBuilder().setBb(227).build()); + + message.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAR); message.addRepeatedForeignEnum(ForeignEnum.FOREIGN_BAR); - message.addRepeatedImportEnum (ImportEnum.IMPORT_BAR); + message.addRepeatedImportEnum(ImportEnum.IMPORT_BAR); message.addRepeatedStringPiece("224"); message.addRepeatedCord("225"); // Add a second one of each field. - message.addRepeatedInt32 (301); - message.addRepeatedInt64 (302); - message.addRepeatedUint32 (303); - message.addRepeatedUint64 (304); - message.addRepeatedSint32 (305); - message.addRepeatedSint64 (306); - message.addRepeatedFixed32 (307); - message.addRepeatedFixed64 (308); + message.addRepeatedInt32(301); + message.addRepeatedInt64(302); + message.addRepeatedUint32(303); + message.addRepeatedUint64(304); + message.addRepeatedSint32(305); + message.addRepeatedSint64(306); + message.addRepeatedFixed32(307); + message.addRepeatedFixed64(308); message.addRepeatedSfixed32(309); message.addRepeatedSfixed64(310); - message.addRepeatedFloat (311); - message.addRepeatedDouble (312); - message.addRepeatedBool (false); - message.addRepeatedString ("315"); - message.addRepeatedBytes (toBytes("316")); - - message.addRepeatedGroup( - TestAllTypes.RepeatedGroup.newBuilder().setA(317).build()); - message.addRepeatedNestedMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(318).build()); - message.addRepeatedForeignMessage( - ForeignMessage.newBuilder().setC(319).build()); - message.addRepeatedImportMessage( - ImportMessage.newBuilder().setD(320).build()); - message.addRepeatedLazyMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(327).build()); - - message.addRepeatedNestedEnum (TestAllTypes.NestedEnum.BAZ); + message.addRepeatedFloat(311); + message.addRepeatedDouble(312); + message.addRepeatedBool(false); + message.addRepeatedString("315"); + message.addRepeatedBytes(toBytes("316")); + + message.addRepeatedGroup(TestAllTypes.RepeatedGroup.newBuilder().setA(317).build()); + message.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(318).build()); + message.addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(319).build()); + message.addRepeatedImportMessage(ImportMessage.newBuilder().setD(320).build()); + message.addRepeatedLazyMessage(TestAllTypes.NestedMessage.newBuilder().setBb(327).build()); + + message.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAZ); message.addRepeatedForeignEnum(ForeignEnum.FOREIGN_BAZ); - message.addRepeatedImportEnum (ImportEnum.IMPORT_BAZ); + message.addRepeatedImportEnum(ImportEnum.IMPORT_BAZ); message.addRepeatedStringPiece("324"); message.addRepeatedCord("325"); // ----------------------------------------------------------------- - message.setDefaultInt32 (401); - message.setDefaultInt64 (402); - message.setDefaultUint32 (403); - message.setDefaultUint64 (404); - message.setDefaultSint32 (405); - message.setDefaultSint64 (406); - message.setDefaultFixed32 (407); - message.setDefaultFixed64 (408); + message.setDefaultInt32(401); + message.setDefaultInt64(402); + message.setDefaultUint32(403); + message.setDefaultUint64(404); + message.setDefaultSint32(405); + message.setDefaultSint64(406); + message.setDefaultFixed32(407); + message.setDefaultFixed64(408); message.setDefaultSfixed32(409); message.setDefaultSfixed64(410); - message.setDefaultFloat (411); - message.setDefaultDouble (412); - message.setDefaultBool (false); - message.setDefaultString ("415"); - message.setDefaultBytes (toBytes("416")); + message.setDefaultFloat(411); + message.setDefaultDouble(412); + message.setDefaultBool(false); + message.setDefaultString("415"); + message.setDefaultBytes(toBytes("416")); - message.setDefaultNestedEnum (TestAllTypes.NestedEnum.FOO); + message.setDefaultNestedEnum(TestAllTypes.NestedEnum.FOO); message.setDefaultForeignEnum(ForeignEnum.FOREIGN_FOO); - message.setDefaultImportEnum (ImportEnum.IMPORT_FOO); + message.setDefaultImportEnum(ImportEnum.IMPORT_FOO); message.setDefaultStringPiece("424"); message.setDefaultCord("425"); message.setOneofUint32(601); - message.setOneofNestedMessage( - TestAllTypes.NestedMessage.newBuilder().setBb(602).build()); + message.setOneofNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(602).build()); message.setOneofString("603"); message.setOneofBytes(toBytes("604")); } @@ -465,40 +441,35 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Modify the repeated fields of {@code message} to contain the values - * expected by {@code assertRepeatedFieldsModified()}. + * Modify the repeated fields of {@code message} to contain the values expected by {@code + * assertRepeatedFieldsModified()}. */ public static void modifyRepeatedFields(TestAllTypes.Builder message) { - message.setRepeatedInt32 (1, 501); - message.setRepeatedInt64 (1, 502); - message.setRepeatedUint32 (1, 503); - message.setRepeatedUint64 (1, 504); - message.setRepeatedSint32 (1, 505); - message.setRepeatedSint64 (1, 506); - message.setRepeatedFixed32 (1, 507); - message.setRepeatedFixed64 (1, 508); + message.setRepeatedInt32(1, 501); + message.setRepeatedInt64(1, 502); + message.setRepeatedUint32(1, 503); + message.setRepeatedUint64(1, 504); + message.setRepeatedSint32(1, 505); + message.setRepeatedSint64(1, 506); + message.setRepeatedFixed32(1, 507); + message.setRepeatedFixed64(1, 508); message.setRepeatedSfixed32(1, 509); message.setRepeatedSfixed64(1, 510); - message.setRepeatedFloat (1, 511); - message.setRepeatedDouble (1, 512); - message.setRepeatedBool (1, true); - message.setRepeatedString (1, "515"); - message.setRepeatedBytes (1, toBytes("516")); - - message.setRepeatedGroup(1, - TestAllTypes.RepeatedGroup.newBuilder().setA(517).build()); - message.setRepeatedNestedMessage(1, - TestAllTypes.NestedMessage.newBuilder().setBb(518).build()); - message.setRepeatedForeignMessage(1, - ForeignMessage.newBuilder().setC(519).build()); - message.setRepeatedImportMessage(1, - ImportMessage.newBuilder().setD(520).build()); - message.setRepeatedLazyMessage(1, - TestAllTypes.NestedMessage.newBuilder().setBb(527).build()); - - message.setRepeatedNestedEnum (1, TestAllTypes.NestedEnum.FOO); + message.setRepeatedFloat(1, 511); + message.setRepeatedDouble(1, 512); + message.setRepeatedBool(1, true); + message.setRepeatedString(1, "515"); + message.setRepeatedBytes(1, toBytes("516")); + + message.setRepeatedGroup(1, TestAllTypes.RepeatedGroup.newBuilder().setA(517).build()); + message.setRepeatedNestedMessage(1, TestAllTypes.NestedMessage.newBuilder().setBb(518).build()); + message.setRepeatedForeignMessage(1, ForeignMessage.newBuilder().setC(519).build()); + message.setRepeatedImportMessage(1, ImportMessage.newBuilder().setD(520).build()); + message.setRepeatedLazyMessage(1, TestAllTypes.NestedMessage.newBuilder().setBb(527).build()); + + message.setRepeatedNestedEnum(1, TestAllTypes.NestedEnum.FOO); message.setRepeatedForeignEnum(1, ForeignEnum.FOREIGN_FOO); - message.setRepeatedImportEnum (1, ImportEnum.IMPORT_FOO); + message.setRepeatedImportEnum(1, ImportEnum.IMPORT_FOO); message.setRepeatedStringPiece(1, "524"); message.setRepeatedCord(1, "525"); @@ -507,65 +478,65 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are set to the values assigned by {@code setAllFields}. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the + * values assigned by {@code setAllFields}. */ public static void assertAllFieldsSet(TestAllTypesOrBuilder message) { - Assert.assertTrue(message.hasOptionalInt32 ()); - Assert.assertTrue(message.hasOptionalInt64 ()); - Assert.assertTrue(message.hasOptionalUint32 ()); - Assert.assertTrue(message.hasOptionalUint64 ()); - Assert.assertTrue(message.hasOptionalSint32 ()); - Assert.assertTrue(message.hasOptionalSint64 ()); - Assert.assertTrue(message.hasOptionalFixed32 ()); - Assert.assertTrue(message.hasOptionalFixed64 ()); + Assert.assertTrue(message.hasOptionalInt32()); + Assert.assertTrue(message.hasOptionalInt64()); + Assert.assertTrue(message.hasOptionalUint32()); + Assert.assertTrue(message.hasOptionalUint64()); + Assert.assertTrue(message.hasOptionalSint32()); + Assert.assertTrue(message.hasOptionalSint64()); + Assert.assertTrue(message.hasOptionalFixed32()); + Assert.assertTrue(message.hasOptionalFixed64()); Assert.assertTrue(message.hasOptionalSfixed32()); Assert.assertTrue(message.hasOptionalSfixed64()); - Assert.assertTrue(message.hasOptionalFloat ()); - Assert.assertTrue(message.hasOptionalDouble ()); - Assert.assertTrue(message.hasOptionalBool ()); - Assert.assertTrue(message.hasOptionalString ()); - Assert.assertTrue(message.hasOptionalBytes ()); - - Assert.assertTrue(message.hasOptionalGroup ()); - Assert.assertTrue(message.hasOptionalNestedMessage ()); + Assert.assertTrue(message.hasOptionalFloat()); + Assert.assertTrue(message.hasOptionalDouble()); + Assert.assertTrue(message.hasOptionalBool()); + Assert.assertTrue(message.hasOptionalString()); + Assert.assertTrue(message.hasOptionalBytes()); + + Assert.assertTrue(message.hasOptionalGroup()); + Assert.assertTrue(message.hasOptionalNestedMessage()); Assert.assertTrue(message.hasOptionalForeignMessage()); - Assert.assertTrue(message.hasOptionalImportMessage ()); + Assert.assertTrue(message.hasOptionalImportMessage()); - Assert.assertTrue(message.getOptionalGroup ().hasA()); - Assert.assertTrue(message.getOptionalNestedMessage ().hasBb()); + Assert.assertTrue(message.getOptionalGroup().hasA()); + Assert.assertTrue(message.getOptionalNestedMessage().hasBb()); Assert.assertTrue(message.getOptionalForeignMessage().hasC()); - Assert.assertTrue(message.getOptionalImportMessage ().hasD()); + Assert.assertTrue(message.getOptionalImportMessage().hasD()); - Assert.assertTrue(message.hasOptionalNestedEnum ()); + Assert.assertTrue(message.hasOptionalNestedEnum()); Assert.assertTrue(message.hasOptionalForeignEnum()); - Assert.assertTrue(message.hasOptionalImportEnum ()); + Assert.assertTrue(message.hasOptionalImportEnum()); Assert.assertTrue(message.hasOptionalStringPiece()); Assert.assertTrue(message.hasOptionalCord()); - Assert.assertEquals(101 , message.getOptionalInt32 ()); - Assert.assertEquals(102 , message.getOptionalInt64 ()); - Assert.assertEquals(103 , message.getOptionalUint32 ()); - Assert.assertEquals(104 , message.getOptionalUint64 ()); - Assert.assertEquals(105 , message.getOptionalSint32 ()); - Assert.assertEquals(106 , message.getOptionalSint64 ()); - Assert.assertEquals(107 , message.getOptionalFixed32 ()); - Assert.assertEquals(108 , message.getOptionalFixed64 ()); - Assert.assertEquals(109 , message.getOptionalSfixed32()); - Assert.assertEquals(110 , message.getOptionalSfixed64()); - Assert.assertEquals(111 , message.getOptionalFloat (), 0.0); - Assert.assertEquals(112 , message.getOptionalDouble (), 0.0); - Assert.assertEquals(true , message.getOptionalBool ()); - Assert.assertEquals("115", message.getOptionalString ()); + Assert.assertEquals(101, message.getOptionalInt32()); + Assert.assertEquals(102, message.getOptionalInt64()); + Assert.assertEquals(103, message.getOptionalUint32()); + Assert.assertEquals(104, message.getOptionalUint64()); + Assert.assertEquals(105, message.getOptionalSint32()); + Assert.assertEquals(106, message.getOptionalSint64()); + Assert.assertEquals(107, message.getOptionalFixed32()); + Assert.assertEquals(108, message.getOptionalFixed64()); + Assert.assertEquals(109, message.getOptionalSfixed32()); + Assert.assertEquals(110, message.getOptionalSfixed64()); + Assert.assertEquals(111, message.getOptionalFloat(), 0.0); + Assert.assertEquals(112, message.getOptionalDouble(), 0.0); + Assert.assertEquals(true, message.getOptionalBool()); + Assert.assertEquals("115", message.getOptionalString()); Assert.assertEquals(toBytes("116"), message.getOptionalBytes()); - Assert.assertEquals(117, message.getOptionalGroup ().getA()); - Assert.assertEquals(118, message.getOptionalNestedMessage ().getBb()); - Assert.assertEquals(119, message.getOptionalForeignMessage ().getC()); - Assert.assertEquals(120, message.getOptionalImportMessage ().getD()); + Assert.assertEquals(117, message.getOptionalGroup().getA()); + Assert.assertEquals(118, message.getOptionalNestedMessage().getBb()); + Assert.assertEquals(119, message.getOptionalForeignMessage().getC()); + Assert.assertEquals(120, message.getOptionalImportMessage().getD()); Assert.assertEquals(126, message.getOptionalPublicImportMessage().getE()); - Assert.assertEquals(127, message.getOptionalLazyMessage ().getBb()); + Assert.assertEquals(127, message.getOptionalLazyMessage().getBb()); Assert.assertEquals(TestAllTypes.NestedEnum.BAZ, message.getOptionalNestedEnum()); Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getOptionalForeignEnum()); @@ -576,86 +547,86 @@ public final class TestUtil { // ----------------------------------------------------------------- - Assert.assertEquals(2, message.getRepeatedInt32Count ()); - Assert.assertEquals(2, message.getRepeatedInt64Count ()); - Assert.assertEquals(2, message.getRepeatedUint32Count ()); - Assert.assertEquals(2, message.getRepeatedUint64Count ()); - Assert.assertEquals(2, message.getRepeatedSint32Count ()); - Assert.assertEquals(2, message.getRepeatedSint64Count ()); - Assert.assertEquals(2, message.getRepeatedFixed32Count ()); - Assert.assertEquals(2, message.getRepeatedFixed64Count ()); + Assert.assertEquals(2, message.getRepeatedInt32Count()); + Assert.assertEquals(2, message.getRepeatedInt64Count()); + Assert.assertEquals(2, message.getRepeatedUint32Count()); + Assert.assertEquals(2, message.getRepeatedUint64Count()); + Assert.assertEquals(2, message.getRepeatedSint32Count()); + Assert.assertEquals(2, message.getRepeatedSint64Count()); + Assert.assertEquals(2, message.getRepeatedFixed32Count()); + Assert.assertEquals(2, message.getRepeatedFixed64Count()); Assert.assertEquals(2, message.getRepeatedSfixed32Count()); Assert.assertEquals(2, message.getRepeatedSfixed64Count()); - Assert.assertEquals(2, message.getRepeatedFloatCount ()); - Assert.assertEquals(2, message.getRepeatedDoubleCount ()); - Assert.assertEquals(2, message.getRepeatedBoolCount ()); - Assert.assertEquals(2, message.getRepeatedStringCount ()); - Assert.assertEquals(2, message.getRepeatedBytesCount ()); - - Assert.assertEquals(2, message.getRepeatedGroupCount ()); - Assert.assertEquals(2, message.getRepeatedNestedMessageCount ()); + Assert.assertEquals(2, message.getRepeatedFloatCount()); + Assert.assertEquals(2, message.getRepeatedDoubleCount()); + Assert.assertEquals(2, message.getRepeatedBoolCount()); + Assert.assertEquals(2, message.getRepeatedStringCount()); + Assert.assertEquals(2, message.getRepeatedBytesCount()); + + Assert.assertEquals(2, message.getRepeatedGroupCount()); + Assert.assertEquals(2, message.getRepeatedNestedMessageCount()); Assert.assertEquals(2, message.getRepeatedForeignMessageCount()); - Assert.assertEquals(2, message.getRepeatedImportMessageCount ()); - Assert.assertEquals(2, message.getRepeatedLazyMessageCount ()); - Assert.assertEquals(2, message.getRepeatedNestedEnumCount ()); - Assert.assertEquals(2, message.getRepeatedForeignEnumCount ()); - Assert.assertEquals(2, message.getRepeatedImportEnumCount ()); + Assert.assertEquals(2, message.getRepeatedImportMessageCount()); + Assert.assertEquals(2, message.getRepeatedLazyMessageCount()); + Assert.assertEquals(2, message.getRepeatedNestedEnumCount()); + Assert.assertEquals(2, message.getRepeatedForeignEnumCount()); + Assert.assertEquals(2, message.getRepeatedImportEnumCount()); Assert.assertEquals(2, message.getRepeatedStringPieceCount()); Assert.assertEquals(2, message.getRepeatedCordCount()); - Assert.assertEquals(201 , message.getRepeatedInt32 (0)); - Assert.assertEquals(202 , message.getRepeatedInt64 (0)); - Assert.assertEquals(203 , message.getRepeatedUint32 (0)); - Assert.assertEquals(204 , message.getRepeatedUint64 (0)); - Assert.assertEquals(205 , message.getRepeatedSint32 (0)); - Assert.assertEquals(206 , message.getRepeatedSint64 (0)); - Assert.assertEquals(207 , message.getRepeatedFixed32 (0)); - Assert.assertEquals(208 , message.getRepeatedFixed64 (0)); - Assert.assertEquals(209 , message.getRepeatedSfixed32(0)); - Assert.assertEquals(210 , message.getRepeatedSfixed64(0)); - Assert.assertEquals(211 , message.getRepeatedFloat (0), 0.0); - Assert.assertEquals(212 , message.getRepeatedDouble (0), 0.0); - Assert.assertEquals(true , message.getRepeatedBool (0)); - Assert.assertEquals("215", message.getRepeatedString (0)); + Assert.assertEquals(201, message.getRepeatedInt32(0)); + Assert.assertEquals(202, message.getRepeatedInt64(0)); + Assert.assertEquals(203, message.getRepeatedUint32(0)); + Assert.assertEquals(204, message.getRepeatedUint64(0)); + Assert.assertEquals(205, message.getRepeatedSint32(0)); + Assert.assertEquals(206, message.getRepeatedSint64(0)); + Assert.assertEquals(207, message.getRepeatedFixed32(0)); + Assert.assertEquals(208, message.getRepeatedFixed64(0)); + Assert.assertEquals(209, message.getRepeatedSfixed32(0)); + Assert.assertEquals(210, message.getRepeatedSfixed64(0)); + Assert.assertEquals(211, message.getRepeatedFloat(0), 0.0); + Assert.assertEquals(212, message.getRepeatedDouble(0), 0.0); + Assert.assertEquals(true, message.getRepeatedBool(0)); + Assert.assertEquals("215", message.getRepeatedString(0)); Assert.assertEquals(toBytes("216"), message.getRepeatedBytes(0)); - Assert.assertEquals(217, message.getRepeatedGroup (0).getA()); - Assert.assertEquals(218, message.getRepeatedNestedMessage (0).getBb()); + Assert.assertEquals(217, message.getRepeatedGroup(0).getA()); + Assert.assertEquals(218, message.getRepeatedNestedMessage(0).getBb()); Assert.assertEquals(219, message.getRepeatedForeignMessage(0).getC()); - Assert.assertEquals(220, message.getRepeatedImportMessage (0).getD()); - Assert.assertEquals(227, message.getRepeatedLazyMessage (0).getBb()); + Assert.assertEquals(220, message.getRepeatedImportMessage(0).getD()); + Assert.assertEquals(227, message.getRepeatedLazyMessage(0).getBb()); - Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getRepeatedNestedEnum (0)); + Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getRepeatedNestedEnum(0)); Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getRepeatedForeignEnum(0)); Assert.assertEquals(ImportEnum.IMPORT_BAR, message.getRepeatedImportEnum(0)); Assert.assertEquals("224", message.getRepeatedStringPiece(0)); Assert.assertEquals("225", message.getRepeatedCord(0)); - Assert.assertEquals(301 , message.getRepeatedInt32 (1)); - Assert.assertEquals(302 , message.getRepeatedInt64 (1)); - Assert.assertEquals(303 , message.getRepeatedUint32 (1)); - Assert.assertEquals(304 , message.getRepeatedUint64 (1)); - Assert.assertEquals(305 , message.getRepeatedSint32 (1)); - Assert.assertEquals(306 , message.getRepeatedSint64 (1)); - Assert.assertEquals(307 , message.getRepeatedFixed32 (1)); - Assert.assertEquals(308 , message.getRepeatedFixed64 (1)); - Assert.assertEquals(309 , message.getRepeatedSfixed32(1)); - Assert.assertEquals(310 , message.getRepeatedSfixed64(1)); - Assert.assertEquals(311 , message.getRepeatedFloat (1), 0.0); - Assert.assertEquals(312 , message.getRepeatedDouble (1), 0.0); - Assert.assertEquals(false, message.getRepeatedBool (1)); - Assert.assertEquals("315", message.getRepeatedString (1)); + Assert.assertEquals(301, message.getRepeatedInt32(1)); + Assert.assertEquals(302, message.getRepeatedInt64(1)); + Assert.assertEquals(303, message.getRepeatedUint32(1)); + Assert.assertEquals(304, message.getRepeatedUint64(1)); + Assert.assertEquals(305, message.getRepeatedSint32(1)); + Assert.assertEquals(306, message.getRepeatedSint64(1)); + Assert.assertEquals(307, message.getRepeatedFixed32(1)); + Assert.assertEquals(308, message.getRepeatedFixed64(1)); + Assert.assertEquals(309, message.getRepeatedSfixed32(1)); + Assert.assertEquals(310, message.getRepeatedSfixed64(1)); + Assert.assertEquals(311, message.getRepeatedFloat(1), 0.0); + Assert.assertEquals(312, message.getRepeatedDouble(1), 0.0); + Assert.assertEquals(false, message.getRepeatedBool(1)); + Assert.assertEquals("315", message.getRepeatedString(1)); Assert.assertEquals(toBytes("316"), message.getRepeatedBytes(1)); - Assert.assertEquals(317, message.getRepeatedGroup (1).getA()); - Assert.assertEquals(318, message.getRepeatedNestedMessage (1).getBb()); + Assert.assertEquals(317, message.getRepeatedGroup(1).getA()); + Assert.assertEquals(318, message.getRepeatedNestedMessage(1).getBb()); Assert.assertEquals(319, message.getRepeatedForeignMessage(1).getC()); - Assert.assertEquals(320, message.getRepeatedImportMessage (1).getD()); - Assert.assertEquals(327, message.getRepeatedLazyMessage (1).getBb()); + Assert.assertEquals(320, message.getRepeatedImportMessage(1).getD()); + Assert.assertEquals(327, message.getRepeatedLazyMessage(1).getBb()); - Assert.assertEquals(TestAllTypes.NestedEnum.BAZ, message.getRepeatedNestedEnum (1)); + Assert.assertEquals(TestAllTypes.NestedEnum.BAZ, message.getRepeatedNestedEnum(1)); Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getRepeatedForeignEnum(1)); Assert.assertEquals(ImportEnum.IMPORT_BAZ, message.getRepeatedImportEnum(1)); @@ -664,46 +635,46 @@ public final class TestUtil { // ----------------------------------------------------------------- - Assert.assertTrue(message.hasDefaultInt32 ()); - Assert.assertTrue(message.hasDefaultInt64 ()); - Assert.assertTrue(message.hasDefaultUint32 ()); - Assert.assertTrue(message.hasDefaultUint64 ()); - Assert.assertTrue(message.hasDefaultSint32 ()); - Assert.assertTrue(message.hasDefaultSint64 ()); - Assert.assertTrue(message.hasDefaultFixed32 ()); - Assert.assertTrue(message.hasDefaultFixed64 ()); + Assert.assertTrue(message.hasDefaultInt32()); + Assert.assertTrue(message.hasDefaultInt64()); + Assert.assertTrue(message.hasDefaultUint32()); + Assert.assertTrue(message.hasDefaultUint64()); + Assert.assertTrue(message.hasDefaultSint32()); + Assert.assertTrue(message.hasDefaultSint64()); + Assert.assertTrue(message.hasDefaultFixed32()); + Assert.assertTrue(message.hasDefaultFixed64()); Assert.assertTrue(message.hasDefaultSfixed32()); Assert.assertTrue(message.hasDefaultSfixed64()); - Assert.assertTrue(message.hasDefaultFloat ()); - Assert.assertTrue(message.hasDefaultDouble ()); - Assert.assertTrue(message.hasDefaultBool ()); - Assert.assertTrue(message.hasDefaultString ()); - Assert.assertTrue(message.hasDefaultBytes ()); + Assert.assertTrue(message.hasDefaultFloat()); + Assert.assertTrue(message.hasDefaultDouble()); + Assert.assertTrue(message.hasDefaultBool()); + Assert.assertTrue(message.hasDefaultString()); + Assert.assertTrue(message.hasDefaultBytes()); - Assert.assertTrue(message.hasDefaultNestedEnum ()); + Assert.assertTrue(message.hasDefaultNestedEnum()); Assert.assertTrue(message.hasDefaultForeignEnum()); - Assert.assertTrue(message.hasDefaultImportEnum ()); + Assert.assertTrue(message.hasDefaultImportEnum()); Assert.assertTrue(message.hasDefaultStringPiece()); Assert.assertTrue(message.hasDefaultCord()); - Assert.assertEquals(401 , message.getDefaultInt32 ()); - Assert.assertEquals(402 , message.getDefaultInt64 ()); - Assert.assertEquals(403 , message.getDefaultUint32 ()); - Assert.assertEquals(404 , message.getDefaultUint64 ()); - Assert.assertEquals(405 , message.getDefaultSint32 ()); - Assert.assertEquals(406 , message.getDefaultSint64 ()); - Assert.assertEquals(407 , message.getDefaultFixed32 ()); - Assert.assertEquals(408 , message.getDefaultFixed64 ()); - Assert.assertEquals(409 , message.getDefaultSfixed32()); - Assert.assertEquals(410 , message.getDefaultSfixed64()); - Assert.assertEquals(411 , message.getDefaultFloat (), 0.0); - Assert.assertEquals(412 , message.getDefaultDouble (), 0.0); - Assert.assertEquals(false, message.getDefaultBool ()); - Assert.assertEquals("415", message.getDefaultString ()); + Assert.assertEquals(401, message.getDefaultInt32()); + Assert.assertEquals(402, message.getDefaultInt64()); + Assert.assertEquals(403, message.getDefaultUint32()); + Assert.assertEquals(404, message.getDefaultUint64()); + Assert.assertEquals(405, message.getDefaultSint32()); + Assert.assertEquals(406, message.getDefaultSint64()); + Assert.assertEquals(407, message.getDefaultFixed32()); + Assert.assertEquals(408, message.getDefaultFixed64()); + Assert.assertEquals(409, message.getDefaultSfixed32()); + Assert.assertEquals(410, message.getDefaultSfixed64()); + Assert.assertEquals(411, message.getDefaultFloat(), 0.0); + Assert.assertEquals(412, message.getDefaultDouble(), 0.0); + Assert.assertEquals(false, message.getDefaultBool()); + Assert.assertEquals("415", message.getDefaultString()); Assert.assertEquals(toBytes("416"), message.getDefaultBytes()); - Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getDefaultNestedEnum ()); + Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getDefaultNestedEnum()); Assert.assertEquals(ForeignEnum.FOREIGN_FOO, message.getDefaultForeignEnum()); Assert.assertEquals(ImportEnum.IMPORT_FOO, message.getDefaultImportEnum()); @@ -721,74 +692,73 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are cleared, and that getting the fields returns their - * default values. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are cleared, + * and that getting the fields returns their default values. */ public static void assertClear(TestAllTypesOrBuilder message) { // hasBlah() should initially be false for all optional fields. - Assert.assertFalse(message.hasOptionalInt32 ()); - Assert.assertFalse(message.hasOptionalInt64 ()); - Assert.assertFalse(message.hasOptionalUint32 ()); - Assert.assertFalse(message.hasOptionalUint64 ()); - Assert.assertFalse(message.hasOptionalSint32 ()); - Assert.assertFalse(message.hasOptionalSint64 ()); - Assert.assertFalse(message.hasOptionalFixed32 ()); - Assert.assertFalse(message.hasOptionalFixed64 ()); + Assert.assertFalse(message.hasOptionalInt32()); + Assert.assertFalse(message.hasOptionalInt64()); + Assert.assertFalse(message.hasOptionalUint32()); + Assert.assertFalse(message.hasOptionalUint64()); + Assert.assertFalse(message.hasOptionalSint32()); + Assert.assertFalse(message.hasOptionalSint64()); + Assert.assertFalse(message.hasOptionalFixed32()); + Assert.assertFalse(message.hasOptionalFixed64()); Assert.assertFalse(message.hasOptionalSfixed32()); Assert.assertFalse(message.hasOptionalSfixed64()); - Assert.assertFalse(message.hasOptionalFloat ()); - Assert.assertFalse(message.hasOptionalDouble ()); - Assert.assertFalse(message.hasOptionalBool ()); - Assert.assertFalse(message.hasOptionalString ()); - Assert.assertFalse(message.hasOptionalBytes ()); - - Assert.assertFalse(message.hasOptionalGroup ()); - Assert.assertFalse(message.hasOptionalNestedMessage ()); + Assert.assertFalse(message.hasOptionalFloat()); + Assert.assertFalse(message.hasOptionalDouble()); + Assert.assertFalse(message.hasOptionalBool()); + Assert.assertFalse(message.hasOptionalString()); + Assert.assertFalse(message.hasOptionalBytes()); + + Assert.assertFalse(message.hasOptionalGroup()); + Assert.assertFalse(message.hasOptionalNestedMessage()); Assert.assertFalse(message.hasOptionalForeignMessage()); - Assert.assertFalse(message.hasOptionalImportMessage ()); + Assert.assertFalse(message.hasOptionalImportMessage()); - Assert.assertFalse(message.hasOptionalNestedEnum ()); + Assert.assertFalse(message.hasOptionalNestedEnum()); Assert.assertFalse(message.hasOptionalForeignEnum()); - Assert.assertFalse(message.hasOptionalImportEnum ()); + Assert.assertFalse(message.hasOptionalImportEnum()); Assert.assertFalse(message.hasOptionalStringPiece()); Assert.assertFalse(message.hasOptionalCord()); // Optional fields without defaults are set to zero or something like it. - Assert.assertEquals(0 , message.getOptionalInt32 ()); - Assert.assertEquals(0 , message.getOptionalInt64 ()); - Assert.assertEquals(0 , message.getOptionalUint32 ()); - Assert.assertEquals(0 , message.getOptionalUint64 ()); - Assert.assertEquals(0 , message.getOptionalSint32 ()); - Assert.assertEquals(0 , message.getOptionalSint64 ()); - Assert.assertEquals(0 , message.getOptionalFixed32 ()); - Assert.assertEquals(0 , message.getOptionalFixed64 ()); - Assert.assertEquals(0 , message.getOptionalSfixed32()); - Assert.assertEquals(0 , message.getOptionalSfixed64()); - Assert.assertEquals(0 , message.getOptionalFloat (), 0.0); - Assert.assertEquals(0 , message.getOptionalDouble (), 0.0); - Assert.assertEquals(false, message.getOptionalBool ()); - Assert.assertEquals("" , message.getOptionalString ()); + Assert.assertEquals(0, message.getOptionalInt32()); + Assert.assertEquals(0, message.getOptionalInt64()); + Assert.assertEquals(0, message.getOptionalUint32()); + Assert.assertEquals(0, message.getOptionalUint64()); + Assert.assertEquals(0, message.getOptionalSint32()); + Assert.assertEquals(0, message.getOptionalSint64()); + Assert.assertEquals(0, message.getOptionalFixed32()); + Assert.assertEquals(0, message.getOptionalFixed64()); + Assert.assertEquals(0, message.getOptionalSfixed32()); + Assert.assertEquals(0, message.getOptionalSfixed64()); + Assert.assertEquals(0, message.getOptionalFloat(), 0.0); + Assert.assertEquals(0, message.getOptionalDouble(), 0.0); + Assert.assertEquals(false, message.getOptionalBool()); + Assert.assertEquals("", message.getOptionalString()); Assert.assertEquals(ByteString.EMPTY, message.getOptionalBytes()); // Embedded messages should also be clear. - Assert.assertFalse(message.getOptionalGroup ().hasA()); - Assert.assertFalse(message.getOptionalNestedMessage ().hasBb()); - Assert.assertFalse(message.getOptionalForeignMessage ().hasC()); - Assert.assertFalse(message.getOptionalImportMessage ().hasD()); + Assert.assertFalse(message.getOptionalGroup().hasA()); + Assert.assertFalse(message.getOptionalNestedMessage().hasBb()); + Assert.assertFalse(message.getOptionalForeignMessage().hasC()); + Assert.assertFalse(message.getOptionalImportMessage().hasD()); Assert.assertFalse(message.getOptionalPublicImportMessage().hasE()); - Assert.assertFalse(message.getOptionalLazyMessage ().hasBb()); + Assert.assertFalse(message.getOptionalLazyMessage().hasBb()); - Assert.assertEquals(0, message.getOptionalGroup ().getA()); - Assert.assertEquals(0, message.getOptionalNestedMessage ().getBb()); - Assert.assertEquals(0, message.getOptionalForeignMessage ().getC()); - Assert.assertEquals(0, message.getOptionalImportMessage ().getD()); + Assert.assertEquals(0, message.getOptionalGroup().getA()); + Assert.assertEquals(0, message.getOptionalNestedMessage().getBb()); + Assert.assertEquals(0, message.getOptionalForeignMessage().getC()); + Assert.assertEquals(0, message.getOptionalImportMessage().getD()); Assert.assertEquals(0, message.getOptionalPublicImportMessage().getE()); - Assert.assertEquals(0, message.getOptionalLazyMessage ().getBb()); + Assert.assertEquals(0, message.getOptionalLazyMessage().getBb()); // Enums without defaults are set to the first value in the enum. - Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getOptionalNestedEnum ()); + Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getOptionalNestedEnum()); Assert.assertEquals(ForeignEnum.FOREIGN_FOO, message.getOptionalForeignEnum()); Assert.assertEquals(ImportEnum.IMPORT_FOO, message.getOptionalImportEnum()); @@ -796,76 +766,76 @@ public final class TestUtil { Assert.assertEquals("", message.getOptionalCord()); // Repeated fields are empty. - Assert.assertEquals(0, message.getRepeatedInt32Count ()); - Assert.assertEquals(0, message.getRepeatedInt64Count ()); - Assert.assertEquals(0, message.getRepeatedUint32Count ()); - Assert.assertEquals(0, message.getRepeatedUint64Count ()); - Assert.assertEquals(0, message.getRepeatedSint32Count ()); - Assert.assertEquals(0, message.getRepeatedSint64Count ()); - Assert.assertEquals(0, message.getRepeatedFixed32Count ()); - Assert.assertEquals(0, message.getRepeatedFixed64Count ()); + Assert.assertEquals(0, message.getRepeatedInt32Count()); + Assert.assertEquals(0, message.getRepeatedInt64Count()); + Assert.assertEquals(0, message.getRepeatedUint32Count()); + Assert.assertEquals(0, message.getRepeatedUint64Count()); + Assert.assertEquals(0, message.getRepeatedSint32Count()); + Assert.assertEquals(0, message.getRepeatedSint64Count()); + Assert.assertEquals(0, message.getRepeatedFixed32Count()); + Assert.assertEquals(0, message.getRepeatedFixed64Count()); Assert.assertEquals(0, message.getRepeatedSfixed32Count()); Assert.assertEquals(0, message.getRepeatedSfixed64Count()); - Assert.assertEquals(0, message.getRepeatedFloatCount ()); - Assert.assertEquals(0, message.getRepeatedDoubleCount ()); - Assert.assertEquals(0, message.getRepeatedBoolCount ()); - Assert.assertEquals(0, message.getRepeatedStringCount ()); - Assert.assertEquals(0, message.getRepeatedBytesCount ()); - - Assert.assertEquals(0, message.getRepeatedGroupCount ()); - Assert.assertEquals(0, message.getRepeatedNestedMessageCount ()); + Assert.assertEquals(0, message.getRepeatedFloatCount()); + Assert.assertEquals(0, message.getRepeatedDoubleCount()); + Assert.assertEquals(0, message.getRepeatedBoolCount()); + Assert.assertEquals(0, message.getRepeatedStringCount()); + Assert.assertEquals(0, message.getRepeatedBytesCount()); + + Assert.assertEquals(0, message.getRepeatedGroupCount()); + Assert.assertEquals(0, message.getRepeatedNestedMessageCount()); Assert.assertEquals(0, message.getRepeatedForeignMessageCount()); - Assert.assertEquals(0, message.getRepeatedImportMessageCount ()); - Assert.assertEquals(0, message.getRepeatedLazyMessageCount ()); - Assert.assertEquals(0, message.getRepeatedNestedEnumCount ()); - Assert.assertEquals(0, message.getRepeatedForeignEnumCount ()); - Assert.assertEquals(0, message.getRepeatedImportEnumCount ()); + Assert.assertEquals(0, message.getRepeatedImportMessageCount()); + Assert.assertEquals(0, message.getRepeatedLazyMessageCount()); + Assert.assertEquals(0, message.getRepeatedNestedEnumCount()); + Assert.assertEquals(0, message.getRepeatedForeignEnumCount()); + Assert.assertEquals(0, message.getRepeatedImportEnumCount()); Assert.assertEquals(0, message.getRepeatedStringPieceCount()); Assert.assertEquals(0, message.getRepeatedCordCount()); // hasBlah() should also be false for all default fields. - Assert.assertFalse(message.hasDefaultInt32 ()); - Assert.assertFalse(message.hasDefaultInt64 ()); - Assert.assertFalse(message.hasDefaultUint32 ()); - Assert.assertFalse(message.hasDefaultUint64 ()); - Assert.assertFalse(message.hasDefaultSint32 ()); - Assert.assertFalse(message.hasDefaultSint64 ()); - Assert.assertFalse(message.hasDefaultFixed32 ()); - Assert.assertFalse(message.hasDefaultFixed64 ()); + Assert.assertFalse(message.hasDefaultInt32()); + Assert.assertFalse(message.hasDefaultInt64()); + Assert.assertFalse(message.hasDefaultUint32()); + Assert.assertFalse(message.hasDefaultUint64()); + Assert.assertFalse(message.hasDefaultSint32()); + Assert.assertFalse(message.hasDefaultSint64()); + Assert.assertFalse(message.hasDefaultFixed32()); + Assert.assertFalse(message.hasDefaultFixed64()); Assert.assertFalse(message.hasDefaultSfixed32()); Assert.assertFalse(message.hasDefaultSfixed64()); - Assert.assertFalse(message.hasDefaultFloat ()); - Assert.assertFalse(message.hasDefaultDouble ()); - Assert.assertFalse(message.hasDefaultBool ()); - Assert.assertFalse(message.hasDefaultString ()); - Assert.assertFalse(message.hasDefaultBytes ()); + Assert.assertFalse(message.hasDefaultFloat()); + Assert.assertFalse(message.hasDefaultDouble()); + Assert.assertFalse(message.hasDefaultBool()); + Assert.assertFalse(message.hasDefaultString()); + Assert.assertFalse(message.hasDefaultBytes()); - Assert.assertFalse(message.hasDefaultNestedEnum ()); + Assert.assertFalse(message.hasDefaultNestedEnum()); Assert.assertFalse(message.hasDefaultForeignEnum()); - Assert.assertFalse(message.hasDefaultImportEnum ()); + Assert.assertFalse(message.hasDefaultImportEnum()); Assert.assertFalse(message.hasDefaultStringPiece()); Assert.assertFalse(message.hasDefaultCord()); // Fields with defaults have their default values (duh). - Assert.assertEquals( 41 , message.getDefaultInt32 ()); - Assert.assertEquals( 42 , message.getDefaultInt64 ()); - Assert.assertEquals( 43 , message.getDefaultUint32 ()); - Assert.assertEquals( 44 , message.getDefaultUint64 ()); - Assert.assertEquals(-45 , message.getDefaultSint32 ()); - Assert.assertEquals( 46 , message.getDefaultSint64 ()); - Assert.assertEquals( 47 , message.getDefaultFixed32 ()); - Assert.assertEquals( 48 , message.getDefaultFixed64 ()); - Assert.assertEquals( 49 , message.getDefaultSfixed32()); - Assert.assertEquals(-50 , message.getDefaultSfixed64()); - Assert.assertEquals( 51.5 , message.getDefaultFloat (), 0.0); - Assert.assertEquals( 52e3 , message.getDefaultDouble (), 0.0); - Assert.assertEquals(true , message.getDefaultBool ()); - Assert.assertEquals("hello", message.getDefaultString ()); + Assert.assertEquals(41, message.getDefaultInt32()); + Assert.assertEquals(42, message.getDefaultInt64()); + Assert.assertEquals(43, message.getDefaultUint32()); + Assert.assertEquals(44, message.getDefaultUint64()); + Assert.assertEquals(-45, message.getDefaultSint32()); + Assert.assertEquals(46, message.getDefaultSint64()); + Assert.assertEquals(47, message.getDefaultFixed32()); + Assert.assertEquals(48, message.getDefaultFixed64()); + Assert.assertEquals(49, message.getDefaultSfixed32()); + Assert.assertEquals(-50, message.getDefaultSfixed64()); + Assert.assertEquals(51.5, message.getDefaultFloat(), 0.0); + Assert.assertEquals(52e3, message.getDefaultDouble(), 0.0); + Assert.assertEquals(true, message.getDefaultBool()); + Assert.assertEquals("hello", message.getDefaultString()); Assert.assertEquals(toBytes("world"), message.getDefaultBytes()); - Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getDefaultNestedEnum ()); + Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getDefaultNestedEnum()); Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getDefaultForeignEnum()); Assert.assertEquals(ImportEnum.IMPORT_BAR, message.getDefaultImportEnum()); @@ -881,66 +851,64 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are set to the values assigned by {@code setAllFields} - * followed by {@code modifyRepeatedFields}. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the + * values assigned by {@code setAllFields} followed by {@code modifyRepeatedFields}. */ - public static void assertRepeatedFieldsModified( - TestAllTypesOrBuilder message) { + public static void assertRepeatedFieldsModified(TestAllTypesOrBuilder message) { // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.assertEquals(2, message.getRepeatedInt32Count ()); - Assert.assertEquals(2, message.getRepeatedInt64Count ()); - Assert.assertEquals(2, message.getRepeatedUint32Count ()); - Assert.assertEquals(2, message.getRepeatedUint64Count ()); - Assert.assertEquals(2, message.getRepeatedSint32Count ()); - Assert.assertEquals(2, message.getRepeatedSint64Count ()); - Assert.assertEquals(2, message.getRepeatedFixed32Count ()); - Assert.assertEquals(2, message.getRepeatedFixed64Count ()); + Assert.assertEquals(2, message.getRepeatedInt32Count()); + Assert.assertEquals(2, message.getRepeatedInt64Count()); + Assert.assertEquals(2, message.getRepeatedUint32Count()); + Assert.assertEquals(2, message.getRepeatedUint64Count()); + Assert.assertEquals(2, message.getRepeatedSint32Count()); + Assert.assertEquals(2, message.getRepeatedSint64Count()); + Assert.assertEquals(2, message.getRepeatedFixed32Count()); + Assert.assertEquals(2, message.getRepeatedFixed64Count()); Assert.assertEquals(2, message.getRepeatedSfixed32Count()); Assert.assertEquals(2, message.getRepeatedSfixed64Count()); - Assert.assertEquals(2, message.getRepeatedFloatCount ()); - Assert.assertEquals(2, message.getRepeatedDoubleCount ()); - Assert.assertEquals(2, message.getRepeatedBoolCount ()); - Assert.assertEquals(2, message.getRepeatedStringCount ()); - Assert.assertEquals(2, message.getRepeatedBytesCount ()); - - Assert.assertEquals(2, message.getRepeatedGroupCount ()); - Assert.assertEquals(2, message.getRepeatedNestedMessageCount ()); + Assert.assertEquals(2, message.getRepeatedFloatCount()); + Assert.assertEquals(2, message.getRepeatedDoubleCount()); + Assert.assertEquals(2, message.getRepeatedBoolCount()); + Assert.assertEquals(2, message.getRepeatedStringCount()); + Assert.assertEquals(2, message.getRepeatedBytesCount()); + + Assert.assertEquals(2, message.getRepeatedGroupCount()); + Assert.assertEquals(2, message.getRepeatedNestedMessageCount()); Assert.assertEquals(2, message.getRepeatedForeignMessageCount()); - Assert.assertEquals(2, message.getRepeatedImportMessageCount ()); - Assert.assertEquals(2, message.getRepeatedLazyMessageCount ()); - Assert.assertEquals(2, message.getRepeatedNestedEnumCount ()); - Assert.assertEquals(2, message.getRepeatedForeignEnumCount ()); - Assert.assertEquals(2, message.getRepeatedImportEnumCount ()); + Assert.assertEquals(2, message.getRepeatedImportMessageCount()); + Assert.assertEquals(2, message.getRepeatedLazyMessageCount()); + Assert.assertEquals(2, message.getRepeatedNestedEnumCount()); + Assert.assertEquals(2, message.getRepeatedForeignEnumCount()); + Assert.assertEquals(2, message.getRepeatedImportEnumCount()); Assert.assertEquals(2, message.getRepeatedStringPieceCount()); Assert.assertEquals(2, message.getRepeatedCordCount()); - Assert.assertEquals(201 , message.getRepeatedInt32 (0)); - Assert.assertEquals(202L , message.getRepeatedInt64 (0)); - Assert.assertEquals(203 , message.getRepeatedUint32 (0)); - Assert.assertEquals(204L , message.getRepeatedUint64 (0)); - Assert.assertEquals(205 , message.getRepeatedSint32 (0)); - Assert.assertEquals(206L , message.getRepeatedSint64 (0)); - Assert.assertEquals(207 , message.getRepeatedFixed32 (0)); - Assert.assertEquals(208L , message.getRepeatedFixed64 (0)); - Assert.assertEquals(209 , message.getRepeatedSfixed32(0)); - Assert.assertEquals(210L , message.getRepeatedSfixed64(0)); - Assert.assertEquals(211F , message.getRepeatedFloat (0)); - Assert.assertEquals(212D , message.getRepeatedDouble (0)); - Assert.assertEquals(true , message.getRepeatedBool (0)); - Assert.assertEquals("215", message.getRepeatedString (0)); + Assert.assertEquals(201, message.getRepeatedInt32(0)); + Assert.assertEquals(202L, message.getRepeatedInt64(0)); + Assert.assertEquals(203, message.getRepeatedUint32(0)); + Assert.assertEquals(204L, message.getRepeatedUint64(0)); + Assert.assertEquals(205, message.getRepeatedSint32(0)); + Assert.assertEquals(206L, message.getRepeatedSint64(0)); + Assert.assertEquals(207, message.getRepeatedFixed32(0)); + Assert.assertEquals(208L, message.getRepeatedFixed64(0)); + Assert.assertEquals(209, message.getRepeatedSfixed32(0)); + Assert.assertEquals(210L, message.getRepeatedSfixed64(0)); + Assert.assertEquals(211F, message.getRepeatedFloat(0)); + Assert.assertEquals(212D, message.getRepeatedDouble(0)); + Assert.assertEquals(true, message.getRepeatedBool(0)); + Assert.assertEquals("215", message.getRepeatedString(0)); Assert.assertEquals(toBytes("216"), message.getRepeatedBytes(0)); - Assert.assertEquals(217, message.getRepeatedGroup (0).getA()); - Assert.assertEquals(218, message.getRepeatedNestedMessage (0).getBb()); + Assert.assertEquals(217, message.getRepeatedGroup(0).getA()); + Assert.assertEquals(218, message.getRepeatedNestedMessage(0).getBb()); Assert.assertEquals(219, message.getRepeatedForeignMessage(0).getC()); - Assert.assertEquals(220, message.getRepeatedImportMessage (0).getD()); - Assert.assertEquals(227, message.getRepeatedLazyMessage (0).getBb()); + Assert.assertEquals(220, message.getRepeatedImportMessage(0).getD()); + Assert.assertEquals(227, message.getRepeatedLazyMessage(0).getBb()); - Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getRepeatedNestedEnum (0)); + Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getRepeatedNestedEnum(0)); Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getRepeatedForeignEnum(0)); Assert.assertEquals(ImportEnum.IMPORT_BAR, message.getRepeatedImportEnum(0)); @@ -948,29 +916,29 @@ public final class TestUtil { Assert.assertEquals("225", message.getRepeatedCord(0)); // Actually verify the second (modified) elements now. - Assert.assertEquals(501 , message.getRepeatedInt32 (1)); - Assert.assertEquals(502L , message.getRepeatedInt64 (1)); - Assert.assertEquals(503 , message.getRepeatedUint32 (1)); - Assert.assertEquals(504L , message.getRepeatedUint64 (1)); - Assert.assertEquals(505 , message.getRepeatedSint32 (1)); - Assert.assertEquals(506L , message.getRepeatedSint64 (1)); - Assert.assertEquals(507 , message.getRepeatedFixed32 (1)); - Assert.assertEquals(508L , message.getRepeatedFixed64 (1)); - Assert.assertEquals(509 , message.getRepeatedSfixed32(1)); - Assert.assertEquals(510L , message.getRepeatedSfixed64(1)); - Assert.assertEquals(511F , message.getRepeatedFloat (1)); - Assert.assertEquals(512D , message.getRepeatedDouble (1)); - Assert.assertEquals(true , message.getRepeatedBool (1)); - Assert.assertEquals("515", message.getRepeatedString (1)); + Assert.assertEquals(501, message.getRepeatedInt32(1)); + Assert.assertEquals(502L, message.getRepeatedInt64(1)); + Assert.assertEquals(503, message.getRepeatedUint32(1)); + Assert.assertEquals(504L, message.getRepeatedUint64(1)); + Assert.assertEquals(505, message.getRepeatedSint32(1)); + Assert.assertEquals(506L, message.getRepeatedSint64(1)); + Assert.assertEquals(507, message.getRepeatedFixed32(1)); + Assert.assertEquals(508L, message.getRepeatedFixed64(1)); + Assert.assertEquals(509, message.getRepeatedSfixed32(1)); + Assert.assertEquals(510L, message.getRepeatedSfixed64(1)); + Assert.assertEquals(511F, message.getRepeatedFloat(1)); + Assert.assertEquals(512D, message.getRepeatedDouble(1)); + Assert.assertEquals(true, message.getRepeatedBool(1)); + Assert.assertEquals("515", message.getRepeatedString(1)); Assert.assertEquals(toBytes("516"), message.getRepeatedBytes(1)); - Assert.assertEquals(517, message.getRepeatedGroup (1).getA()); - Assert.assertEquals(518, message.getRepeatedNestedMessage (1).getBb()); + Assert.assertEquals(517, message.getRepeatedGroup(1).getA()); + Assert.assertEquals(518, message.getRepeatedNestedMessage(1).getBb()); Assert.assertEquals(519, message.getRepeatedForeignMessage(1).getC()); - Assert.assertEquals(520, message.getRepeatedImportMessage (1).getD()); - Assert.assertEquals(527, message.getRepeatedLazyMessage (1).getBb()); + Assert.assertEquals(520, message.getRepeatedImportMessage(1).getD()); + Assert.assertEquals(527, message.getRepeatedLazyMessage(1).getBb()); - Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getRepeatedNestedEnum (1)); + Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getRepeatedNestedEnum(1)); Assert.assertEquals(ForeignEnum.FOREIGN_FOO, message.getRepeatedForeignEnum(1)); Assert.assertEquals(ImportEnum.IMPORT_FOO, message.getRepeatedImportEnum(1)); @@ -978,172 +946,170 @@ public final class TestUtil { Assert.assertEquals("525", message.getRepeatedCord(1)); } - /** - * Set every field of {@code message} to a unique value. - */ + /** Set every field of {@code message} to a unique value. */ public static void setPackedFields(TestPackedTypes.Builder message) { - message.addPackedInt32 (601); - message.addPackedInt64 (602); - message.addPackedUint32 (603); - message.addPackedUint64 (604); - message.addPackedSint32 (605); - message.addPackedSint64 (606); - message.addPackedFixed32 (607); - message.addPackedFixed64 (608); + message.addPackedInt32(601); + message.addPackedInt64(602); + message.addPackedUint32(603); + message.addPackedUint64(604); + message.addPackedSint32(605); + message.addPackedSint64(606); + message.addPackedFixed32(607); + message.addPackedFixed64(608); message.addPackedSfixed32(609); message.addPackedSfixed64(610); - message.addPackedFloat (611); - message.addPackedDouble (612); - message.addPackedBool (true); - message.addPackedEnum (ForeignEnum.FOREIGN_BAR); + message.addPackedFloat(611); + message.addPackedDouble(612); + message.addPackedBool(true); + message.addPackedEnum(ForeignEnum.FOREIGN_BAR); // Add a second one of each field. - message.addPackedInt32 (701); - message.addPackedInt64 (702); - message.addPackedUint32 (703); - message.addPackedUint64 (704); - message.addPackedSint32 (705); - message.addPackedSint64 (706); - message.addPackedFixed32 (707); - message.addPackedFixed64 (708); + message.addPackedInt32(701); + message.addPackedInt64(702); + message.addPackedUint32(703); + message.addPackedUint64(704); + message.addPackedSint32(705); + message.addPackedSint64(706); + message.addPackedFixed32(707); + message.addPackedFixed64(708); message.addPackedSfixed32(709); message.addPackedSfixed64(710); - message.addPackedFloat (711); - message.addPackedDouble (712); - message.addPackedBool (false); - message.addPackedEnum (ForeignEnum.FOREIGN_BAZ); + message.addPackedFloat(711); + message.addPackedDouble(712); + message.addPackedBool(false); + message.addPackedEnum(ForeignEnum.FOREIGN_BAZ); } /** - * Set every field of {@code message} to a unique value. Must correspond with - * the values applied by {@code setPackedFields}. + * Set every field of {@code message} to a unique value. Must correspond with the values applied + * by {@code setPackedFields}. */ public static void setUnpackedFields(TestUnpackedTypes.Builder message) { - message.addUnpackedInt32 (601); - message.addUnpackedInt64 (602); - message.addUnpackedUint32 (603); - message.addUnpackedUint64 (604); - message.addUnpackedSint32 (605); - message.addUnpackedSint64 (606); - message.addUnpackedFixed32 (607); - message.addUnpackedFixed64 (608); + message.addUnpackedInt32(601); + message.addUnpackedInt64(602); + message.addUnpackedUint32(603); + message.addUnpackedUint64(604); + message.addUnpackedSint32(605); + message.addUnpackedSint64(606); + message.addUnpackedFixed32(607); + message.addUnpackedFixed64(608); message.addUnpackedSfixed32(609); message.addUnpackedSfixed64(610); - message.addUnpackedFloat (611); - message.addUnpackedDouble (612); - message.addUnpackedBool (true); - message.addUnpackedEnum (ForeignEnum.FOREIGN_BAR); + message.addUnpackedFloat(611); + message.addUnpackedDouble(612); + message.addUnpackedBool(true); + message.addUnpackedEnum(ForeignEnum.FOREIGN_BAR); // Add a second one of each field. - message.addUnpackedInt32 (701); - message.addUnpackedInt64 (702); - message.addUnpackedUint32 (703); - message.addUnpackedUint64 (704); - message.addUnpackedSint32 (705); - message.addUnpackedSint64 (706); - message.addUnpackedFixed32 (707); - message.addUnpackedFixed64 (708); + message.addUnpackedInt32(701); + message.addUnpackedInt64(702); + message.addUnpackedUint32(703); + message.addUnpackedUint64(704); + message.addUnpackedSint32(705); + message.addUnpackedSint64(706); + message.addUnpackedFixed32(707); + message.addUnpackedFixed64(708); message.addUnpackedSfixed32(709); message.addUnpackedSfixed64(710); - message.addUnpackedFloat (711); - message.addUnpackedDouble (712); - message.addUnpackedBool (false); - message.addUnpackedEnum (ForeignEnum.FOREIGN_BAZ); + message.addUnpackedFloat(711); + message.addUnpackedDouble(712); + message.addUnpackedBool(false); + message.addUnpackedEnum(ForeignEnum.FOREIGN_BAZ); } /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are set to the values assigned by {@code setPackedFields}. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the + * values assigned by {@code setPackedFields}. */ public static void assertPackedFieldsSet(TestPackedTypes message) { - Assert.assertEquals(2, message.getPackedInt32Count ()); - Assert.assertEquals(2, message.getPackedInt64Count ()); - Assert.assertEquals(2, message.getPackedUint32Count ()); - Assert.assertEquals(2, message.getPackedUint64Count ()); - Assert.assertEquals(2, message.getPackedSint32Count ()); - Assert.assertEquals(2, message.getPackedSint64Count ()); - Assert.assertEquals(2, message.getPackedFixed32Count ()); - Assert.assertEquals(2, message.getPackedFixed64Count ()); + Assert.assertEquals(2, message.getPackedInt32Count()); + Assert.assertEquals(2, message.getPackedInt64Count()); + Assert.assertEquals(2, message.getPackedUint32Count()); + Assert.assertEquals(2, message.getPackedUint64Count()); + Assert.assertEquals(2, message.getPackedSint32Count()); + Assert.assertEquals(2, message.getPackedSint64Count()); + Assert.assertEquals(2, message.getPackedFixed32Count()); + Assert.assertEquals(2, message.getPackedFixed64Count()); Assert.assertEquals(2, message.getPackedSfixed32Count()); Assert.assertEquals(2, message.getPackedSfixed64Count()); - Assert.assertEquals(2, message.getPackedFloatCount ()); - Assert.assertEquals(2, message.getPackedDoubleCount ()); - Assert.assertEquals(2, message.getPackedBoolCount ()); - Assert.assertEquals(2, message.getPackedEnumCount ()); - Assert.assertEquals(601 , message.getPackedInt32 (0)); - Assert.assertEquals(602 , message.getPackedInt64 (0)); - Assert.assertEquals(603 , message.getPackedUint32 (0)); - Assert.assertEquals(604 , message.getPackedUint64 (0)); - Assert.assertEquals(605 , message.getPackedSint32 (0)); - Assert.assertEquals(606 , message.getPackedSint64 (0)); - Assert.assertEquals(607 , message.getPackedFixed32 (0)); - Assert.assertEquals(608 , message.getPackedFixed64 (0)); - Assert.assertEquals(609 , message.getPackedSfixed32(0)); - Assert.assertEquals(610 , message.getPackedSfixed64(0)); - Assert.assertEquals(611 , message.getPackedFloat (0), 0.0); - Assert.assertEquals(612 , message.getPackedDouble (0), 0.0); - Assert.assertEquals(true , message.getPackedBool (0)); + Assert.assertEquals(2, message.getPackedFloatCount()); + Assert.assertEquals(2, message.getPackedDoubleCount()); + Assert.assertEquals(2, message.getPackedBoolCount()); + Assert.assertEquals(2, message.getPackedEnumCount()); + Assert.assertEquals(601, message.getPackedInt32(0)); + Assert.assertEquals(602, message.getPackedInt64(0)); + Assert.assertEquals(603, message.getPackedUint32(0)); + Assert.assertEquals(604, message.getPackedUint64(0)); + Assert.assertEquals(605, message.getPackedSint32(0)); + Assert.assertEquals(606, message.getPackedSint64(0)); + Assert.assertEquals(607, message.getPackedFixed32(0)); + Assert.assertEquals(608, message.getPackedFixed64(0)); + Assert.assertEquals(609, message.getPackedSfixed32(0)); + Assert.assertEquals(610, message.getPackedSfixed64(0)); + Assert.assertEquals(611, message.getPackedFloat(0), 0.0); + Assert.assertEquals(612, message.getPackedDouble(0), 0.0); + Assert.assertEquals(true, message.getPackedBool(0)); Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getPackedEnum(0)); - Assert.assertEquals(701 , message.getPackedInt32 (1)); - Assert.assertEquals(702 , message.getPackedInt64 (1)); - Assert.assertEquals(703 , message.getPackedUint32 (1)); - Assert.assertEquals(704 , message.getPackedUint64 (1)); - Assert.assertEquals(705 , message.getPackedSint32 (1)); - Assert.assertEquals(706 , message.getPackedSint64 (1)); - Assert.assertEquals(707 , message.getPackedFixed32 (1)); - Assert.assertEquals(708 , message.getPackedFixed64 (1)); - Assert.assertEquals(709 , message.getPackedSfixed32(1)); - Assert.assertEquals(710 , message.getPackedSfixed64(1)); - Assert.assertEquals(711 , message.getPackedFloat (1), 0.0); - Assert.assertEquals(712 , message.getPackedDouble (1), 0.0); - Assert.assertEquals(false, message.getPackedBool (1)); + Assert.assertEquals(701, message.getPackedInt32(1)); + Assert.assertEquals(702, message.getPackedInt64(1)); + Assert.assertEquals(703, message.getPackedUint32(1)); + Assert.assertEquals(704, message.getPackedUint64(1)); + Assert.assertEquals(705, message.getPackedSint32(1)); + Assert.assertEquals(706, message.getPackedSint64(1)); + Assert.assertEquals(707, message.getPackedFixed32(1)); + Assert.assertEquals(708, message.getPackedFixed64(1)); + Assert.assertEquals(709, message.getPackedSfixed32(1)); + Assert.assertEquals(710, message.getPackedSfixed64(1)); + Assert.assertEquals(711, message.getPackedFloat(1), 0.0); + Assert.assertEquals(712, message.getPackedDouble(1), 0.0); + Assert.assertEquals(false, message.getPackedBool(1)); Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getPackedEnum(1)); } /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are set to the values assigned by {@code setUnpackedFields}. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the + * values assigned by {@code setUnpackedFields}. */ public static void assertUnpackedFieldsSet(TestUnpackedTypes message) { - Assert.assertEquals(2, message.getUnpackedInt32Count ()); - Assert.assertEquals(2, message.getUnpackedInt64Count ()); - Assert.assertEquals(2, message.getUnpackedUint32Count ()); - Assert.assertEquals(2, message.getUnpackedUint64Count ()); - Assert.assertEquals(2, message.getUnpackedSint32Count ()); - Assert.assertEquals(2, message.getUnpackedSint64Count ()); - Assert.assertEquals(2, message.getUnpackedFixed32Count ()); - Assert.assertEquals(2, message.getUnpackedFixed64Count ()); + Assert.assertEquals(2, message.getUnpackedInt32Count()); + Assert.assertEquals(2, message.getUnpackedInt64Count()); + Assert.assertEquals(2, message.getUnpackedUint32Count()); + Assert.assertEquals(2, message.getUnpackedUint64Count()); + Assert.assertEquals(2, message.getUnpackedSint32Count()); + Assert.assertEquals(2, message.getUnpackedSint64Count()); + Assert.assertEquals(2, message.getUnpackedFixed32Count()); + Assert.assertEquals(2, message.getUnpackedFixed64Count()); Assert.assertEquals(2, message.getUnpackedSfixed32Count()); Assert.assertEquals(2, message.getUnpackedSfixed64Count()); - Assert.assertEquals(2, message.getUnpackedFloatCount ()); - Assert.assertEquals(2, message.getUnpackedDoubleCount ()); - Assert.assertEquals(2, message.getUnpackedBoolCount ()); - Assert.assertEquals(2, message.getUnpackedEnumCount ()); - Assert.assertEquals(601 , message.getUnpackedInt32 (0)); - Assert.assertEquals(602 , message.getUnpackedInt64 (0)); - Assert.assertEquals(603 , message.getUnpackedUint32 (0)); - Assert.assertEquals(604 , message.getUnpackedUint64 (0)); - Assert.assertEquals(605 , message.getUnpackedSint32 (0)); - Assert.assertEquals(606 , message.getUnpackedSint64 (0)); - Assert.assertEquals(607 , message.getUnpackedFixed32 (0)); - Assert.assertEquals(608 , message.getUnpackedFixed64 (0)); - Assert.assertEquals(609 , message.getUnpackedSfixed32(0)); - Assert.assertEquals(610 , message.getUnpackedSfixed64(0)); - Assert.assertEquals(611 , message.getUnpackedFloat (0), 0.0); - Assert.assertEquals(612 , message.getUnpackedDouble (0), 0.0); - Assert.assertEquals(true , message.getUnpackedBool (0)); + Assert.assertEquals(2, message.getUnpackedFloatCount()); + Assert.assertEquals(2, message.getUnpackedDoubleCount()); + Assert.assertEquals(2, message.getUnpackedBoolCount()); + Assert.assertEquals(2, message.getUnpackedEnumCount()); + Assert.assertEquals(601, message.getUnpackedInt32(0)); + Assert.assertEquals(602, message.getUnpackedInt64(0)); + Assert.assertEquals(603, message.getUnpackedUint32(0)); + Assert.assertEquals(604, message.getUnpackedUint64(0)); + Assert.assertEquals(605, message.getUnpackedSint32(0)); + Assert.assertEquals(606, message.getUnpackedSint64(0)); + Assert.assertEquals(607, message.getUnpackedFixed32(0)); + Assert.assertEquals(608, message.getUnpackedFixed64(0)); + Assert.assertEquals(609, message.getUnpackedSfixed32(0)); + Assert.assertEquals(610, message.getUnpackedSfixed64(0)); + Assert.assertEquals(611, message.getUnpackedFloat(0), 0.0); + Assert.assertEquals(612, message.getUnpackedDouble(0), 0.0); + Assert.assertEquals(true, message.getUnpackedBool(0)); Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getUnpackedEnum(0)); - Assert.assertEquals(701 , message.getUnpackedInt32 (1)); - Assert.assertEquals(702 , message.getUnpackedInt64 (1)); - Assert.assertEquals(703 , message.getUnpackedUint32 (1)); - Assert.assertEquals(704 , message.getUnpackedUint64 (1)); - Assert.assertEquals(705 , message.getUnpackedSint32 (1)); - Assert.assertEquals(706 , message.getUnpackedSint64 (1)); - Assert.assertEquals(707 , message.getUnpackedFixed32 (1)); - Assert.assertEquals(708 , message.getUnpackedFixed64 (1)); - Assert.assertEquals(709 , message.getUnpackedSfixed32(1)); - Assert.assertEquals(710 , message.getUnpackedSfixed64(1)); - Assert.assertEquals(711 , message.getUnpackedFloat (1), 0.0); - Assert.assertEquals(712 , message.getUnpackedDouble (1), 0.0); - Assert.assertEquals(false, message.getUnpackedBool (1)); + Assert.assertEquals(701, message.getUnpackedInt32(1)); + Assert.assertEquals(702, message.getUnpackedInt64(1)); + Assert.assertEquals(703, message.getUnpackedUint32(1)); + Assert.assertEquals(704, message.getUnpackedUint64(1)); + Assert.assertEquals(705, message.getUnpackedSint32(1)); + Assert.assertEquals(706, message.getUnpackedSint64(1)); + Assert.assertEquals(707, message.getUnpackedFixed32(1)); + Assert.assertEquals(708, message.getUnpackedFixed64(1)); + Assert.assertEquals(709, message.getUnpackedSfixed32(1)); + Assert.assertEquals(710, message.getUnpackedSfixed64(1)); + Assert.assertEquals(711, message.getUnpackedFloat(1), 0.0); + Assert.assertEquals(712, message.getUnpackedDouble(1), 0.0); + Assert.assertEquals(false, message.getUnpackedBool(1)); Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getUnpackedEnum(1)); } @@ -1156,99 +1122,119 @@ public final class TestUtil { private static void assertEqualsExactType(int a, int b) { Assert.assertEquals(a, b); } + private static void assertEqualsExactType(long a, long b) { Assert.assertEquals(a, b); } + private static void assertEqualsExactType(float a, float b) { Assert.assertEquals(a, b, 0.0); } + private static void assertEqualsExactType(double a, double b) { Assert.assertEquals(a, b, 0.0); } + private static void assertEqualsExactType(boolean a, boolean b) { Assert.assertEquals(a, b); } + private static void assertEqualsExactType(String a, String b) { Assert.assertEquals(a, b); } + private static void assertEqualsExactType(ByteString a, ByteString b) { Assert.assertEquals(a, b); } - private static void assertEqualsExactType(TestAllTypes.NestedEnum a, - TestAllTypes.NestedEnum b) { + + private static void assertEqualsExactType(TestAllTypes.NestedEnum a, TestAllTypes.NestedEnum b) { Assert.assertEquals(a, b); } + private static void assertEqualsExactType(ForeignEnum a, ForeignEnum b) { Assert.assertEquals(a, b); } + private static void assertEqualsExactType(ImportEnum a, ImportEnum b) { Assert.assertEquals(a, b); } - private static void assertEqualsExactType(TestAllTypesLite.NestedEnum a, - TestAllTypesLite.NestedEnum b) { + + private static void assertEqualsExactType( + TestAllTypesLite.NestedEnum a, TestAllTypesLite.NestedEnum b) { Assert.assertEquals(a, b); } - private static void assertEqualsExactType(ForeignEnumLite a, - ForeignEnumLite b) { + + private static void assertEqualsExactType(ForeignEnumLite a, ForeignEnumLite b) { Assert.assertEquals(a, b); } - private static void assertEqualsExactType(ImportEnumLite a, - ImportEnumLite b) { + + private static void assertEqualsExactType(ImportEnumLite a, ImportEnumLite b) { Assert.assertEquals(a, b); } /** - * Get an unmodifiable {@link ExtensionRegistry} containing all the - * extensions of {@code TestAllExtensions}. + * Get an unmodifiable {@link ExtensionRegistry} containing all the extensions of {@code + * TestAllExtensions}. + */ + public static ExtensionRegistryLite getExtensionRegistry() { + ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance(); + registerAllExtensions(registry); + return registry.getUnmodifiable(); + } + + // BEGIN FULL-RUNTIME + /** + * Get an unmodifiable {@link ExtensionRegistry} containing all the extensions of {@code + * TestAllExtensions}. */ - public static ExtensionRegistry getExtensionRegistry() { + public static ExtensionRegistry getFullExtensionRegistry() { ExtensionRegistry registry = ExtensionRegistry.newInstance(); registerAllExtensions(registry); return registry.getUnmodifiable(); } + // END FULL-RUNTIME /** - * Register all of {@code TestAllExtensions}'s extensions with the - * given {@link ExtensionRegistry}. + * Register all of {@code TestAllExtensions}'s extensions with the given {@link + * ExtensionRegistry}. */ - public static void registerAllExtensions(ExtensionRegistry registry) { + public static void registerAllExtensions(ExtensionRegistryLite registry) { UnittestProto.registerAllExtensions(registry); TestUtilLite.registerAllExtensionsLite(registry); } /** - * Set every field of {@code message} to the values expected by - * {@code assertAllExtensionsSet()}. + * Set every field of {@code message} to the values expected by {@code assertAllExtensionsSet()}. */ public static void setAllExtensions(TestAllExtensions.Builder message) { - message.setExtension(optionalInt32Extension , 101); - message.setExtension(optionalInt64Extension , 102L); - message.setExtension(optionalUint32Extension , 103); - message.setExtension(optionalUint64Extension , 104L); - message.setExtension(optionalSint32Extension , 105); - message.setExtension(optionalSint64Extension , 106L); - message.setExtension(optionalFixed32Extension , 107); - message.setExtension(optionalFixed64Extension , 108L); + message.setExtension(optionalInt32Extension, 101); + message.setExtension(optionalInt64Extension, 102L); + message.setExtension(optionalUint32Extension, 103); + message.setExtension(optionalUint64Extension, 104L); + message.setExtension(optionalSint32Extension, 105); + message.setExtension(optionalSint64Extension, 106L); + message.setExtension(optionalFixed32Extension, 107); + message.setExtension(optionalFixed64Extension, 108L); message.setExtension(optionalSfixed32Extension, 109); message.setExtension(optionalSfixed64Extension, 110L); - message.setExtension(optionalFloatExtension , 111F); - message.setExtension(optionalDoubleExtension , 112D); - message.setExtension(optionalBoolExtension , true); - message.setExtension(optionalStringExtension , "115"); - message.setExtension(optionalBytesExtension , toBytes("116")); - - message.setExtension(optionalGroupExtension, - OptionalGroup_extension.newBuilder().setA(117).build()); - message.setExtension(optionalNestedMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(118).build()); - message.setExtension(optionalForeignMessageExtension, - ForeignMessage.newBuilder().setC(119).build()); - message.setExtension(optionalImportMessageExtension, - ImportMessage.newBuilder().setD(120).build()); - message.setExtension(optionalPublicImportMessageExtension, - PublicImportMessage.newBuilder().setE(126).build()); - message.setExtension(optionalLazyMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(127).build()); + message.setExtension(optionalFloatExtension, 111F); + message.setExtension(optionalDoubleExtension, 112D); + message.setExtension(optionalBoolExtension, true); + message.setExtension(optionalStringExtension, "115"); + message.setExtension(optionalBytesExtension, toBytes("116")); + + message.setExtension( + optionalGroupExtension, OptionalGroup_extension.newBuilder().setA(117).build()); + message.setExtension( + optionalNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(118).build()); + message.setExtension( + optionalForeignMessageExtension, ForeignMessage.newBuilder().setC(119).build()); + message.setExtension( + optionalImportMessageExtension, ImportMessage.newBuilder().setD(120).build()); + message.setExtension( + optionalPublicImportMessageExtension, PublicImportMessage.newBuilder().setE(126).build()); + message.setExtension( + optionalLazyMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(127).build()); message.setExtension(optionalNestedEnumExtension, TestAllTypes.NestedEnum.BAZ); message.setExtension(optionalForeignEnumExtension, ForeignEnum.FOREIGN_BAZ); @@ -1259,32 +1245,32 @@ public final class TestUtil { // ----------------------------------------------------------------- - message.addExtension(repeatedInt32Extension , 201); - message.addExtension(repeatedInt64Extension , 202L); - message.addExtension(repeatedUint32Extension , 203); - message.addExtension(repeatedUint64Extension , 204L); - message.addExtension(repeatedSint32Extension , 205); - message.addExtension(repeatedSint64Extension , 206L); - message.addExtension(repeatedFixed32Extension , 207); - message.addExtension(repeatedFixed64Extension , 208L); + message.addExtension(repeatedInt32Extension, 201); + message.addExtension(repeatedInt64Extension, 202L); + message.addExtension(repeatedUint32Extension, 203); + message.addExtension(repeatedUint64Extension, 204L); + message.addExtension(repeatedSint32Extension, 205); + message.addExtension(repeatedSint64Extension, 206L); + message.addExtension(repeatedFixed32Extension, 207); + message.addExtension(repeatedFixed64Extension, 208L); message.addExtension(repeatedSfixed32Extension, 209); message.addExtension(repeatedSfixed64Extension, 210L); - message.addExtension(repeatedFloatExtension , 211F); - message.addExtension(repeatedDoubleExtension , 212D); - message.addExtension(repeatedBoolExtension , true); - message.addExtension(repeatedStringExtension , "215"); - message.addExtension(repeatedBytesExtension , toBytes("216")); - - message.addExtension(repeatedGroupExtension, - RepeatedGroup_extension.newBuilder().setA(217).build()); - message.addExtension(repeatedNestedMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); - message.addExtension(repeatedForeignMessageExtension, - ForeignMessage.newBuilder().setC(219).build()); - message.addExtension(repeatedImportMessageExtension, - ImportMessage.newBuilder().setD(220).build()); - message.addExtension(repeatedLazyMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(227).build()); + message.addExtension(repeatedFloatExtension, 211F); + message.addExtension(repeatedDoubleExtension, 212D); + message.addExtension(repeatedBoolExtension, true); + message.addExtension(repeatedStringExtension, "215"); + message.addExtension(repeatedBytesExtension, toBytes("216")); + + message.addExtension( + repeatedGroupExtension, RepeatedGroup_extension.newBuilder().setA(217).build()); + message.addExtension( + repeatedNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); + message.addExtension( + repeatedForeignMessageExtension, ForeignMessage.newBuilder().setC(219).build()); + message.addExtension( + repeatedImportMessageExtension, ImportMessage.newBuilder().setD(220).build()); + message.addExtension( + repeatedLazyMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(227).build()); message.addExtension(repeatedNestedEnumExtension, TestAllTypes.NestedEnum.BAR); message.addExtension(repeatedForeignEnumExtension, ForeignEnum.FOREIGN_BAR); @@ -1294,32 +1280,32 @@ public final class TestUtil { message.addExtension(repeatedCordExtension, "225"); // Add a second one of each field. - message.addExtension(repeatedInt32Extension , 301); - message.addExtension(repeatedInt64Extension , 302L); - message.addExtension(repeatedUint32Extension , 303); - message.addExtension(repeatedUint64Extension , 304L); - message.addExtension(repeatedSint32Extension , 305); - message.addExtension(repeatedSint64Extension , 306L); - message.addExtension(repeatedFixed32Extension , 307); - message.addExtension(repeatedFixed64Extension , 308L); + message.addExtension(repeatedInt32Extension, 301); + message.addExtension(repeatedInt64Extension, 302L); + message.addExtension(repeatedUint32Extension, 303); + message.addExtension(repeatedUint64Extension, 304L); + message.addExtension(repeatedSint32Extension, 305); + message.addExtension(repeatedSint64Extension, 306L); + message.addExtension(repeatedFixed32Extension, 307); + message.addExtension(repeatedFixed64Extension, 308L); message.addExtension(repeatedSfixed32Extension, 309); message.addExtension(repeatedSfixed64Extension, 310L); - message.addExtension(repeatedFloatExtension , 311F); - message.addExtension(repeatedDoubleExtension , 312D); - message.addExtension(repeatedBoolExtension , false); - message.addExtension(repeatedStringExtension , "315"); - message.addExtension(repeatedBytesExtension , toBytes("316")); - - message.addExtension(repeatedGroupExtension, - RepeatedGroup_extension.newBuilder().setA(317).build()); - message.addExtension(repeatedNestedMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(318).build()); - message.addExtension(repeatedForeignMessageExtension, - ForeignMessage.newBuilder().setC(319).build()); - message.addExtension(repeatedImportMessageExtension, - ImportMessage.newBuilder().setD(320).build()); - message.addExtension(repeatedLazyMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(327).build()); + message.addExtension(repeatedFloatExtension, 311F); + message.addExtension(repeatedDoubleExtension, 312D); + message.addExtension(repeatedBoolExtension, false); + message.addExtension(repeatedStringExtension, "315"); + message.addExtension(repeatedBytesExtension, toBytes("316")); + + message.addExtension( + repeatedGroupExtension, RepeatedGroup_extension.newBuilder().setA(317).build()); + message.addExtension( + repeatedNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(318).build()); + message.addExtension( + repeatedForeignMessageExtension, ForeignMessage.newBuilder().setC(319).build()); + message.addExtension( + repeatedImportMessageExtension, ImportMessage.newBuilder().setD(320).build()); + message.addExtension( + repeatedLazyMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(327).build()); message.addExtension(repeatedNestedEnumExtension, TestAllTypes.NestedEnum.BAZ); message.addExtension(repeatedForeignEnumExtension, ForeignEnum.FOREIGN_BAZ); @@ -1330,21 +1316,21 @@ public final class TestUtil { // ----------------------------------------------------------------- - message.setExtension(defaultInt32Extension , 401); - message.setExtension(defaultInt64Extension , 402L); - message.setExtension(defaultUint32Extension , 403); - message.setExtension(defaultUint64Extension , 404L); - message.setExtension(defaultSint32Extension , 405); - message.setExtension(defaultSint64Extension , 406L); - message.setExtension(defaultFixed32Extension , 407); - message.setExtension(defaultFixed64Extension , 408L); + message.setExtension(defaultInt32Extension, 401); + message.setExtension(defaultInt64Extension, 402L); + message.setExtension(defaultUint32Extension, 403); + message.setExtension(defaultUint64Extension, 404L); + message.setExtension(defaultSint32Extension, 405); + message.setExtension(defaultSint64Extension, 406L); + message.setExtension(defaultFixed32Extension, 407); + message.setExtension(defaultFixed64Extension, 408L); message.setExtension(defaultSfixed32Extension, 409); message.setExtension(defaultSfixed64Extension, 410L); - message.setExtension(defaultFloatExtension , 411F); - message.setExtension(defaultDoubleExtension , 412D); - message.setExtension(defaultBoolExtension , false); - message.setExtension(defaultStringExtension , "415"); - message.setExtension(defaultBytesExtension , toBytes("416")); + message.setExtension(defaultFloatExtension, 411F); + message.setExtension(defaultDoubleExtension, 412D); + message.setExtension(defaultBoolExtension, false); + message.setExtension(defaultStringExtension, "415"); + message.setExtension(defaultBytesExtension, toBytes("416")); message.setExtension(defaultNestedEnumExtension, TestAllTypes.NestedEnum.FOO); message.setExtension(defaultForeignEnumExtension, ForeignEnum.FOREIGN_FOO); @@ -1354,8 +1340,8 @@ public final class TestUtil { message.setExtension(defaultCordExtension, "425"); message.setExtension(oneofUint32Extension, 601); - message.setExtension(oneofNestedMessageExtension, - TestAllTypes.NestedMessage.newBuilder().setBb(602).build()); + message.setExtension( + oneofNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(602).build()); message.setExtension(oneofStringExtension, "603"); message.setExtension(oneofBytesExtension, toBytes("604")); } @@ -1363,41 +1349,44 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Modify the repeated extensions of {@code message} to contain the values - * expected by {@code assertRepeatedExtensionsModified()}. + * Modify the repeated extensions of {@code message} to contain the values expected by {@code + * assertRepeatedExtensionsModified()}. */ - public static void modifyRepeatedExtensions( - TestAllExtensions.Builder message) { - message.setExtension(repeatedInt32Extension , 1, 501); - message.setExtension(repeatedInt64Extension , 1, 502L); - message.setExtension(repeatedUint32Extension , 1, 503); - message.setExtension(repeatedUint64Extension , 1, 504L); - message.setExtension(repeatedSint32Extension , 1, 505); - message.setExtension(repeatedSint64Extension , 1, 506L); - message.setExtension(repeatedFixed32Extension , 1, 507); - message.setExtension(repeatedFixed64Extension , 1, 508L); + public static void modifyRepeatedExtensions(TestAllExtensions.Builder message) { + message.setExtension(repeatedInt32Extension, 1, 501); + message.setExtension(repeatedInt64Extension, 1, 502L); + message.setExtension(repeatedUint32Extension, 1, 503); + message.setExtension(repeatedUint64Extension, 1, 504L); + message.setExtension(repeatedSint32Extension, 1, 505); + message.setExtension(repeatedSint64Extension, 1, 506L); + message.setExtension(repeatedFixed32Extension, 1, 507); + message.setExtension(repeatedFixed64Extension, 1, 508L); message.setExtension(repeatedSfixed32Extension, 1, 509); message.setExtension(repeatedSfixed64Extension, 1, 510L); - message.setExtension(repeatedFloatExtension , 1, 511F); - message.setExtension(repeatedDoubleExtension , 1, 512D); - message.setExtension(repeatedBoolExtension , 1, true); - message.setExtension(repeatedStringExtension , 1, "515"); - message.setExtension(repeatedBytesExtension , 1, toBytes("516")); - - message.setExtension(repeatedGroupExtension, 1, - RepeatedGroup_extension.newBuilder().setA(517).build()); - message.setExtension(repeatedNestedMessageExtension, 1, - TestAllTypes.NestedMessage.newBuilder().setBb(518).build()); - message.setExtension(repeatedForeignMessageExtension, 1, - ForeignMessage.newBuilder().setC(519).build()); - message.setExtension(repeatedImportMessageExtension, 1, - ImportMessage.newBuilder().setD(520).build()); - message.setExtension(repeatedLazyMessageExtension, 1, - TestAllTypes.NestedMessage.newBuilder().setBb(527).build()); - - message.setExtension(repeatedNestedEnumExtension , 1, TestAllTypes.NestedEnum.FOO); + message.setExtension(repeatedFloatExtension, 1, 511F); + message.setExtension(repeatedDoubleExtension, 1, 512D); + message.setExtension(repeatedBoolExtension, 1, true); + message.setExtension(repeatedStringExtension, 1, "515"); + message.setExtension(repeatedBytesExtension, 1, toBytes("516")); + + message.setExtension( + repeatedGroupExtension, 1, RepeatedGroup_extension.newBuilder().setA(517).build()); + message.setExtension( + repeatedNestedMessageExtension, + 1, + TestAllTypes.NestedMessage.newBuilder().setBb(518).build()); + message.setExtension( + repeatedForeignMessageExtension, 1, ForeignMessage.newBuilder().setC(519).build()); + message.setExtension( + repeatedImportMessageExtension, 1, ImportMessage.newBuilder().setD(520).build()); + message.setExtension( + repeatedLazyMessageExtension, + 1, + TestAllTypes.NestedMessage.newBuilder().setBb(527).build()); + + message.setExtension(repeatedNestedEnumExtension, 1, TestAllTypes.NestedEnum.FOO); message.setExtension(repeatedForeignEnumExtension, 1, ForeignEnum.FOREIGN_FOO); - message.setExtension(repeatedImportEnumExtension , 1, ImportEnum.IMPORT_FOO); + message.setExtension(repeatedImportEnumExtension, 1, ImportEnum.IMPORT_FOO); message.setExtension(repeatedStringPieceExtension, 1, "524"); message.setExtension(repeatedCordExtension, 1, "525"); @@ -1406,218 +1395,215 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all extensions of - * {@code message} are set to the values assigned by {@code setAllExtensions}. + * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to + * the values assigned by {@code setAllExtensions}. */ - public static void assertAllExtensionsSet( - TestAllExtensionsOrBuilder message) { - Assert.assertTrue(message.hasExtension(optionalInt32Extension )); - Assert.assertTrue(message.hasExtension(optionalInt64Extension )); - Assert.assertTrue(message.hasExtension(optionalUint32Extension )); - Assert.assertTrue(message.hasExtension(optionalUint64Extension )); - Assert.assertTrue(message.hasExtension(optionalSint32Extension )); - Assert.assertTrue(message.hasExtension(optionalSint64Extension )); - Assert.assertTrue(message.hasExtension(optionalFixed32Extension )); - Assert.assertTrue(message.hasExtension(optionalFixed64Extension )); + public static void assertAllExtensionsSet(TestAllExtensionsOrBuilder message) { + Assert.assertTrue(message.hasExtension(optionalInt32Extension)); + Assert.assertTrue(message.hasExtension(optionalInt64Extension)); + Assert.assertTrue(message.hasExtension(optionalUint32Extension)); + Assert.assertTrue(message.hasExtension(optionalUint64Extension)); + Assert.assertTrue(message.hasExtension(optionalSint32Extension)); + Assert.assertTrue(message.hasExtension(optionalSint64Extension)); + Assert.assertTrue(message.hasExtension(optionalFixed32Extension)); + Assert.assertTrue(message.hasExtension(optionalFixed64Extension)); Assert.assertTrue(message.hasExtension(optionalSfixed32Extension)); Assert.assertTrue(message.hasExtension(optionalSfixed64Extension)); - Assert.assertTrue(message.hasExtension(optionalFloatExtension )); - Assert.assertTrue(message.hasExtension(optionalDoubleExtension )); - Assert.assertTrue(message.hasExtension(optionalBoolExtension )); - Assert.assertTrue(message.hasExtension(optionalStringExtension )); - Assert.assertTrue(message.hasExtension(optionalBytesExtension )); - - Assert.assertTrue(message.hasExtension(optionalGroupExtension )); - Assert.assertTrue(message.hasExtension(optionalNestedMessageExtension )); + Assert.assertTrue(message.hasExtension(optionalFloatExtension)); + Assert.assertTrue(message.hasExtension(optionalDoubleExtension)); + Assert.assertTrue(message.hasExtension(optionalBoolExtension)); + Assert.assertTrue(message.hasExtension(optionalStringExtension)); + Assert.assertTrue(message.hasExtension(optionalBytesExtension)); + + Assert.assertTrue(message.hasExtension(optionalGroupExtension)); + Assert.assertTrue(message.hasExtension(optionalNestedMessageExtension)); Assert.assertTrue(message.hasExtension(optionalForeignMessageExtension)); - Assert.assertTrue(message.hasExtension(optionalImportMessageExtension )); + Assert.assertTrue(message.hasExtension(optionalImportMessageExtension)); - Assert.assertTrue(message.getExtension(optionalGroupExtension ).hasA()); - Assert.assertTrue(message.getExtension(optionalNestedMessageExtension ).hasBb()); + Assert.assertTrue(message.getExtension(optionalGroupExtension).hasA()); + Assert.assertTrue(message.getExtension(optionalNestedMessageExtension).hasBb()); Assert.assertTrue(message.getExtension(optionalForeignMessageExtension).hasC()); - Assert.assertTrue(message.getExtension(optionalImportMessageExtension ).hasD()); + Assert.assertTrue(message.getExtension(optionalImportMessageExtension).hasD()); - Assert.assertTrue(message.hasExtension(optionalNestedEnumExtension )); + Assert.assertTrue(message.hasExtension(optionalNestedEnumExtension)); Assert.assertTrue(message.hasExtension(optionalForeignEnumExtension)); - Assert.assertTrue(message.hasExtension(optionalImportEnumExtension )); + Assert.assertTrue(message.hasExtension(optionalImportEnumExtension)); Assert.assertTrue(message.hasExtension(optionalStringPieceExtension)); Assert.assertTrue(message.hasExtension(optionalCordExtension)); - assertEqualsExactType(101 , message.getExtension(optionalInt32Extension )); - assertEqualsExactType(102L , message.getExtension(optionalInt64Extension )); - assertEqualsExactType(103 , message.getExtension(optionalUint32Extension )); - assertEqualsExactType(104L , message.getExtension(optionalUint64Extension )); - assertEqualsExactType(105 , message.getExtension(optionalSint32Extension )); - assertEqualsExactType(106L , message.getExtension(optionalSint64Extension )); - assertEqualsExactType(107 , message.getExtension(optionalFixed32Extension )); - assertEqualsExactType(108L , message.getExtension(optionalFixed64Extension )); - assertEqualsExactType(109 , message.getExtension(optionalSfixed32Extension)); - assertEqualsExactType(110L , message.getExtension(optionalSfixed64Extension)); - assertEqualsExactType(111F , message.getExtension(optionalFloatExtension )); - assertEqualsExactType(112D , message.getExtension(optionalDoubleExtension )); - assertEqualsExactType(true , message.getExtension(optionalBoolExtension )); - assertEqualsExactType("115", message.getExtension(optionalStringExtension )); + assertEqualsExactType(101, message.getExtension(optionalInt32Extension)); + assertEqualsExactType(102L, message.getExtension(optionalInt64Extension)); + assertEqualsExactType(103, message.getExtension(optionalUint32Extension)); + assertEqualsExactType(104L, message.getExtension(optionalUint64Extension)); + assertEqualsExactType(105, message.getExtension(optionalSint32Extension)); + assertEqualsExactType(106L, message.getExtension(optionalSint64Extension)); + assertEqualsExactType(107, message.getExtension(optionalFixed32Extension)); + assertEqualsExactType(108L, message.getExtension(optionalFixed64Extension)); + assertEqualsExactType(109, message.getExtension(optionalSfixed32Extension)); + assertEqualsExactType(110L, message.getExtension(optionalSfixed64Extension)); + assertEqualsExactType(111F, message.getExtension(optionalFloatExtension)); + assertEqualsExactType(112D, message.getExtension(optionalDoubleExtension)); + assertEqualsExactType(true, message.getExtension(optionalBoolExtension)); + assertEqualsExactType("115", message.getExtension(optionalStringExtension)); assertEqualsExactType(toBytes("116"), message.getExtension(optionalBytesExtension)); - assertEqualsExactType(117, message.getExtension(optionalGroupExtension ).getA()); - assertEqualsExactType(118, message.getExtension(optionalNestedMessageExtension ).getBb()); - assertEqualsExactType(119, message.getExtension(optionalForeignMessageExtension ).getC()); - assertEqualsExactType(120, message.getExtension(optionalImportMessageExtension ).getD()); + assertEqualsExactType(117, message.getExtension(optionalGroupExtension).getA()); + assertEqualsExactType(118, message.getExtension(optionalNestedMessageExtension).getBb()); + assertEqualsExactType(119, message.getExtension(optionalForeignMessageExtension).getC()); + assertEqualsExactType(120, message.getExtension(optionalImportMessageExtension).getD()); assertEqualsExactType(126, message.getExtension(optionalPublicImportMessageExtension).getE()); - assertEqualsExactType(127, message.getExtension(optionalLazyMessageExtension ).getBb()); + assertEqualsExactType(127, message.getExtension(optionalLazyMessageExtension).getBb()); - assertEqualsExactType(TestAllTypes.NestedEnum.BAZ, - message.getExtension(optionalNestedEnumExtension)); - assertEqualsExactType(ForeignEnum.FOREIGN_BAZ, - message.getExtension(optionalForeignEnumExtension)); - assertEqualsExactType(ImportEnum.IMPORT_BAZ, - message.getExtension(optionalImportEnumExtension)); + assertEqualsExactType( + TestAllTypes.NestedEnum.BAZ, message.getExtension(optionalNestedEnumExtension)); + assertEqualsExactType( + ForeignEnum.FOREIGN_BAZ, message.getExtension(optionalForeignEnumExtension)); + assertEqualsExactType(ImportEnum.IMPORT_BAZ, message.getExtension(optionalImportEnumExtension)); assertEqualsExactType("124", message.getExtension(optionalStringPieceExtension)); assertEqualsExactType("125", message.getExtension(optionalCordExtension)); // ----------------------------------------------------------------- - Assert.assertEquals(2, message.getExtensionCount(repeatedInt32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedInt64Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint64Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint64Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64Extension )); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt64Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint64Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint64Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64Extension)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32Extension)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64Extension)); - Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtension )); - - Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtension )); + Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtension)); + + Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtension)); Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtension)); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtension )); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtension)); Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtension)); Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtension)); - assertEqualsExactType(201 , message.getExtension(repeatedInt32Extension , 0)); - assertEqualsExactType(202L , message.getExtension(repeatedInt64Extension , 0)); - assertEqualsExactType(203 , message.getExtension(repeatedUint32Extension , 0)); - assertEqualsExactType(204L , message.getExtension(repeatedUint64Extension , 0)); - assertEqualsExactType(205 , message.getExtension(repeatedSint32Extension , 0)); - assertEqualsExactType(206L , message.getExtension(repeatedSint64Extension , 0)); - assertEqualsExactType(207 , message.getExtension(repeatedFixed32Extension , 0)); - assertEqualsExactType(208L , message.getExtension(repeatedFixed64Extension , 0)); - assertEqualsExactType(209 , message.getExtension(repeatedSfixed32Extension, 0)); - assertEqualsExactType(210L , message.getExtension(repeatedSfixed64Extension, 0)); - assertEqualsExactType(211F , message.getExtension(repeatedFloatExtension , 0)); - assertEqualsExactType(212D , message.getExtension(repeatedDoubleExtension , 0)); - assertEqualsExactType(true , message.getExtension(repeatedBoolExtension , 0)); - assertEqualsExactType("215", message.getExtension(repeatedStringExtension , 0)); + assertEqualsExactType(201, message.getExtension(repeatedInt32Extension, 0)); + assertEqualsExactType(202L, message.getExtension(repeatedInt64Extension, 0)); + assertEqualsExactType(203, message.getExtension(repeatedUint32Extension, 0)); + assertEqualsExactType(204L, message.getExtension(repeatedUint64Extension, 0)); + assertEqualsExactType(205, message.getExtension(repeatedSint32Extension, 0)); + assertEqualsExactType(206L, message.getExtension(repeatedSint64Extension, 0)); + assertEqualsExactType(207, message.getExtension(repeatedFixed32Extension, 0)); + assertEqualsExactType(208L, message.getExtension(repeatedFixed64Extension, 0)); + assertEqualsExactType(209, message.getExtension(repeatedSfixed32Extension, 0)); + assertEqualsExactType(210L, message.getExtension(repeatedSfixed64Extension, 0)); + assertEqualsExactType(211F, message.getExtension(repeatedFloatExtension, 0)); + assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtension, 0)); + assertEqualsExactType(true, message.getExtension(repeatedBoolExtension, 0)); + assertEqualsExactType("215", message.getExtension(repeatedStringExtension, 0)); assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtension, 0)); - assertEqualsExactType(217, message.getExtension(repeatedGroupExtension , 0).getA()); - assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtension , 0).getBb()); + assertEqualsExactType(217, message.getExtension(repeatedGroupExtension, 0).getA()); + assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtension, 0).getBb()); assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtension, 0).getC()); - assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtension , 0).getD()); - assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtension , 0).getBb()); + assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtension, 0).getD()); + assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtension, 0).getBb()); - assertEqualsExactType(TestAllTypes.NestedEnum.BAR, - message.getExtension(repeatedNestedEnumExtension, 0)); - assertEqualsExactType(ForeignEnum.FOREIGN_BAR, - message.getExtension(repeatedForeignEnumExtension, 0)); - assertEqualsExactType(ImportEnum.IMPORT_BAR, - message.getExtension(repeatedImportEnumExtension, 0)); + assertEqualsExactType( + TestAllTypes.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtension, 0)); + assertEqualsExactType( + ForeignEnum.FOREIGN_BAR, message.getExtension(repeatedForeignEnumExtension, 0)); + assertEqualsExactType( + ImportEnum.IMPORT_BAR, message.getExtension(repeatedImportEnumExtension, 0)); assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtension, 0)); assertEqualsExactType("225", message.getExtension(repeatedCordExtension, 0)); - assertEqualsExactType(301 , message.getExtension(repeatedInt32Extension , 1)); - assertEqualsExactType(302L , message.getExtension(repeatedInt64Extension , 1)); - assertEqualsExactType(303 , message.getExtension(repeatedUint32Extension , 1)); - assertEqualsExactType(304L , message.getExtension(repeatedUint64Extension , 1)); - assertEqualsExactType(305 , message.getExtension(repeatedSint32Extension , 1)); - assertEqualsExactType(306L , message.getExtension(repeatedSint64Extension , 1)); - assertEqualsExactType(307 , message.getExtension(repeatedFixed32Extension , 1)); - assertEqualsExactType(308L , message.getExtension(repeatedFixed64Extension , 1)); - assertEqualsExactType(309 , message.getExtension(repeatedSfixed32Extension, 1)); - assertEqualsExactType(310L , message.getExtension(repeatedSfixed64Extension, 1)); - assertEqualsExactType(311F , message.getExtension(repeatedFloatExtension , 1)); - assertEqualsExactType(312D , message.getExtension(repeatedDoubleExtension , 1)); - assertEqualsExactType(false, message.getExtension(repeatedBoolExtension , 1)); - assertEqualsExactType("315", message.getExtension(repeatedStringExtension , 1)); + assertEqualsExactType(301, message.getExtension(repeatedInt32Extension, 1)); + assertEqualsExactType(302L, message.getExtension(repeatedInt64Extension, 1)); + assertEqualsExactType(303, message.getExtension(repeatedUint32Extension, 1)); + assertEqualsExactType(304L, message.getExtension(repeatedUint64Extension, 1)); + assertEqualsExactType(305, message.getExtension(repeatedSint32Extension, 1)); + assertEqualsExactType(306L, message.getExtension(repeatedSint64Extension, 1)); + assertEqualsExactType(307, message.getExtension(repeatedFixed32Extension, 1)); + assertEqualsExactType(308L, message.getExtension(repeatedFixed64Extension, 1)); + assertEqualsExactType(309, message.getExtension(repeatedSfixed32Extension, 1)); + assertEqualsExactType(310L, message.getExtension(repeatedSfixed64Extension, 1)); + assertEqualsExactType(311F, message.getExtension(repeatedFloatExtension, 1)); + assertEqualsExactType(312D, message.getExtension(repeatedDoubleExtension, 1)); + assertEqualsExactType(false, message.getExtension(repeatedBoolExtension, 1)); + assertEqualsExactType("315", message.getExtension(repeatedStringExtension, 1)); assertEqualsExactType(toBytes("316"), message.getExtension(repeatedBytesExtension, 1)); - assertEqualsExactType(317, message.getExtension(repeatedGroupExtension , 1).getA()); - assertEqualsExactType(318, message.getExtension(repeatedNestedMessageExtension , 1).getBb()); + assertEqualsExactType(317, message.getExtension(repeatedGroupExtension, 1).getA()); + assertEqualsExactType(318, message.getExtension(repeatedNestedMessageExtension, 1).getBb()); assertEqualsExactType(319, message.getExtension(repeatedForeignMessageExtension, 1).getC()); - assertEqualsExactType(320, message.getExtension(repeatedImportMessageExtension , 1).getD()); - assertEqualsExactType(327, message.getExtension(repeatedLazyMessageExtension , 1).getBb()); + assertEqualsExactType(320, message.getExtension(repeatedImportMessageExtension, 1).getD()); + assertEqualsExactType(327, message.getExtension(repeatedLazyMessageExtension, 1).getBb()); - assertEqualsExactType(TestAllTypes.NestedEnum.BAZ, - message.getExtension(repeatedNestedEnumExtension, 1)); - assertEqualsExactType(ForeignEnum.FOREIGN_BAZ, - message.getExtension(repeatedForeignEnumExtension, 1)); - assertEqualsExactType(ImportEnum.IMPORT_BAZ, - message.getExtension(repeatedImportEnumExtension, 1)); + assertEqualsExactType( + TestAllTypes.NestedEnum.BAZ, message.getExtension(repeatedNestedEnumExtension, 1)); + assertEqualsExactType( + ForeignEnum.FOREIGN_BAZ, message.getExtension(repeatedForeignEnumExtension, 1)); + assertEqualsExactType( + ImportEnum.IMPORT_BAZ, message.getExtension(repeatedImportEnumExtension, 1)); assertEqualsExactType("324", message.getExtension(repeatedStringPieceExtension, 1)); assertEqualsExactType("325", message.getExtension(repeatedCordExtension, 1)); // ----------------------------------------------------------------- - Assert.assertTrue(message.hasExtension(defaultInt32Extension )); - Assert.assertTrue(message.hasExtension(defaultInt64Extension )); - Assert.assertTrue(message.hasExtension(defaultUint32Extension )); - Assert.assertTrue(message.hasExtension(defaultUint64Extension )); - Assert.assertTrue(message.hasExtension(defaultSint32Extension )); - Assert.assertTrue(message.hasExtension(defaultSint64Extension )); - Assert.assertTrue(message.hasExtension(defaultFixed32Extension )); - Assert.assertTrue(message.hasExtension(defaultFixed64Extension )); + Assert.assertTrue(message.hasExtension(defaultInt32Extension)); + Assert.assertTrue(message.hasExtension(defaultInt64Extension)); + Assert.assertTrue(message.hasExtension(defaultUint32Extension)); + Assert.assertTrue(message.hasExtension(defaultUint64Extension)); + Assert.assertTrue(message.hasExtension(defaultSint32Extension)); + Assert.assertTrue(message.hasExtension(defaultSint64Extension)); + Assert.assertTrue(message.hasExtension(defaultFixed32Extension)); + Assert.assertTrue(message.hasExtension(defaultFixed64Extension)); Assert.assertTrue(message.hasExtension(defaultSfixed32Extension)); Assert.assertTrue(message.hasExtension(defaultSfixed64Extension)); - Assert.assertTrue(message.hasExtension(defaultFloatExtension )); - Assert.assertTrue(message.hasExtension(defaultDoubleExtension )); - Assert.assertTrue(message.hasExtension(defaultBoolExtension )); - Assert.assertTrue(message.hasExtension(defaultStringExtension )); - Assert.assertTrue(message.hasExtension(defaultBytesExtension )); + Assert.assertTrue(message.hasExtension(defaultFloatExtension)); + Assert.assertTrue(message.hasExtension(defaultDoubleExtension)); + Assert.assertTrue(message.hasExtension(defaultBoolExtension)); + Assert.assertTrue(message.hasExtension(defaultStringExtension)); + Assert.assertTrue(message.hasExtension(defaultBytesExtension)); - Assert.assertTrue(message.hasExtension(defaultNestedEnumExtension )); + Assert.assertTrue(message.hasExtension(defaultNestedEnumExtension)); Assert.assertTrue(message.hasExtension(defaultForeignEnumExtension)); - Assert.assertTrue(message.hasExtension(defaultImportEnumExtension )); + Assert.assertTrue(message.hasExtension(defaultImportEnumExtension)); Assert.assertTrue(message.hasExtension(defaultStringPieceExtension)); Assert.assertTrue(message.hasExtension(defaultCordExtension)); - assertEqualsExactType(401 , message.getExtension(defaultInt32Extension )); - assertEqualsExactType(402L , message.getExtension(defaultInt64Extension )); - assertEqualsExactType(403 , message.getExtension(defaultUint32Extension )); - assertEqualsExactType(404L , message.getExtension(defaultUint64Extension )); - assertEqualsExactType(405 , message.getExtension(defaultSint32Extension )); - assertEqualsExactType(406L , message.getExtension(defaultSint64Extension )); - assertEqualsExactType(407 , message.getExtension(defaultFixed32Extension )); - assertEqualsExactType(408L , message.getExtension(defaultFixed64Extension )); - assertEqualsExactType(409 , message.getExtension(defaultSfixed32Extension)); - assertEqualsExactType(410L , message.getExtension(defaultSfixed64Extension)); - assertEqualsExactType(411F , message.getExtension(defaultFloatExtension )); - assertEqualsExactType(412D , message.getExtension(defaultDoubleExtension )); - assertEqualsExactType(false, message.getExtension(defaultBoolExtension )); - assertEqualsExactType("415", message.getExtension(defaultStringExtension )); + assertEqualsExactType(401, message.getExtension(defaultInt32Extension)); + assertEqualsExactType(402L, message.getExtension(defaultInt64Extension)); + assertEqualsExactType(403, message.getExtension(defaultUint32Extension)); + assertEqualsExactType(404L, message.getExtension(defaultUint64Extension)); + assertEqualsExactType(405, message.getExtension(defaultSint32Extension)); + assertEqualsExactType(406L, message.getExtension(defaultSint64Extension)); + assertEqualsExactType(407, message.getExtension(defaultFixed32Extension)); + assertEqualsExactType(408L, message.getExtension(defaultFixed64Extension)); + assertEqualsExactType(409, message.getExtension(defaultSfixed32Extension)); + assertEqualsExactType(410L, message.getExtension(defaultSfixed64Extension)); + assertEqualsExactType(411F, message.getExtension(defaultFloatExtension)); + assertEqualsExactType(412D, message.getExtension(defaultDoubleExtension)); + assertEqualsExactType(false, message.getExtension(defaultBoolExtension)); + assertEqualsExactType("415", message.getExtension(defaultStringExtension)); assertEqualsExactType(toBytes("416"), message.getExtension(defaultBytesExtension)); - assertEqualsExactType(TestAllTypes.NestedEnum.FOO, - message.getExtension(defaultNestedEnumExtension )); - assertEqualsExactType(ForeignEnum.FOREIGN_FOO, - message.getExtension(defaultForeignEnumExtension)); - assertEqualsExactType(ImportEnum.IMPORT_FOO, - message.getExtension(defaultImportEnumExtension)); + assertEqualsExactType( + TestAllTypes.NestedEnum.FOO, message.getExtension(defaultNestedEnumExtension)); + assertEqualsExactType( + ForeignEnum.FOREIGN_FOO, message.getExtension(defaultForeignEnumExtension)); + assertEqualsExactType(ImportEnum.IMPORT_FOO, message.getExtension(defaultImportEnumExtension)); assertEqualsExactType("424", message.getExtension(defaultStringPieceExtension)); assertEqualsExactType("425", message.getExtension(defaultCordExtension)); @@ -1630,184 +1616,181 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all extensions of - * {@code message} are cleared, and that getting the extensions returns their - * default values. + * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are + * cleared, and that getting the extensions returns their default values. */ public static void assertExtensionsClear(TestAllExtensionsOrBuilder message) { // hasBlah() should initially be false for all optional fields. - Assert.assertFalse(message.hasExtension(optionalInt32Extension )); - Assert.assertFalse(message.hasExtension(optionalInt64Extension )); - Assert.assertFalse(message.hasExtension(optionalUint32Extension )); - Assert.assertFalse(message.hasExtension(optionalUint64Extension )); - Assert.assertFalse(message.hasExtension(optionalSint32Extension )); - Assert.assertFalse(message.hasExtension(optionalSint64Extension )); - Assert.assertFalse(message.hasExtension(optionalFixed32Extension )); - Assert.assertFalse(message.hasExtension(optionalFixed64Extension )); + Assert.assertFalse(message.hasExtension(optionalInt32Extension)); + Assert.assertFalse(message.hasExtension(optionalInt64Extension)); + Assert.assertFalse(message.hasExtension(optionalUint32Extension)); + Assert.assertFalse(message.hasExtension(optionalUint64Extension)); + Assert.assertFalse(message.hasExtension(optionalSint32Extension)); + Assert.assertFalse(message.hasExtension(optionalSint64Extension)); + Assert.assertFalse(message.hasExtension(optionalFixed32Extension)); + Assert.assertFalse(message.hasExtension(optionalFixed64Extension)); Assert.assertFalse(message.hasExtension(optionalSfixed32Extension)); Assert.assertFalse(message.hasExtension(optionalSfixed64Extension)); - Assert.assertFalse(message.hasExtension(optionalFloatExtension )); - Assert.assertFalse(message.hasExtension(optionalDoubleExtension )); - Assert.assertFalse(message.hasExtension(optionalBoolExtension )); - Assert.assertFalse(message.hasExtension(optionalStringExtension )); - Assert.assertFalse(message.hasExtension(optionalBytesExtension )); - - Assert.assertFalse(message.hasExtension(optionalGroupExtension )); - Assert.assertFalse(message.hasExtension(optionalNestedMessageExtension )); + Assert.assertFalse(message.hasExtension(optionalFloatExtension)); + Assert.assertFalse(message.hasExtension(optionalDoubleExtension)); + Assert.assertFalse(message.hasExtension(optionalBoolExtension)); + Assert.assertFalse(message.hasExtension(optionalStringExtension)); + Assert.assertFalse(message.hasExtension(optionalBytesExtension)); + + Assert.assertFalse(message.hasExtension(optionalGroupExtension)); + Assert.assertFalse(message.hasExtension(optionalNestedMessageExtension)); Assert.assertFalse(message.hasExtension(optionalForeignMessageExtension)); - Assert.assertFalse(message.hasExtension(optionalImportMessageExtension )); + Assert.assertFalse(message.hasExtension(optionalImportMessageExtension)); - Assert.assertFalse(message.hasExtension(optionalNestedEnumExtension )); + Assert.assertFalse(message.hasExtension(optionalNestedEnumExtension)); Assert.assertFalse(message.hasExtension(optionalForeignEnumExtension)); - Assert.assertFalse(message.hasExtension(optionalImportEnumExtension )); + Assert.assertFalse(message.hasExtension(optionalImportEnumExtension)); Assert.assertFalse(message.hasExtension(optionalStringPieceExtension)); Assert.assertFalse(message.hasExtension(optionalCordExtension)); // Optional fields without defaults are set to zero or something like it. - assertEqualsExactType(0 , message.getExtension(optionalInt32Extension )); - assertEqualsExactType(0L , message.getExtension(optionalInt64Extension )); - assertEqualsExactType(0 , message.getExtension(optionalUint32Extension )); - assertEqualsExactType(0L , message.getExtension(optionalUint64Extension )); - assertEqualsExactType(0 , message.getExtension(optionalSint32Extension )); - assertEqualsExactType(0L , message.getExtension(optionalSint64Extension )); - assertEqualsExactType(0 , message.getExtension(optionalFixed32Extension )); - assertEqualsExactType(0L , message.getExtension(optionalFixed64Extension )); - assertEqualsExactType(0 , message.getExtension(optionalSfixed32Extension)); - assertEqualsExactType(0L , message.getExtension(optionalSfixed64Extension)); - assertEqualsExactType(0F , message.getExtension(optionalFloatExtension )); - assertEqualsExactType(0D , message.getExtension(optionalDoubleExtension )); - assertEqualsExactType(false, message.getExtension(optionalBoolExtension )); - assertEqualsExactType("" , message.getExtension(optionalStringExtension )); + assertEqualsExactType(0, message.getExtension(optionalInt32Extension)); + assertEqualsExactType(0L, message.getExtension(optionalInt64Extension)); + assertEqualsExactType(0, message.getExtension(optionalUint32Extension)); + assertEqualsExactType(0L, message.getExtension(optionalUint64Extension)); + assertEqualsExactType(0, message.getExtension(optionalSint32Extension)); + assertEqualsExactType(0L, message.getExtension(optionalSint64Extension)); + assertEqualsExactType(0, message.getExtension(optionalFixed32Extension)); + assertEqualsExactType(0L, message.getExtension(optionalFixed64Extension)); + assertEqualsExactType(0, message.getExtension(optionalSfixed32Extension)); + assertEqualsExactType(0L, message.getExtension(optionalSfixed64Extension)); + assertEqualsExactType(0F, message.getExtension(optionalFloatExtension)); + assertEqualsExactType(0D, message.getExtension(optionalDoubleExtension)); + assertEqualsExactType(false, message.getExtension(optionalBoolExtension)); + assertEqualsExactType("", message.getExtension(optionalStringExtension)); assertEqualsExactType(ByteString.EMPTY, message.getExtension(optionalBytesExtension)); // Embedded messages should also be clear. - Assert.assertFalse(message.getExtension(optionalGroupExtension ).hasA()); - Assert.assertFalse(message.getExtension(optionalNestedMessageExtension ).hasBb()); + Assert.assertFalse(message.getExtension(optionalGroupExtension).hasA()); + Assert.assertFalse(message.getExtension(optionalNestedMessageExtension).hasBb()); Assert.assertFalse(message.getExtension(optionalForeignMessageExtension).hasC()); - Assert.assertFalse(message.getExtension(optionalImportMessageExtension ).hasD()); + Assert.assertFalse(message.getExtension(optionalImportMessageExtension).hasD()); - assertEqualsExactType(0, message.getExtension(optionalGroupExtension ).getA()); - assertEqualsExactType(0, message.getExtension(optionalNestedMessageExtension ).getBb()); + assertEqualsExactType(0, message.getExtension(optionalGroupExtension).getA()); + assertEqualsExactType(0, message.getExtension(optionalNestedMessageExtension).getBb()); assertEqualsExactType(0, message.getExtension(optionalForeignMessageExtension).getC()); - assertEqualsExactType(0, message.getExtension(optionalImportMessageExtension ).getD()); + assertEqualsExactType(0, message.getExtension(optionalImportMessageExtension).getD()); // Enums without defaults are set to the first value in the enum. - assertEqualsExactType(TestAllTypes.NestedEnum.FOO, - message.getExtension(optionalNestedEnumExtension )); - assertEqualsExactType(ForeignEnum.FOREIGN_FOO, - message.getExtension(optionalForeignEnumExtension)); - assertEqualsExactType(ImportEnum.IMPORT_FOO, - message.getExtension(optionalImportEnumExtension)); + assertEqualsExactType( + TestAllTypes.NestedEnum.FOO, message.getExtension(optionalNestedEnumExtension)); + assertEqualsExactType( + ForeignEnum.FOREIGN_FOO, message.getExtension(optionalForeignEnumExtension)); + assertEqualsExactType(ImportEnum.IMPORT_FOO, message.getExtension(optionalImportEnumExtension)); assertEqualsExactType("", message.getExtension(optionalStringPieceExtension)); assertEqualsExactType("", message.getExtension(optionalCordExtension)); // Repeated fields are empty. - Assert.assertEquals(0, message.getExtensionCount(repeatedInt32Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedInt64Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedUint32Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedUint64Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedSint32Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedSint64Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedFixed32Extension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedFixed64Extension )); + Assert.assertEquals(0, message.getExtensionCount(repeatedInt32Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedInt64Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedUint32Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedUint64Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedSint32Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedSint64Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedFixed32Extension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedFixed64Extension)); Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed32Extension)); Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed64Extension)); - Assert.assertEquals(0, message.getExtensionCount(repeatedFloatExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedDoubleExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedBoolExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedStringExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedBytesExtension )); - - Assert.assertEquals(0, message.getExtensionCount(repeatedGroupExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedNestedMessageExtension )); + Assert.assertEquals(0, message.getExtensionCount(repeatedFloatExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedDoubleExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedBoolExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedStringExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedBytesExtension)); + + Assert.assertEquals(0, message.getExtensionCount(repeatedGroupExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedNestedMessageExtension)); Assert.assertEquals(0, message.getExtensionCount(repeatedForeignMessageExtension)); - Assert.assertEquals(0, message.getExtensionCount(repeatedImportMessageExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedLazyMessageExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedNestedEnumExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedForeignEnumExtension )); - Assert.assertEquals(0, message.getExtensionCount(repeatedImportEnumExtension )); + Assert.assertEquals(0, message.getExtensionCount(repeatedImportMessageExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedLazyMessageExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedNestedEnumExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedForeignEnumExtension)); + Assert.assertEquals(0, message.getExtensionCount(repeatedImportEnumExtension)); Assert.assertEquals(0, message.getExtensionCount(repeatedStringPieceExtension)); Assert.assertEquals(0, message.getExtensionCount(repeatedCordExtension)); // Repeated fields are empty via getExtension().size(). - Assert.assertEquals(0, message.getExtension(repeatedInt32Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedInt64Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedUint32Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedUint64Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedSint32Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedSint64Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedFixed32Extension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedFixed64Extension ).size()); + Assert.assertEquals(0, message.getExtension(repeatedInt32Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedInt64Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedUint32Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedUint64Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedSint32Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedSint64Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedFixed32Extension).size()); + Assert.assertEquals(0, message.getExtension(repeatedFixed64Extension).size()); Assert.assertEquals(0, message.getExtension(repeatedSfixed32Extension).size()); Assert.assertEquals(0, message.getExtension(repeatedSfixed64Extension).size()); - Assert.assertEquals(0, message.getExtension(repeatedFloatExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedDoubleExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedBoolExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedStringExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedBytesExtension ).size()); - - Assert.assertEquals(0, message.getExtension(repeatedGroupExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedNestedMessageExtension ).size()); + Assert.assertEquals(0, message.getExtension(repeatedFloatExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedDoubleExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedBoolExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedStringExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedBytesExtension).size()); + + Assert.assertEquals(0, message.getExtension(repeatedGroupExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedNestedMessageExtension).size()); Assert.assertEquals(0, message.getExtension(repeatedForeignMessageExtension).size()); - Assert.assertEquals(0, message.getExtension(repeatedImportMessageExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedLazyMessageExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedNestedEnumExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedForeignEnumExtension ).size()); - Assert.assertEquals(0, message.getExtension(repeatedImportEnumExtension ).size()); + Assert.assertEquals(0, message.getExtension(repeatedImportMessageExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedLazyMessageExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedNestedEnumExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedForeignEnumExtension).size()); + Assert.assertEquals(0, message.getExtension(repeatedImportEnumExtension).size()); Assert.assertEquals(0, message.getExtension(repeatedStringPieceExtension).size()); Assert.assertEquals(0, message.getExtension(repeatedCordExtension).size()); // hasBlah() should also be false for all default fields. - Assert.assertFalse(message.hasExtension(defaultInt32Extension )); - Assert.assertFalse(message.hasExtension(defaultInt64Extension )); - Assert.assertFalse(message.hasExtension(defaultUint32Extension )); - Assert.assertFalse(message.hasExtension(defaultUint64Extension )); - Assert.assertFalse(message.hasExtension(defaultSint32Extension )); - Assert.assertFalse(message.hasExtension(defaultSint64Extension )); - Assert.assertFalse(message.hasExtension(defaultFixed32Extension )); - Assert.assertFalse(message.hasExtension(defaultFixed64Extension )); + Assert.assertFalse(message.hasExtension(defaultInt32Extension)); + Assert.assertFalse(message.hasExtension(defaultInt64Extension)); + Assert.assertFalse(message.hasExtension(defaultUint32Extension)); + Assert.assertFalse(message.hasExtension(defaultUint64Extension)); + Assert.assertFalse(message.hasExtension(defaultSint32Extension)); + Assert.assertFalse(message.hasExtension(defaultSint64Extension)); + Assert.assertFalse(message.hasExtension(defaultFixed32Extension)); + Assert.assertFalse(message.hasExtension(defaultFixed64Extension)); Assert.assertFalse(message.hasExtension(defaultSfixed32Extension)); Assert.assertFalse(message.hasExtension(defaultSfixed64Extension)); - Assert.assertFalse(message.hasExtension(defaultFloatExtension )); - Assert.assertFalse(message.hasExtension(defaultDoubleExtension )); - Assert.assertFalse(message.hasExtension(defaultBoolExtension )); - Assert.assertFalse(message.hasExtension(defaultStringExtension )); - Assert.assertFalse(message.hasExtension(defaultBytesExtension )); + Assert.assertFalse(message.hasExtension(defaultFloatExtension)); + Assert.assertFalse(message.hasExtension(defaultDoubleExtension)); + Assert.assertFalse(message.hasExtension(defaultBoolExtension)); + Assert.assertFalse(message.hasExtension(defaultStringExtension)); + Assert.assertFalse(message.hasExtension(defaultBytesExtension)); - Assert.assertFalse(message.hasExtension(defaultNestedEnumExtension )); + Assert.assertFalse(message.hasExtension(defaultNestedEnumExtension)); Assert.assertFalse(message.hasExtension(defaultForeignEnumExtension)); - Assert.assertFalse(message.hasExtension(defaultImportEnumExtension )); + Assert.assertFalse(message.hasExtension(defaultImportEnumExtension)); Assert.assertFalse(message.hasExtension(defaultStringPieceExtension)); Assert.assertFalse(message.hasExtension(defaultCordExtension)); // Fields with defaults have their default values (duh). - assertEqualsExactType( 41 , message.getExtension(defaultInt32Extension )); - assertEqualsExactType( 42L , message.getExtension(defaultInt64Extension )); - assertEqualsExactType( 43 , message.getExtension(defaultUint32Extension )); - assertEqualsExactType( 44L , message.getExtension(defaultUint64Extension )); - assertEqualsExactType(-45 , message.getExtension(defaultSint32Extension )); - assertEqualsExactType( 46L , message.getExtension(defaultSint64Extension )); - assertEqualsExactType( 47 , message.getExtension(defaultFixed32Extension )); - assertEqualsExactType( 48L , message.getExtension(defaultFixed64Extension )); - assertEqualsExactType( 49 , message.getExtension(defaultSfixed32Extension)); - assertEqualsExactType(-50L , message.getExtension(defaultSfixed64Extension)); - assertEqualsExactType( 51.5F , message.getExtension(defaultFloatExtension )); - assertEqualsExactType( 52e3D , message.getExtension(defaultDoubleExtension )); - assertEqualsExactType(true , message.getExtension(defaultBoolExtension )); - assertEqualsExactType("hello", message.getExtension(defaultStringExtension )); + assertEqualsExactType(41, message.getExtension(defaultInt32Extension)); + assertEqualsExactType(42L, message.getExtension(defaultInt64Extension)); + assertEqualsExactType(43, message.getExtension(defaultUint32Extension)); + assertEqualsExactType(44L, message.getExtension(defaultUint64Extension)); + assertEqualsExactType(-45, message.getExtension(defaultSint32Extension)); + assertEqualsExactType(46L, message.getExtension(defaultSint64Extension)); + assertEqualsExactType(47, message.getExtension(defaultFixed32Extension)); + assertEqualsExactType(48L, message.getExtension(defaultFixed64Extension)); + assertEqualsExactType(49, message.getExtension(defaultSfixed32Extension)); + assertEqualsExactType(-50L, message.getExtension(defaultSfixed64Extension)); + assertEqualsExactType(51.5F, message.getExtension(defaultFloatExtension)); + assertEqualsExactType(52e3D, message.getExtension(defaultDoubleExtension)); + assertEqualsExactType(true, message.getExtension(defaultBoolExtension)); + assertEqualsExactType("hello", message.getExtension(defaultStringExtension)); assertEqualsExactType(toBytes("world"), message.getExtension(defaultBytesExtension)); - assertEqualsExactType(TestAllTypes.NestedEnum.BAR, - message.getExtension(defaultNestedEnumExtension )); - assertEqualsExactType(ForeignEnum.FOREIGN_BAR, - message.getExtension(defaultForeignEnumExtension)); - assertEqualsExactType(ImportEnum.IMPORT_BAR, - message.getExtension(defaultImportEnumExtension)); + assertEqualsExactType( + TestAllTypes.NestedEnum.BAR, message.getExtension(defaultNestedEnumExtension)); + assertEqualsExactType( + ForeignEnum.FOREIGN_BAR, message.getExtension(defaultForeignEnumExtension)); + assertEqualsExactType(ImportEnum.IMPORT_BAR, message.getExtension(defaultImportEnumExtension)); assertEqualsExactType("abc", message.getExtension(defaultStringPieceExtension)); assertEqualsExactType("123", message.getExtension(defaultCordExtension)); @@ -1821,405 +1804,402 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all extensions of - * {@code message} are set to the values assigned by {@code setAllExtensions} - * followed by {@code modifyRepeatedExtensions}. + * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to + * the values assigned by {@code setAllExtensions} followed by {@code modifyRepeatedExtensions}. */ - public static void assertRepeatedExtensionsModified( - TestAllExtensionsOrBuilder message) { + public static void assertRepeatedExtensionsModified(TestAllExtensionsOrBuilder message) { // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.assertEquals(2, message.getExtensionCount(repeatedInt32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedInt64Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint64Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint64Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32Extension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64Extension )); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt64Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint64Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint64Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32Extension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64Extension)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32Extension)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64Extension)); - Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtension )); - - Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtension )); + Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtension)); + + Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtension)); Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtension)); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtension )); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtension )); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtension)); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtension)); Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtension)); Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtension)); - assertEqualsExactType(201 , message.getExtension(repeatedInt32Extension , 0)); - assertEqualsExactType(202L , message.getExtension(repeatedInt64Extension , 0)); - assertEqualsExactType(203 , message.getExtension(repeatedUint32Extension , 0)); - assertEqualsExactType(204L , message.getExtension(repeatedUint64Extension , 0)); - assertEqualsExactType(205 , message.getExtension(repeatedSint32Extension , 0)); - assertEqualsExactType(206L , message.getExtension(repeatedSint64Extension , 0)); - assertEqualsExactType(207 , message.getExtension(repeatedFixed32Extension , 0)); - assertEqualsExactType(208L , message.getExtension(repeatedFixed64Extension , 0)); - assertEqualsExactType(209 , message.getExtension(repeatedSfixed32Extension, 0)); - assertEqualsExactType(210L , message.getExtension(repeatedSfixed64Extension, 0)); - assertEqualsExactType(211F , message.getExtension(repeatedFloatExtension , 0)); - assertEqualsExactType(212D , message.getExtension(repeatedDoubleExtension , 0)); - assertEqualsExactType(true , message.getExtension(repeatedBoolExtension , 0)); - assertEqualsExactType("215", message.getExtension(repeatedStringExtension , 0)); + assertEqualsExactType(201, message.getExtension(repeatedInt32Extension, 0)); + assertEqualsExactType(202L, message.getExtension(repeatedInt64Extension, 0)); + assertEqualsExactType(203, message.getExtension(repeatedUint32Extension, 0)); + assertEqualsExactType(204L, message.getExtension(repeatedUint64Extension, 0)); + assertEqualsExactType(205, message.getExtension(repeatedSint32Extension, 0)); + assertEqualsExactType(206L, message.getExtension(repeatedSint64Extension, 0)); + assertEqualsExactType(207, message.getExtension(repeatedFixed32Extension, 0)); + assertEqualsExactType(208L, message.getExtension(repeatedFixed64Extension, 0)); + assertEqualsExactType(209, message.getExtension(repeatedSfixed32Extension, 0)); + assertEqualsExactType(210L, message.getExtension(repeatedSfixed64Extension, 0)); + assertEqualsExactType(211F, message.getExtension(repeatedFloatExtension, 0)); + assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtension, 0)); + assertEqualsExactType(true, message.getExtension(repeatedBoolExtension, 0)); + assertEqualsExactType("215", message.getExtension(repeatedStringExtension, 0)); assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtension, 0)); - assertEqualsExactType(217, message.getExtension(repeatedGroupExtension , 0).getA()); - assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtension , 0).getBb()); + assertEqualsExactType(217, message.getExtension(repeatedGroupExtension, 0).getA()); + assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtension, 0).getBb()); assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtension, 0).getC()); - assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtension , 0).getD()); - assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtension , 0).getBb()); + assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtension, 0).getD()); + assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtension, 0).getBb()); - assertEqualsExactType(TestAllTypes.NestedEnum.BAR, - message.getExtension(repeatedNestedEnumExtension, 0)); - assertEqualsExactType(ForeignEnum.FOREIGN_BAR, - message.getExtension(repeatedForeignEnumExtension, 0)); - assertEqualsExactType(ImportEnum.IMPORT_BAR, - message.getExtension(repeatedImportEnumExtension, 0)); + assertEqualsExactType( + TestAllTypes.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtension, 0)); + assertEqualsExactType( + ForeignEnum.FOREIGN_BAR, message.getExtension(repeatedForeignEnumExtension, 0)); + assertEqualsExactType( + ImportEnum.IMPORT_BAR, message.getExtension(repeatedImportEnumExtension, 0)); assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtension, 0)); assertEqualsExactType("225", message.getExtension(repeatedCordExtension, 0)); // Actually verify the second (modified) elements now. - assertEqualsExactType(501 , message.getExtension(repeatedInt32Extension , 1)); - assertEqualsExactType(502L , message.getExtension(repeatedInt64Extension , 1)); - assertEqualsExactType(503 , message.getExtension(repeatedUint32Extension , 1)); - assertEqualsExactType(504L , message.getExtension(repeatedUint64Extension , 1)); - assertEqualsExactType(505 , message.getExtension(repeatedSint32Extension , 1)); - assertEqualsExactType(506L , message.getExtension(repeatedSint64Extension , 1)); - assertEqualsExactType(507 , message.getExtension(repeatedFixed32Extension , 1)); - assertEqualsExactType(508L , message.getExtension(repeatedFixed64Extension , 1)); - assertEqualsExactType(509 , message.getExtension(repeatedSfixed32Extension, 1)); - assertEqualsExactType(510L , message.getExtension(repeatedSfixed64Extension, 1)); - assertEqualsExactType(511F , message.getExtension(repeatedFloatExtension , 1)); - assertEqualsExactType(512D , message.getExtension(repeatedDoubleExtension , 1)); - assertEqualsExactType(true , message.getExtension(repeatedBoolExtension , 1)); - assertEqualsExactType("515", message.getExtension(repeatedStringExtension , 1)); + assertEqualsExactType(501, message.getExtension(repeatedInt32Extension, 1)); + assertEqualsExactType(502L, message.getExtension(repeatedInt64Extension, 1)); + assertEqualsExactType(503, message.getExtension(repeatedUint32Extension, 1)); + assertEqualsExactType(504L, message.getExtension(repeatedUint64Extension, 1)); + assertEqualsExactType(505, message.getExtension(repeatedSint32Extension, 1)); + assertEqualsExactType(506L, message.getExtension(repeatedSint64Extension, 1)); + assertEqualsExactType(507, message.getExtension(repeatedFixed32Extension, 1)); + assertEqualsExactType(508L, message.getExtension(repeatedFixed64Extension, 1)); + assertEqualsExactType(509, message.getExtension(repeatedSfixed32Extension, 1)); + assertEqualsExactType(510L, message.getExtension(repeatedSfixed64Extension, 1)); + assertEqualsExactType(511F, message.getExtension(repeatedFloatExtension, 1)); + assertEqualsExactType(512D, message.getExtension(repeatedDoubleExtension, 1)); + assertEqualsExactType(true, message.getExtension(repeatedBoolExtension, 1)); + assertEqualsExactType("515", message.getExtension(repeatedStringExtension, 1)); assertEqualsExactType(toBytes("516"), message.getExtension(repeatedBytesExtension, 1)); - assertEqualsExactType(517, message.getExtension(repeatedGroupExtension , 1).getA()); - assertEqualsExactType(518, message.getExtension(repeatedNestedMessageExtension , 1).getBb()); + assertEqualsExactType(517, message.getExtension(repeatedGroupExtension, 1).getA()); + assertEqualsExactType(518, message.getExtension(repeatedNestedMessageExtension, 1).getBb()); assertEqualsExactType(519, message.getExtension(repeatedForeignMessageExtension, 1).getC()); - assertEqualsExactType(520, message.getExtension(repeatedImportMessageExtension , 1).getD()); - assertEqualsExactType(527, message.getExtension(repeatedLazyMessageExtension , 1).getBb()); + assertEqualsExactType(520, message.getExtension(repeatedImportMessageExtension, 1).getD()); + assertEqualsExactType(527, message.getExtension(repeatedLazyMessageExtension, 1).getBb()); - assertEqualsExactType(TestAllTypes.NestedEnum.FOO, - message.getExtension(repeatedNestedEnumExtension, 1)); - assertEqualsExactType(ForeignEnum.FOREIGN_FOO, - message.getExtension(repeatedForeignEnumExtension, 1)); - assertEqualsExactType(ImportEnum.IMPORT_FOO, - message.getExtension(repeatedImportEnumExtension, 1)); + assertEqualsExactType( + TestAllTypes.NestedEnum.FOO, message.getExtension(repeatedNestedEnumExtension, 1)); + assertEqualsExactType( + ForeignEnum.FOREIGN_FOO, message.getExtension(repeatedForeignEnumExtension, 1)); + assertEqualsExactType( + ImportEnum.IMPORT_FOO, message.getExtension(repeatedImportEnumExtension, 1)); assertEqualsExactType("524", message.getExtension(repeatedStringPieceExtension, 1)); assertEqualsExactType("525", message.getExtension(repeatedCordExtension, 1)); } public static void setPackedExtensions(TestPackedExtensions.Builder message) { - message.addExtension(packedInt32Extension , 601); - message.addExtension(packedInt64Extension , 602L); - message.addExtension(packedUint32Extension , 603); - message.addExtension(packedUint64Extension , 604L); - message.addExtension(packedSint32Extension , 605); - message.addExtension(packedSint64Extension , 606L); - message.addExtension(packedFixed32Extension , 607); - message.addExtension(packedFixed64Extension , 608L); + message.addExtension(packedInt32Extension, 601); + message.addExtension(packedInt64Extension, 602L); + message.addExtension(packedUint32Extension, 603); + message.addExtension(packedUint64Extension, 604L); + message.addExtension(packedSint32Extension, 605); + message.addExtension(packedSint64Extension, 606L); + message.addExtension(packedFixed32Extension, 607); + message.addExtension(packedFixed64Extension, 608L); message.addExtension(packedSfixed32Extension, 609); message.addExtension(packedSfixed64Extension, 610L); - message.addExtension(packedFloatExtension , 611F); - message.addExtension(packedDoubleExtension , 612D); - message.addExtension(packedBoolExtension , true); + message.addExtension(packedFloatExtension, 611F); + message.addExtension(packedDoubleExtension, 612D); + message.addExtension(packedBoolExtension, true); message.addExtension(packedEnumExtension, ForeignEnum.FOREIGN_BAR); // Add a second one of each field. - message.addExtension(packedInt32Extension , 701); - message.addExtension(packedInt64Extension , 702L); - message.addExtension(packedUint32Extension , 703); - message.addExtension(packedUint64Extension , 704L); - message.addExtension(packedSint32Extension , 705); - message.addExtension(packedSint64Extension , 706L); - message.addExtension(packedFixed32Extension , 707); - message.addExtension(packedFixed64Extension , 708L); + message.addExtension(packedInt32Extension, 701); + message.addExtension(packedInt64Extension, 702L); + message.addExtension(packedUint32Extension, 703); + message.addExtension(packedUint64Extension, 704L); + message.addExtension(packedSint32Extension, 705); + message.addExtension(packedSint64Extension, 706L); + message.addExtension(packedFixed32Extension, 707); + message.addExtension(packedFixed64Extension, 708L); message.addExtension(packedSfixed32Extension, 709); message.addExtension(packedSfixed64Extension, 710L); - message.addExtension(packedFloatExtension , 711F); - message.addExtension(packedDoubleExtension , 712D); - message.addExtension(packedBoolExtension , false); + message.addExtension(packedFloatExtension, 711F); + message.addExtension(packedDoubleExtension, 712D); + message.addExtension(packedBoolExtension, false); message.addExtension(packedEnumExtension, ForeignEnum.FOREIGN_BAZ); } public static void assertPackedExtensionsSet(TestPackedExtensions message) { - Assert.assertEquals(2, message.getExtensionCount(packedInt32Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedInt64Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedUint32Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedUint64Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedSint32Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedSint64Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedFixed32Extension )); - Assert.assertEquals(2, message.getExtensionCount(packedFixed64Extension )); + Assert.assertEquals(2, message.getExtensionCount(packedInt32Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedInt64Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedUint32Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedUint64Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedSint32Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedSint64Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedFixed32Extension)); + Assert.assertEquals(2, message.getExtensionCount(packedFixed64Extension)); Assert.assertEquals(2, message.getExtensionCount(packedSfixed32Extension)); Assert.assertEquals(2, message.getExtensionCount(packedSfixed64Extension)); - Assert.assertEquals(2, message.getExtensionCount(packedFloatExtension )); - Assert.assertEquals(2, message.getExtensionCount(packedDoubleExtension )); - Assert.assertEquals(2, message.getExtensionCount(packedBoolExtension )); + Assert.assertEquals(2, message.getExtensionCount(packedFloatExtension)); + Assert.assertEquals(2, message.getExtensionCount(packedDoubleExtension)); + Assert.assertEquals(2, message.getExtensionCount(packedBoolExtension)); Assert.assertEquals(2, message.getExtensionCount(packedEnumExtension)); - assertEqualsExactType(601 , message.getExtension(packedInt32Extension , 0)); - assertEqualsExactType(602L , message.getExtension(packedInt64Extension , 0)); - assertEqualsExactType(603 , message.getExtension(packedUint32Extension , 0)); - assertEqualsExactType(604L , message.getExtension(packedUint64Extension , 0)); - assertEqualsExactType(605 , message.getExtension(packedSint32Extension , 0)); - assertEqualsExactType(606L , message.getExtension(packedSint64Extension , 0)); - assertEqualsExactType(607 , message.getExtension(packedFixed32Extension , 0)); - assertEqualsExactType(608L , message.getExtension(packedFixed64Extension , 0)); - assertEqualsExactType(609 , message.getExtension(packedSfixed32Extension, 0)); - assertEqualsExactType(610L , message.getExtension(packedSfixed64Extension, 0)); - assertEqualsExactType(611F , message.getExtension(packedFloatExtension , 0)); - assertEqualsExactType(612D , message.getExtension(packedDoubleExtension , 0)); - assertEqualsExactType(true , message.getExtension(packedBoolExtension , 0)); - assertEqualsExactType(ForeignEnum.FOREIGN_BAR, - message.getExtension(packedEnumExtension, 0)); - assertEqualsExactType(701 , message.getExtension(packedInt32Extension , 1)); - assertEqualsExactType(702L , message.getExtension(packedInt64Extension , 1)); - assertEqualsExactType(703 , message.getExtension(packedUint32Extension , 1)); - assertEqualsExactType(704L , message.getExtension(packedUint64Extension , 1)); - assertEqualsExactType(705 , message.getExtension(packedSint32Extension , 1)); - assertEqualsExactType(706L , message.getExtension(packedSint64Extension , 1)); - assertEqualsExactType(707 , message.getExtension(packedFixed32Extension , 1)); - assertEqualsExactType(708L , message.getExtension(packedFixed64Extension , 1)); - assertEqualsExactType(709 , message.getExtension(packedSfixed32Extension, 1)); - assertEqualsExactType(710L , message.getExtension(packedSfixed64Extension, 1)); - assertEqualsExactType(711F , message.getExtension(packedFloatExtension , 1)); - assertEqualsExactType(712D , message.getExtension(packedDoubleExtension , 1)); - assertEqualsExactType(false, message.getExtension(packedBoolExtension , 1)); - assertEqualsExactType(ForeignEnum.FOREIGN_BAZ, - message.getExtension(packedEnumExtension, 1)); + assertEqualsExactType(601, message.getExtension(packedInt32Extension, 0)); + assertEqualsExactType(602L, message.getExtension(packedInt64Extension, 0)); + assertEqualsExactType(603, message.getExtension(packedUint32Extension, 0)); + assertEqualsExactType(604L, message.getExtension(packedUint64Extension, 0)); + assertEqualsExactType(605, message.getExtension(packedSint32Extension, 0)); + assertEqualsExactType(606L, message.getExtension(packedSint64Extension, 0)); + assertEqualsExactType(607, message.getExtension(packedFixed32Extension, 0)); + assertEqualsExactType(608L, message.getExtension(packedFixed64Extension, 0)); + assertEqualsExactType(609, message.getExtension(packedSfixed32Extension, 0)); + assertEqualsExactType(610L, message.getExtension(packedSfixed64Extension, 0)); + assertEqualsExactType(611F, message.getExtension(packedFloatExtension, 0)); + assertEqualsExactType(612D, message.getExtension(packedDoubleExtension, 0)); + assertEqualsExactType(true, message.getExtension(packedBoolExtension, 0)); + assertEqualsExactType(ForeignEnum.FOREIGN_BAR, message.getExtension(packedEnumExtension, 0)); + assertEqualsExactType(701, message.getExtension(packedInt32Extension, 1)); + assertEqualsExactType(702L, message.getExtension(packedInt64Extension, 1)); + assertEqualsExactType(703, message.getExtension(packedUint32Extension, 1)); + assertEqualsExactType(704L, message.getExtension(packedUint64Extension, 1)); + assertEqualsExactType(705, message.getExtension(packedSint32Extension, 1)); + assertEqualsExactType(706L, message.getExtension(packedSint64Extension, 1)); + assertEqualsExactType(707, message.getExtension(packedFixed32Extension, 1)); + assertEqualsExactType(708L, message.getExtension(packedFixed64Extension, 1)); + assertEqualsExactType(709, message.getExtension(packedSfixed32Extension, 1)); + assertEqualsExactType(710L, message.getExtension(packedSfixed64Extension, 1)); + assertEqualsExactType(711F, message.getExtension(packedFloatExtension, 1)); + assertEqualsExactType(712D, message.getExtension(packedDoubleExtension, 1)); + assertEqualsExactType(false, message.getExtension(packedBoolExtension, 1)); + assertEqualsExactType(ForeignEnum.FOREIGN_BAZ, message.getExtension(packedEnumExtension, 1)); } // =================================================================== // Lite extensions /** - * Assert (using {@code junit.framework.Assert}} that all extensions of - * {@code message} are set to the values assigned by {@code setAllExtensions}. + * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to + * the values assigned by {@code setAllExtensions}. */ - public static void assertAllExtensionsSet( - TestAllExtensionsLiteOrBuilder message) { - Assert.assertTrue(message.hasExtension(optionalInt32ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalInt64ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalUint32ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalUint64ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalSint32ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalSint64ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalFixed32ExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalFixed64ExtensionLite )); + public static void assertAllExtensionsSet(TestAllExtensionsLiteOrBuilder message) { + Assert.assertTrue(message.hasExtension(optionalInt32ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalInt64ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalUint32ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalUint64ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalSint32ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalSint64ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalFixed32ExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalFixed64ExtensionLite)); Assert.assertTrue(message.hasExtension(optionalSfixed32ExtensionLite)); Assert.assertTrue(message.hasExtension(optionalSfixed64ExtensionLite)); - Assert.assertTrue(message.hasExtension(optionalFloatExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalDoubleExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalBoolExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalStringExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalBytesExtensionLite )); - - Assert.assertTrue(message.hasExtension(optionalGroupExtensionLite )); - Assert.assertTrue(message.hasExtension(optionalNestedMessageExtensionLite )); + Assert.assertTrue(message.hasExtension(optionalFloatExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalDoubleExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalBoolExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalStringExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalBytesExtensionLite)); + + Assert.assertTrue(message.hasExtension(optionalGroupExtensionLite)); + Assert.assertTrue(message.hasExtension(optionalNestedMessageExtensionLite)); Assert.assertTrue(message.hasExtension(optionalForeignMessageExtensionLite)); - Assert.assertTrue(message.hasExtension(optionalImportMessageExtensionLite )); + Assert.assertTrue(message.hasExtension(optionalImportMessageExtensionLite)); - Assert.assertTrue(message.getExtension(optionalGroupExtensionLite ).hasA()); - Assert.assertTrue(message.getExtension(optionalNestedMessageExtensionLite ).hasBb()); + Assert.assertTrue(message.getExtension(optionalGroupExtensionLite).hasA()); + Assert.assertTrue(message.getExtension(optionalNestedMessageExtensionLite).hasBb()); Assert.assertTrue(message.getExtension(optionalForeignMessageExtensionLite).hasC()); - Assert.assertTrue(message.getExtension(optionalImportMessageExtensionLite ).hasD()); + Assert.assertTrue(message.getExtension(optionalImportMessageExtensionLite).hasD()); - Assert.assertTrue(message.hasExtension(optionalNestedEnumExtensionLite )); + Assert.assertTrue(message.hasExtension(optionalNestedEnumExtensionLite)); Assert.assertTrue(message.hasExtension(optionalForeignEnumExtensionLite)); - Assert.assertTrue(message.hasExtension(optionalImportEnumExtensionLite )); + Assert.assertTrue(message.hasExtension(optionalImportEnumExtensionLite)); Assert.assertTrue(message.hasExtension(optionalStringPieceExtensionLite)); Assert.assertTrue(message.hasExtension(optionalCordExtensionLite)); - assertEqualsExactType(101 , message.getExtension(optionalInt32ExtensionLite )); - assertEqualsExactType(102L , message.getExtension(optionalInt64ExtensionLite )); - assertEqualsExactType(103 , message.getExtension(optionalUint32ExtensionLite )); - assertEqualsExactType(104L , message.getExtension(optionalUint64ExtensionLite )); - assertEqualsExactType(105 , message.getExtension(optionalSint32ExtensionLite )); - assertEqualsExactType(106L , message.getExtension(optionalSint64ExtensionLite )); - assertEqualsExactType(107 , message.getExtension(optionalFixed32ExtensionLite )); - assertEqualsExactType(108L , message.getExtension(optionalFixed64ExtensionLite )); - assertEqualsExactType(109 , message.getExtension(optionalSfixed32ExtensionLite)); - assertEqualsExactType(110L , message.getExtension(optionalSfixed64ExtensionLite)); - assertEqualsExactType(111F , message.getExtension(optionalFloatExtensionLite )); - assertEqualsExactType(112D , message.getExtension(optionalDoubleExtensionLite )); - assertEqualsExactType(true , message.getExtension(optionalBoolExtensionLite )); - assertEqualsExactType("115", message.getExtension(optionalStringExtensionLite )); + assertEqualsExactType(101, message.getExtension(optionalInt32ExtensionLite)); + assertEqualsExactType(102L, message.getExtension(optionalInt64ExtensionLite)); + assertEqualsExactType(103, message.getExtension(optionalUint32ExtensionLite)); + assertEqualsExactType(104L, message.getExtension(optionalUint64ExtensionLite)); + assertEqualsExactType(105, message.getExtension(optionalSint32ExtensionLite)); + assertEqualsExactType(106L, message.getExtension(optionalSint64ExtensionLite)); + assertEqualsExactType(107, message.getExtension(optionalFixed32ExtensionLite)); + assertEqualsExactType(108L, message.getExtension(optionalFixed64ExtensionLite)); + assertEqualsExactType(109, message.getExtension(optionalSfixed32ExtensionLite)); + assertEqualsExactType(110L, message.getExtension(optionalSfixed64ExtensionLite)); + assertEqualsExactType(111F, message.getExtension(optionalFloatExtensionLite)); + assertEqualsExactType(112D, message.getExtension(optionalDoubleExtensionLite)); + assertEqualsExactType(true, message.getExtension(optionalBoolExtensionLite)); + assertEqualsExactType("115", message.getExtension(optionalStringExtensionLite)); assertEqualsExactType(toBytes("116"), message.getExtension(optionalBytesExtensionLite)); - assertEqualsExactType(117, message.getExtension(optionalGroupExtensionLite ).getA()); - assertEqualsExactType(118, message.getExtension(optionalNestedMessageExtensionLite ).getBb()); + assertEqualsExactType(117, message.getExtension(optionalGroupExtensionLite).getA()); + assertEqualsExactType(118, message.getExtension(optionalNestedMessageExtensionLite).getBb()); assertEqualsExactType(119, message.getExtension(optionalForeignMessageExtensionLite).getC()); - assertEqualsExactType(120, message.getExtension(optionalImportMessageExtensionLite ).getD()); - assertEqualsExactType(126, message.getExtension( - optionalPublicImportMessageExtensionLite).getE()); + assertEqualsExactType(120, message.getExtension(optionalImportMessageExtensionLite).getD()); + assertEqualsExactType( + 126, message.getExtension(optionalPublicImportMessageExtensionLite).getE()); assertEqualsExactType(127, message.getExtension(optionalLazyMessageExtensionLite).getBb()); - assertEqualsExactType(TestAllTypesLite.NestedEnum.BAZ, - message.getExtension(optionalNestedEnumExtensionLite)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAZ, - message.getExtension(optionalForeignEnumExtensionLite)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_BAZ, - message.getExtension(optionalImportEnumExtensionLite)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.BAZ, message.getExtension(optionalNestedEnumExtensionLite)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAZ, message.getExtension(optionalForeignEnumExtensionLite)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_BAZ, message.getExtension(optionalImportEnumExtensionLite)); assertEqualsExactType("124", message.getExtension(optionalStringPieceExtensionLite)); assertEqualsExactType("125", message.getExtension(optionalCordExtensionLite)); // ----------------------------------------------------------------- - Assert.assertEquals(2, message.getExtensionCount(repeatedInt32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedInt64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64ExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64ExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32ExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64ExtensionLite)); - Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtensionLite )); - - Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtensionLite)); + + Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtensionLite)); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtensionLite)); - assertEqualsExactType(201 , message.getExtension(repeatedInt32ExtensionLite , 0)); - assertEqualsExactType(202L , message.getExtension(repeatedInt64ExtensionLite , 0)); - assertEqualsExactType(203 , message.getExtension(repeatedUint32ExtensionLite , 0)); - assertEqualsExactType(204L , message.getExtension(repeatedUint64ExtensionLite , 0)); - assertEqualsExactType(205 , message.getExtension(repeatedSint32ExtensionLite , 0)); - assertEqualsExactType(206L , message.getExtension(repeatedSint64ExtensionLite , 0)); - assertEqualsExactType(207 , message.getExtension(repeatedFixed32ExtensionLite , 0)); - assertEqualsExactType(208L , message.getExtension(repeatedFixed64ExtensionLite , 0)); - assertEqualsExactType(209 , message.getExtension(repeatedSfixed32ExtensionLite, 0)); - assertEqualsExactType(210L , message.getExtension(repeatedSfixed64ExtensionLite, 0)); - assertEqualsExactType(211F , message.getExtension(repeatedFloatExtensionLite , 0)); - assertEqualsExactType(212D , message.getExtension(repeatedDoubleExtensionLite , 0)); - assertEqualsExactType(true , message.getExtension(repeatedBoolExtensionLite , 0)); - assertEqualsExactType("215", message.getExtension(repeatedStringExtensionLite , 0)); + assertEqualsExactType(201, message.getExtension(repeatedInt32ExtensionLite, 0)); + assertEqualsExactType(202L, message.getExtension(repeatedInt64ExtensionLite, 0)); + assertEqualsExactType(203, message.getExtension(repeatedUint32ExtensionLite, 0)); + assertEqualsExactType(204L, message.getExtension(repeatedUint64ExtensionLite, 0)); + assertEqualsExactType(205, message.getExtension(repeatedSint32ExtensionLite, 0)); + assertEqualsExactType(206L, message.getExtension(repeatedSint64ExtensionLite, 0)); + assertEqualsExactType(207, message.getExtension(repeatedFixed32ExtensionLite, 0)); + assertEqualsExactType(208L, message.getExtension(repeatedFixed64ExtensionLite, 0)); + assertEqualsExactType(209, message.getExtension(repeatedSfixed32ExtensionLite, 0)); + assertEqualsExactType(210L, message.getExtension(repeatedSfixed64ExtensionLite, 0)); + assertEqualsExactType(211F, message.getExtension(repeatedFloatExtensionLite, 0)); + assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtensionLite, 0)); + assertEqualsExactType(true, message.getExtension(repeatedBoolExtensionLite, 0)); + assertEqualsExactType("215", message.getExtension(repeatedStringExtensionLite, 0)); assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtensionLite, 0)); - assertEqualsExactType(217, message.getExtension(repeatedGroupExtensionLite ,0).getA()); - assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtensionLite ,0).getBb()); - assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtensionLite,0).getC()); - assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtensionLite ,0).getD()); - assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtensionLite ,0).getBb()); + assertEqualsExactType(217, message.getExtension(repeatedGroupExtensionLite, 0).getA()); + assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtensionLite, 0).getBb()); + assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtensionLite, 0).getC()); + assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtensionLite, 0).getD()); + assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtensionLite, 0).getBb()); - assertEqualsExactType(TestAllTypesLite.NestedEnum.BAR, - message.getExtension(repeatedNestedEnumExtensionLite, 0)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAR, - message.getExtension(repeatedForeignEnumExtensionLite, 0)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_BAR, - message.getExtension(repeatedImportEnumExtensionLite, 0)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtensionLite, 0)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAR, + message.getExtension(repeatedForeignEnumExtensionLite, 0)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_BAR, message.getExtension(repeatedImportEnumExtensionLite, 0)); assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtensionLite, 0)); assertEqualsExactType("225", message.getExtension(repeatedCordExtensionLite, 0)); - assertEqualsExactType(301 , message.getExtension(repeatedInt32ExtensionLite , 1)); - assertEqualsExactType(302L , message.getExtension(repeatedInt64ExtensionLite , 1)); - assertEqualsExactType(303 , message.getExtension(repeatedUint32ExtensionLite , 1)); - assertEqualsExactType(304L , message.getExtension(repeatedUint64ExtensionLite , 1)); - assertEqualsExactType(305 , message.getExtension(repeatedSint32ExtensionLite , 1)); - assertEqualsExactType(306L , message.getExtension(repeatedSint64ExtensionLite , 1)); - assertEqualsExactType(307 , message.getExtension(repeatedFixed32ExtensionLite , 1)); - assertEqualsExactType(308L , message.getExtension(repeatedFixed64ExtensionLite , 1)); - assertEqualsExactType(309 , message.getExtension(repeatedSfixed32ExtensionLite, 1)); - assertEqualsExactType(310L , message.getExtension(repeatedSfixed64ExtensionLite, 1)); - assertEqualsExactType(311F , message.getExtension(repeatedFloatExtensionLite , 1)); - assertEqualsExactType(312D , message.getExtension(repeatedDoubleExtensionLite , 1)); - assertEqualsExactType(false, message.getExtension(repeatedBoolExtensionLite , 1)); - assertEqualsExactType("315", message.getExtension(repeatedStringExtensionLite , 1)); + assertEqualsExactType(301, message.getExtension(repeatedInt32ExtensionLite, 1)); + assertEqualsExactType(302L, message.getExtension(repeatedInt64ExtensionLite, 1)); + assertEqualsExactType(303, message.getExtension(repeatedUint32ExtensionLite, 1)); + assertEqualsExactType(304L, message.getExtension(repeatedUint64ExtensionLite, 1)); + assertEqualsExactType(305, message.getExtension(repeatedSint32ExtensionLite, 1)); + assertEqualsExactType(306L, message.getExtension(repeatedSint64ExtensionLite, 1)); + assertEqualsExactType(307, message.getExtension(repeatedFixed32ExtensionLite, 1)); + assertEqualsExactType(308L, message.getExtension(repeatedFixed64ExtensionLite, 1)); + assertEqualsExactType(309, message.getExtension(repeatedSfixed32ExtensionLite, 1)); + assertEqualsExactType(310L, message.getExtension(repeatedSfixed64ExtensionLite, 1)); + assertEqualsExactType(311F, message.getExtension(repeatedFloatExtensionLite, 1)); + assertEqualsExactType(312D, message.getExtension(repeatedDoubleExtensionLite, 1)); + assertEqualsExactType(false, message.getExtension(repeatedBoolExtensionLite, 1)); + assertEqualsExactType("315", message.getExtension(repeatedStringExtensionLite, 1)); assertEqualsExactType(toBytes("316"), message.getExtension(repeatedBytesExtensionLite, 1)); - assertEqualsExactType(317, message.getExtension(repeatedGroupExtensionLite ,1).getA()); - assertEqualsExactType(318, message.getExtension(repeatedNestedMessageExtensionLite ,1).getBb()); - assertEqualsExactType(319, message.getExtension(repeatedForeignMessageExtensionLite,1).getC()); - assertEqualsExactType(320, message.getExtension(repeatedImportMessageExtensionLite ,1).getD()); - assertEqualsExactType(327, message.getExtension(repeatedLazyMessageExtensionLite ,1).getBb()); + assertEqualsExactType(317, message.getExtension(repeatedGroupExtensionLite, 1).getA()); + assertEqualsExactType(318, message.getExtension(repeatedNestedMessageExtensionLite, 1).getBb()); + assertEqualsExactType(319, message.getExtension(repeatedForeignMessageExtensionLite, 1).getC()); + assertEqualsExactType(320, message.getExtension(repeatedImportMessageExtensionLite, 1).getD()); + assertEqualsExactType(327, message.getExtension(repeatedLazyMessageExtensionLite, 1).getBb()); - assertEqualsExactType(TestAllTypesLite.NestedEnum.BAZ, - message.getExtension(repeatedNestedEnumExtensionLite, 1)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAZ, - message.getExtension(repeatedForeignEnumExtensionLite, 1)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_BAZ, - message.getExtension(repeatedImportEnumExtensionLite, 1)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.BAZ, message.getExtension(repeatedNestedEnumExtensionLite, 1)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAZ, + message.getExtension(repeatedForeignEnumExtensionLite, 1)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_BAZ, message.getExtension(repeatedImportEnumExtensionLite, 1)); assertEqualsExactType("324", message.getExtension(repeatedStringPieceExtensionLite, 1)); assertEqualsExactType("325", message.getExtension(repeatedCordExtensionLite, 1)); // ----------------------------------------------------------------- - Assert.assertTrue(message.hasExtension(defaultInt32ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultInt64ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultUint32ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultUint64ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultSint32ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultSint64ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultFixed32ExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultFixed64ExtensionLite )); + Assert.assertTrue(message.hasExtension(defaultInt32ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultInt64ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultUint32ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultUint64ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultSint32ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultSint64ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultFixed32ExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultFixed64ExtensionLite)); Assert.assertTrue(message.hasExtension(defaultSfixed32ExtensionLite)); Assert.assertTrue(message.hasExtension(defaultSfixed64ExtensionLite)); - Assert.assertTrue(message.hasExtension(defaultFloatExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultDoubleExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultBoolExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultStringExtensionLite )); - Assert.assertTrue(message.hasExtension(defaultBytesExtensionLite )); + Assert.assertTrue(message.hasExtension(defaultFloatExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultDoubleExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultBoolExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultStringExtensionLite)); + Assert.assertTrue(message.hasExtension(defaultBytesExtensionLite)); - Assert.assertTrue(message.hasExtension(defaultNestedEnumExtensionLite )); + Assert.assertTrue(message.hasExtension(defaultNestedEnumExtensionLite)); Assert.assertTrue(message.hasExtension(defaultForeignEnumExtensionLite)); - Assert.assertTrue(message.hasExtension(defaultImportEnumExtensionLite )); + Assert.assertTrue(message.hasExtension(defaultImportEnumExtensionLite)); Assert.assertTrue(message.hasExtension(defaultStringPieceExtensionLite)); Assert.assertTrue(message.hasExtension(defaultCordExtensionLite)); - assertEqualsExactType(401 , message.getExtension(defaultInt32ExtensionLite )); - assertEqualsExactType(402L , message.getExtension(defaultInt64ExtensionLite )); - assertEqualsExactType(403 , message.getExtension(defaultUint32ExtensionLite )); - assertEqualsExactType(404L , message.getExtension(defaultUint64ExtensionLite )); - assertEqualsExactType(405 , message.getExtension(defaultSint32ExtensionLite )); - assertEqualsExactType(406L , message.getExtension(defaultSint64ExtensionLite )); - assertEqualsExactType(407 , message.getExtension(defaultFixed32ExtensionLite )); - assertEqualsExactType(408L , message.getExtension(defaultFixed64ExtensionLite )); - assertEqualsExactType(409 , message.getExtension(defaultSfixed32ExtensionLite)); - assertEqualsExactType(410L , message.getExtension(defaultSfixed64ExtensionLite)); - assertEqualsExactType(411F , message.getExtension(defaultFloatExtensionLite )); - assertEqualsExactType(412D , message.getExtension(defaultDoubleExtensionLite )); - assertEqualsExactType(false, message.getExtension(defaultBoolExtensionLite )); - assertEqualsExactType("415", message.getExtension(defaultStringExtensionLite )); + assertEqualsExactType(401, message.getExtension(defaultInt32ExtensionLite)); + assertEqualsExactType(402L, message.getExtension(defaultInt64ExtensionLite)); + assertEqualsExactType(403, message.getExtension(defaultUint32ExtensionLite)); + assertEqualsExactType(404L, message.getExtension(defaultUint64ExtensionLite)); + assertEqualsExactType(405, message.getExtension(defaultSint32ExtensionLite)); + assertEqualsExactType(406L, message.getExtension(defaultSint64ExtensionLite)); + assertEqualsExactType(407, message.getExtension(defaultFixed32ExtensionLite)); + assertEqualsExactType(408L, message.getExtension(defaultFixed64ExtensionLite)); + assertEqualsExactType(409, message.getExtension(defaultSfixed32ExtensionLite)); + assertEqualsExactType(410L, message.getExtension(defaultSfixed64ExtensionLite)); + assertEqualsExactType(411F, message.getExtension(defaultFloatExtensionLite)); + assertEqualsExactType(412D, message.getExtension(defaultDoubleExtensionLite)); + assertEqualsExactType(false, message.getExtension(defaultBoolExtensionLite)); + assertEqualsExactType("415", message.getExtension(defaultStringExtensionLite)); assertEqualsExactType(toBytes("416"), message.getExtension(defaultBytesExtensionLite)); - assertEqualsExactType(TestAllTypesLite.NestedEnum.FOO, - message.getExtension(defaultNestedEnumExtensionLite )); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_FOO, - message.getExtension(defaultForeignEnumExtensionLite)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_FOO, - message.getExtension(defaultImportEnumExtensionLite)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.FOO, message.getExtension(defaultNestedEnumExtensionLite)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_FOO, message.getExtension(defaultForeignEnumExtensionLite)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_FOO, message.getExtension(defaultImportEnumExtensionLite)); assertEqualsExactType("424", message.getExtension(defaultStringPieceExtensionLite)); assertEqualsExactType("425", message.getExtension(defaultCordExtensionLite)); @@ -2232,163 +2212,160 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all extensions of - * {@code message} are cleared, and that getting the extensions returns their - * default values. + * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are + * cleared, and that getting the extensions returns their default values. */ - public static void assertExtensionsClear( - TestAllExtensionsLiteOrBuilder message) { + public static void assertExtensionsClear(TestAllExtensionsLiteOrBuilder message) { // hasBlah() should initially be false for all optional fields. - Assert.assertFalse(message.hasExtension(optionalInt32ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalInt64ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalUint32ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalUint64ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalSint32ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalSint64ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalFixed32ExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalFixed64ExtensionLite )); + Assert.assertFalse(message.hasExtension(optionalInt32ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalInt64ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalUint32ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalUint64ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalSint32ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalSint64ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalFixed32ExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalFixed64ExtensionLite)); Assert.assertFalse(message.hasExtension(optionalSfixed32ExtensionLite)); Assert.assertFalse(message.hasExtension(optionalSfixed64ExtensionLite)); - Assert.assertFalse(message.hasExtension(optionalFloatExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalDoubleExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalBoolExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalStringExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalBytesExtensionLite )); - - Assert.assertFalse(message.hasExtension(optionalGroupExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalNestedMessageExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalForeignMessageExtensionLite )); - Assert.assertFalse(message.hasExtension(optionalImportMessageExtensionLite )); + Assert.assertFalse(message.hasExtension(optionalFloatExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalDoubleExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalBoolExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalStringExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalBytesExtensionLite)); + + Assert.assertFalse(message.hasExtension(optionalGroupExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalNestedMessageExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalForeignMessageExtensionLite)); + Assert.assertFalse(message.hasExtension(optionalImportMessageExtensionLite)); Assert.assertFalse(message.hasExtension(optionalPublicImportMessageExtensionLite)); - Assert.assertFalse(message.hasExtension(optionalLazyMessageExtensionLite )); + Assert.assertFalse(message.hasExtension(optionalLazyMessageExtensionLite)); - Assert.assertFalse(message.hasExtension(optionalNestedEnumExtensionLite )); + Assert.assertFalse(message.hasExtension(optionalNestedEnumExtensionLite)); Assert.assertFalse(message.hasExtension(optionalForeignEnumExtensionLite)); - Assert.assertFalse(message.hasExtension(optionalImportEnumExtensionLite )); + Assert.assertFalse(message.hasExtension(optionalImportEnumExtensionLite)); Assert.assertFalse(message.hasExtension(optionalStringPieceExtensionLite)); Assert.assertFalse(message.hasExtension(optionalCordExtensionLite)); // Optional fields without defaults are set to zero or something like it. - assertEqualsExactType(0 , message.getExtension(optionalInt32ExtensionLite )); - assertEqualsExactType(0L , message.getExtension(optionalInt64ExtensionLite )); - assertEqualsExactType(0 , message.getExtension(optionalUint32ExtensionLite )); - assertEqualsExactType(0L , message.getExtension(optionalUint64ExtensionLite )); - assertEqualsExactType(0 , message.getExtension(optionalSint32ExtensionLite )); - assertEqualsExactType(0L , message.getExtension(optionalSint64ExtensionLite )); - assertEqualsExactType(0 , message.getExtension(optionalFixed32ExtensionLite )); - assertEqualsExactType(0L , message.getExtension(optionalFixed64ExtensionLite )); - assertEqualsExactType(0 , message.getExtension(optionalSfixed32ExtensionLite)); - assertEqualsExactType(0L , message.getExtension(optionalSfixed64ExtensionLite)); - assertEqualsExactType(0F , message.getExtension(optionalFloatExtensionLite )); - assertEqualsExactType(0D , message.getExtension(optionalDoubleExtensionLite )); - assertEqualsExactType(false, message.getExtension(optionalBoolExtensionLite )); - assertEqualsExactType("" , message.getExtension(optionalStringExtensionLite )); + assertEqualsExactType(0, message.getExtension(optionalInt32ExtensionLite)); + assertEqualsExactType(0L, message.getExtension(optionalInt64ExtensionLite)); + assertEqualsExactType(0, message.getExtension(optionalUint32ExtensionLite)); + assertEqualsExactType(0L, message.getExtension(optionalUint64ExtensionLite)); + assertEqualsExactType(0, message.getExtension(optionalSint32ExtensionLite)); + assertEqualsExactType(0L, message.getExtension(optionalSint64ExtensionLite)); + assertEqualsExactType(0, message.getExtension(optionalFixed32ExtensionLite)); + assertEqualsExactType(0L, message.getExtension(optionalFixed64ExtensionLite)); + assertEqualsExactType(0, message.getExtension(optionalSfixed32ExtensionLite)); + assertEqualsExactType(0L, message.getExtension(optionalSfixed64ExtensionLite)); + assertEqualsExactType(0F, message.getExtension(optionalFloatExtensionLite)); + assertEqualsExactType(0D, message.getExtension(optionalDoubleExtensionLite)); + assertEqualsExactType(false, message.getExtension(optionalBoolExtensionLite)); + assertEqualsExactType("", message.getExtension(optionalStringExtensionLite)); assertEqualsExactType(ByteString.EMPTY, message.getExtension(optionalBytesExtensionLite)); // Embedded messages should also be clear. - Assert.assertFalse(message.getExtension(optionalGroupExtensionLite ).hasA()); - Assert.assertFalse(message.getExtension(optionalNestedMessageExtensionLite ).hasBb()); - Assert.assertFalse(message.getExtension(optionalForeignMessageExtensionLite ).hasC()); - Assert.assertFalse(message.getExtension(optionalImportMessageExtensionLite ).hasD()); + Assert.assertFalse(message.getExtension(optionalGroupExtensionLite).hasA()); + Assert.assertFalse(message.getExtension(optionalNestedMessageExtensionLite).hasBb()); + Assert.assertFalse(message.getExtension(optionalForeignMessageExtensionLite).hasC()); + Assert.assertFalse(message.getExtension(optionalImportMessageExtensionLite).hasD()); Assert.assertFalse(message.getExtension(optionalPublicImportMessageExtensionLite).hasE()); - Assert.assertFalse(message.getExtension(optionalLazyMessageExtensionLite ).hasBb()); + Assert.assertFalse(message.getExtension(optionalLazyMessageExtensionLite).hasBb()); - assertEqualsExactType(0, message.getExtension(optionalGroupExtensionLite ).getA()); - assertEqualsExactType(0, message.getExtension(optionalNestedMessageExtensionLite ).getBb()); + assertEqualsExactType(0, message.getExtension(optionalGroupExtensionLite).getA()); + assertEqualsExactType(0, message.getExtension(optionalNestedMessageExtensionLite).getBb()); assertEqualsExactType(0, message.getExtension(optionalForeignMessageExtensionLite).getC()); - assertEqualsExactType(0, message.getExtension(optionalImportMessageExtensionLite ).getD()); - assertEqualsExactType(0, message.getExtension( - optionalPublicImportMessageExtensionLite).getE()); - assertEqualsExactType(0, message.getExtension(optionalLazyMessageExtensionLite ).getBb()); + assertEqualsExactType(0, message.getExtension(optionalImportMessageExtensionLite).getD()); + assertEqualsExactType(0, message.getExtension(optionalPublicImportMessageExtensionLite).getE()); + assertEqualsExactType(0, message.getExtension(optionalLazyMessageExtensionLite).getBb()); // Enums without defaults are set to the first value in the enum. - assertEqualsExactType(TestAllTypesLite.NestedEnum.FOO, - message.getExtension(optionalNestedEnumExtensionLite )); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_FOO, - message.getExtension(optionalForeignEnumExtensionLite)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_FOO, - message.getExtension(optionalImportEnumExtensionLite)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.FOO, message.getExtension(optionalNestedEnumExtensionLite)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_FOO, message.getExtension(optionalForeignEnumExtensionLite)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_FOO, message.getExtension(optionalImportEnumExtensionLite)); assertEqualsExactType("", message.getExtension(optionalStringPieceExtensionLite)); assertEqualsExactType("", message.getExtension(optionalCordExtensionLite)); // Repeated fields are empty. - Assert.assertEquals(0, message.getExtensionCount(repeatedInt32ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedInt64ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedUint32ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedUint64ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedSint32ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedSint64ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedFixed32ExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedFixed64ExtensionLite )); + Assert.assertEquals(0, message.getExtensionCount(repeatedInt32ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedInt64ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedUint32ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedUint64ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedSint32ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedSint64ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedFixed32ExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedFixed64ExtensionLite)); Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed32ExtensionLite)); Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed64ExtensionLite)); - Assert.assertEquals(0, message.getExtensionCount(repeatedFloatExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedDoubleExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedBoolExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedStringExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedBytesExtensionLite )); - - Assert.assertEquals(0, message.getExtensionCount(repeatedGroupExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedNestedMessageExtensionLite )); + Assert.assertEquals(0, message.getExtensionCount(repeatedFloatExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedDoubleExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedBoolExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedStringExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedBytesExtensionLite)); + + Assert.assertEquals(0, message.getExtensionCount(repeatedGroupExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedNestedMessageExtensionLite)); Assert.assertEquals(0, message.getExtensionCount(repeatedForeignMessageExtensionLite)); - Assert.assertEquals(0, message.getExtensionCount(repeatedImportMessageExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedLazyMessageExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedNestedEnumExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedForeignEnumExtensionLite )); - Assert.assertEquals(0, message.getExtensionCount(repeatedImportEnumExtensionLite )); + Assert.assertEquals(0, message.getExtensionCount(repeatedImportMessageExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedLazyMessageExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedNestedEnumExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedForeignEnumExtensionLite)); + Assert.assertEquals(0, message.getExtensionCount(repeatedImportEnumExtensionLite)); Assert.assertEquals(0, message.getExtensionCount(repeatedStringPieceExtensionLite)); Assert.assertEquals(0, message.getExtensionCount(repeatedCordExtensionLite)); // hasBlah() should also be false for all default fields. - Assert.assertFalse(message.hasExtension(defaultInt32ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultInt64ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultUint32ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultUint64ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultSint32ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultSint64ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultFixed32ExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultFixed64ExtensionLite )); + Assert.assertFalse(message.hasExtension(defaultInt32ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultInt64ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultUint32ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultUint64ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultSint32ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultSint64ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultFixed32ExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultFixed64ExtensionLite)); Assert.assertFalse(message.hasExtension(defaultSfixed32ExtensionLite)); Assert.assertFalse(message.hasExtension(defaultSfixed64ExtensionLite)); - Assert.assertFalse(message.hasExtension(defaultFloatExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultDoubleExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultBoolExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultStringExtensionLite )); - Assert.assertFalse(message.hasExtension(defaultBytesExtensionLite )); + Assert.assertFalse(message.hasExtension(defaultFloatExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultDoubleExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultBoolExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultStringExtensionLite)); + Assert.assertFalse(message.hasExtension(defaultBytesExtensionLite)); - Assert.assertFalse(message.hasExtension(defaultNestedEnumExtensionLite )); + Assert.assertFalse(message.hasExtension(defaultNestedEnumExtensionLite)); Assert.assertFalse(message.hasExtension(defaultForeignEnumExtensionLite)); - Assert.assertFalse(message.hasExtension(defaultImportEnumExtensionLite )); + Assert.assertFalse(message.hasExtension(defaultImportEnumExtensionLite)); Assert.assertFalse(message.hasExtension(defaultStringPieceExtensionLite)); Assert.assertFalse(message.hasExtension(defaultCordExtensionLite)); // Fields with defaults have their default values (duh). - assertEqualsExactType( 41 , message.getExtension(defaultInt32ExtensionLite )); - assertEqualsExactType( 42L , message.getExtension(defaultInt64ExtensionLite )); - assertEqualsExactType( 43 , message.getExtension(defaultUint32ExtensionLite )); - assertEqualsExactType( 44L , message.getExtension(defaultUint64ExtensionLite )); - assertEqualsExactType(-45 , message.getExtension(defaultSint32ExtensionLite )); - assertEqualsExactType( 46L , message.getExtension(defaultSint64ExtensionLite )); - assertEqualsExactType( 47 , message.getExtension(defaultFixed32ExtensionLite )); - assertEqualsExactType( 48L , message.getExtension(defaultFixed64ExtensionLite )); - assertEqualsExactType( 49 , message.getExtension(defaultSfixed32ExtensionLite)); - assertEqualsExactType(-50L , message.getExtension(defaultSfixed64ExtensionLite)); - assertEqualsExactType( 51.5F , message.getExtension(defaultFloatExtensionLite )); - assertEqualsExactType( 52e3D , message.getExtension(defaultDoubleExtensionLite )); - assertEqualsExactType(true , message.getExtension(defaultBoolExtensionLite )); - assertEqualsExactType("hello", message.getExtension(defaultStringExtensionLite )); + assertEqualsExactType(41, message.getExtension(defaultInt32ExtensionLite)); + assertEqualsExactType(42L, message.getExtension(defaultInt64ExtensionLite)); + assertEqualsExactType(43, message.getExtension(defaultUint32ExtensionLite)); + assertEqualsExactType(44L, message.getExtension(defaultUint64ExtensionLite)); + assertEqualsExactType(-45, message.getExtension(defaultSint32ExtensionLite)); + assertEqualsExactType(46L, message.getExtension(defaultSint64ExtensionLite)); + assertEqualsExactType(47, message.getExtension(defaultFixed32ExtensionLite)); + assertEqualsExactType(48L, message.getExtension(defaultFixed64ExtensionLite)); + assertEqualsExactType(49, message.getExtension(defaultSfixed32ExtensionLite)); + assertEqualsExactType(-50L, message.getExtension(defaultSfixed64ExtensionLite)); + assertEqualsExactType(51.5F, message.getExtension(defaultFloatExtensionLite)); + assertEqualsExactType(52e3D, message.getExtension(defaultDoubleExtensionLite)); + assertEqualsExactType(true, message.getExtension(defaultBoolExtensionLite)); + assertEqualsExactType("hello", message.getExtension(defaultStringExtensionLite)); assertEqualsExactType(toBytes("world"), message.getExtension(defaultBytesExtensionLite)); - assertEqualsExactType(TestAllTypesLite.NestedEnum.BAR, - message.getExtension(defaultNestedEnumExtensionLite )); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAR, - message.getExtension(defaultForeignEnumExtensionLite)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_BAR, - message.getExtension(defaultImportEnumExtensionLite)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.BAR, message.getExtension(defaultNestedEnumExtensionLite)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAR, message.getExtension(defaultForeignEnumExtensionLite)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_BAR, message.getExtension(defaultImportEnumExtensionLite)); assertEqualsExactType("abc", message.getExtension(defaultStringPieceExtensionLite)); assertEqualsExactType("123", message.getExtension(defaultCordExtensionLite)); @@ -2402,200 +2379,229 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all extensions of - * {@code message} are set to the values assigned by {@code setAllExtensions} - * followed by {@code modifyRepeatedExtensions}. + * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to + * the values assigned by {@code setAllExtensions} followed by {@code modifyRepeatedExtensions}. */ - public static void assertRepeatedExtensionsModified( - TestAllExtensionsLiteOrBuilder message) { + public static void assertRepeatedExtensionsModified(TestAllExtensionsLiteOrBuilder message) { // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.assertEquals(2, message.getExtensionCount(repeatedInt32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedInt64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedUint64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedSint64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64ExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedInt64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedUint64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedSint64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64ExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32ExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64ExtensionLite)); - Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtensionLite )); - - Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtensionLite)); + + Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtensionLite)); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtensionLite)); - assertEqualsExactType(201 , message.getExtension(repeatedInt32ExtensionLite , 0)); - assertEqualsExactType(202L , message.getExtension(repeatedInt64ExtensionLite , 0)); - assertEqualsExactType(203 , message.getExtension(repeatedUint32ExtensionLite , 0)); - assertEqualsExactType(204L , message.getExtension(repeatedUint64ExtensionLite , 0)); - assertEqualsExactType(205 , message.getExtension(repeatedSint32ExtensionLite , 0)); - assertEqualsExactType(206L , message.getExtension(repeatedSint64ExtensionLite , 0)); - assertEqualsExactType(207 , message.getExtension(repeatedFixed32ExtensionLite , 0)); - assertEqualsExactType(208L , message.getExtension(repeatedFixed64ExtensionLite , 0)); - assertEqualsExactType(209 , message.getExtension(repeatedSfixed32ExtensionLite, 0)); - assertEqualsExactType(210L , message.getExtension(repeatedSfixed64ExtensionLite, 0)); - assertEqualsExactType(211F , message.getExtension(repeatedFloatExtensionLite , 0)); - assertEqualsExactType(212D , message.getExtension(repeatedDoubleExtensionLite , 0)); - assertEqualsExactType(true , message.getExtension(repeatedBoolExtensionLite , 0)); - assertEqualsExactType("215", message.getExtension(repeatedStringExtensionLite , 0)); + assertEqualsExactType(201, message.getExtension(repeatedInt32ExtensionLite, 0)); + assertEqualsExactType(202L, message.getExtension(repeatedInt64ExtensionLite, 0)); + assertEqualsExactType(203, message.getExtension(repeatedUint32ExtensionLite, 0)); + assertEqualsExactType(204L, message.getExtension(repeatedUint64ExtensionLite, 0)); + assertEqualsExactType(205, message.getExtension(repeatedSint32ExtensionLite, 0)); + assertEqualsExactType(206L, message.getExtension(repeatedSint64ExtensionLite, 0)); + assertEqualsExactType(207, message.getExtension(repeatedFixed32ExtensionLite, 0)); + assertEqualsExactType(208L, message.getExtension(repeatedFixed64ExtensionLite, 0)); + assertEqualsExactType(209, message.getExtension(repeatedSfixed32ExtensionLite, 0)); + assertEqualsExactType(210L, message.getExtension(repeatedSfixed64ExtensionLite, 0)); + assertEqualsExactType(211F, message.getExtension(repeatedFloatExtensionLite, 0)); + assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtensionLite, 0)); + assertEqualsExactType(true, message.getExtension(repeatedBoolExtensionLite, 0)); + assertEqualsExactType("215", message.getExtension(repeatedStringExtensionLite, 0)); assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtensionLite, 0)); - assertEqualsExactType(217, message.getExtension(repeatedGroupExtensionLite ,0).getA()); - assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtensionLite ,0).getBb()); - assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtensionLite,0).getC()); - assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtensionLite ,0).getD()); - assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtensionLite ,0).getBb()); + assertEqualsExactType(217, message.getExtension(repeatedGroupExtensionLite, 0).getA()); + assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtensionLite, 0).getBb()); + assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtensionLite, 0).getC()); + assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtensionLite, 0).getD()); + assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtensionLite, 0).getBb()); - assertEqualsExactType(TestAllTypesLite.NestedEnum.BAR, - message.getExtension(repeatedNestedEnumExtensionLite, 0)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAR, - message.getExtension(repeatedForeignEnumExtensionLite, 0)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_BAR, - message.getExtension(repeatedImportEnumExtensionLite, 0)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtensionLite, 0)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAR, + message.getExtension(repeatedForeignEnumExtensionLite, 0)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_BAR, message.getExtension(repeatedImportEnumExtensionLite, 0)); assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtensionLite, 0)); assertEqualsExactType("225", message.getExtension(repeatedCordExtensionLite, 0)); // Actually verify the second (modified) elements now. - assertEqualsExactType(501 , message.getExtension(repeatedInt32ExtensionLite , 1)); - assertEqualsExactType(502L , message.getExtension(repeatedInt64ExtensionLite , 1)); - assertEqualsExactType(503 , message.getExtension(repeatedUint32ExtensionLite , 1)); - assertEqualsExactType(504L , message.getExtension(repeatedUint64ExtensionLite , 1)); - assertEqualsExactType(505 , message.getExtension(repeatedSint32ExtensionLite , 1)); - assertEqualsExactType(506L , message.getExtension(repeatedSint64ExtensionLite , 1)); - assertEqualsExactType(507 , message.getExtension(repeatedFixed32ExtensionLite , 1)); - assertEqualsExactType(508L , message.getExtension(repeatedFixed64ExtensionLite , 1)); - assertEqualsExactType(509 , message.getExtension(repeatedSfixed32ExtensionLite, 1)); - assertEqualsExactType(510L , message.getExtension(repeatedSfixed64ExtensionLite, 1)); - assertEqualsExactType(511F , message.getExtension(repeatedFloatExtensionLite , 1)); - assertEqualsExactType(512D , message.getExtension(repeatedDoubleExtensionLite , 1)); - assertEqualsExactType(true , message.getExtension(repeatedBoolExtensionLite , 1)); - assertEqualsExactType("515", message.getExtension(repeatedStringExtensionLite , 1)); + assertEqualsExactType(501, message.getExtension(repeatedInt32ExtensionLite, 1)); + assertEqualsExactType(502L, message.getExtension(repeatedInt64ExtensionLite, 1)); + assertEqualsExactType(503, message.getExtension(repeatedUint32ExtensionLite, 1)); + assertEqualsExactType(504L, message.getExtension(repeatedUint64ExtensionLite, 1)); + assertEqualsExactType(505, message.getExtension(repeatedSint32ExtensionLite, 1)); + assertEqualsExactType(506L, message.getExtension(repeatedSint64ExtensionLite, 1)); + assertEqualsExactType(507, message.getExtension(repeatedFixed32ExtensionLite, 1)); + assertEqualsExactType(508L, message.getExtension(repeatedFixed64ExtensionLite, 1)); + assertEqualsExactType(509, message.getExtension(repeatedSfixed32ExtensionLite, 1)); + assertEqualsExactType(510L, message.getExtension(repeatedSfixed64ExtensionLite, 1)); + assertEqualsExactType(511F, message.getExtension(repeatedFloatExtensionLite, 1)); + assertEqualsExactType(512D, message.getExtension(repeatedDoubleExtensionLite, 1)); + assertEqualsExactType(true, message.getExtension(repeatedBoolExtensionLite, 1)); + assertEqualsExactType("515", message.getExtension(repeatedStringExtensionLite, 1)); assertEqualsExactType(toBytes("516"), message.getExtension(repeatedBytesExtensionLite, 1)); - assertEqualsExactType(517, message.getExtension(repeatedGroupExtensionLite ,1).getA()); - assertEqualsExactType(518, message.getExtension(repeatedNestedMessageExtensionLite ,1).getBb()); - assertEqualsExactType(519, message.getExtension(repeatedForeignMessageExtensionLite,1).getC()); - assertEqualsExactType(520, message.getExtension(repeatedImportMessageExtensionLite ,1).getD()); - assertEqualsExactType(527, message.getExtension(repeatedLazyMessageExtensionLite ,1).getBb()); + assertEqualsExactType(517, message.getExtension(repeatedGroupExtensionLite, 1).getA()); + assertEqualsExactType(518, message.getExtension(repeatedNestedMessageExtensionLite, 1).getBb()); + assertEqualsExactType(519, message.getExtension(repeatedForeignMessageExtensionLite, 1).getC()); + assertEqualsExactType(520, message.getExtension(repeatedImportMessageExtensionLite, 1).getD()); + assertEqualsExactType(527, message.getExtension(repeatedLazyMessageExtensionLite, 1).getBb()); - assertEqualsExactType(TestAllTypesLite.NestedEnum.FOO, - message.getExtension(repeatedNestedEnumExtensionLite, 1)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_FOO, - message.getExtension(repeatedForeignEnumExtensionLite, 1)); - assertEqualsExactType(ImportEnumLite.IMPORT_LITE_FOO, - message.getExtension(repeatedImportEnumExtensionLite, 1)); + assertEqualsExactType( + TestAllTypesLite.NestedEnum.FOO, message.getExtension(repeatedNestedEnumExtensionLite, 1)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_FOO, + message.getExtension(repeatedForeignEnumExtensionLite, 1)); + assertEqualsExactType( + ImportEnumLite.IMPORT_LITE_FOO, message.getExtension(repeatedImportEnumExtensionLite, 1)); assertEqualsExactType("524", message.getExtension(repeatedStringPieceExtensionLite, 1)); assertEqualsExactType("525", message.getExtension(repeatedCordExtensionLite, 1)); } public static void assertPackedExtensionsSet(TestPackedExtensionsLite message) { - Assert.assertEquals(2, message.getExtensionCount(packedInt32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedInt64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedUint32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedUint64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedSint32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedSint64ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedFixed32ExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedFixed64ExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(packedInt32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedInt64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedUint32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedUint64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedSint32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedSint64ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedFixed32ExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedFixed64ExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(packedSfixed32ExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(packedSfixed64ExtensionLite)); - Assert.assertEquals(2, message.getExtensionCount(packedFloatExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedDoubleExtensionLite )); - Assert.assertEquals(2, message.getExtensionCount(packedBoolExtensionLite )); + Assert.assertEquals(2, message.getExtensionCount(packedFloatExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedDoubleExtensionLite)); + Assert.assertEquals(2, message.getExtensionCount(packedBoolExtensionLite)); Assert.assertEquals(2, message.getExtensionCount(packedEnumExtensionLite)); - assertEqualsExactType(601 , message.getExtension(packedInt32ExtensionLite , 0)); - assertEqualsExactType(602L , message.getExtension(packedInt64ExtensionLite , 0)); - assertEqualsExactType(603 , message.getExtension(packedUint32ExtensionLite , 0)); - assertEqualsExactType(604L , message.getExtension(packedUint64ExtensionLite , 0)); - assertEqualsExactType(605 , message.getExtension(packedSint32ExtensionLite , 0)); - assertEqualsExactType(606L , message.getExtension(packedSint64ExtensionLite , 0)); - assertEqualsExactType(607 , message.getExtension(packedFixed32ExtensionLite , 0)); - assertEqualsExactType(608L , message.getExtension(packedFixed64ExtensionLite , 0)); - assertEqualsExactType(609 , message.getExtension(packedSfixed32ExtensionLite, 0)); - assertEqualsExactType(610L , message.getExtension(packedSfixed64ExtensionLite, 0)); - assertEqualsExactType(611F , message.getExtension(packedFloatExtensionLite , 0)); - assertEqualsExactType(612D , message.getExtension(packedDoubleExtensionLite , 0)); - assertEqualsExactType(true , message.getExtension(packedBoolExtensionLite , 0)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAR, - message.getExtension(packedEnumExtensionLite, 0)); - assertEqualsExactType(701 , message.getExtension(packedInt32ExtensionLite , 1)); - assertEqualsExactType(702L , message.getExtension(packedInt64ExtensionLite , 1)); - assertEqualsExactType(703 , message.getExtension(packedUint32ExtensionLite , 1)); - assertEqualsExactType(704L , message.getExtension(packedUint64ExtensionLite , 1)); - assertEqualsExactType(705 , message.getExtension(packedSint32ExtensionLite , 1)); - assertEqualsExactType(706L , message.getExtension(packedSint64ExtensionLite , 1)); - assertEqualsExactType(707 , message.getExtension(packedFixed32ExtensionLite , 1)); - assertEqualsExactType(708L , message.getExtension(packedFixed64ExtensionLite , 1)); - assertEqualsExactType(709 , message.getExtension(packedSfixed32ExtensionLite, 1)); - assertEqualsExactType(710L , message.getExtension(packedSfixed64ExtensionLite, 1)); - assertEqualsExactType(711F , message.getExtension(packedFloatExtensionLite , 1)); - assertEqualsExactType(712D , message.getExtension(packedDoubleExtensionLite , 1)); - assertEqualsExactType(false, message.getExtension(packedBoolExtensionLite , 1)); - assertEqualsExactType(ForeignEnumLite.FOREIGN_LITE_BAZ, - message.getExtension(packedEnumExtensionLite, 1)); + assertEqualsExactType(601, message.getExtension(packedInt32ExtensionLite, 0)); + assertEqualsExactType(602L, message.getExtension(packedInt64ExtensionLite, 0)); + assertEqualsExactType(603, message.getExtension(packedUint32ExtensionLite, 0)); + assertEqualsExactType(604L, message.getExtension(packedUint64ExtensionLite, 0)); + assertEqualsExactType(605, message.getExtension(packedSint32ExtensionLite, 0)); + assertEqualsExactType(606L, message.getExtension(packedSint64ExtensionLite, 0)); + assertEqualsExactType(607, message.getExtension(packedFixed32ExtensionLite, 0)); + assertEqualsExactType(608L, message.getExtension(packedFixed64ExtensionLite, 0)); + assertEqualsExactType(609, message.getExtension(packedSfixed32ExtensionLite, 0)); + assertEqualsExactType(610L, message.getExtension(packedSfixed64ExtensionLite, 0)); + assertEqualsExactType(611F, message.getExtension(packedFloatExtensionLite, 0)); + assertEqualsExactType(612D, message.getExtension(packedDoubleExtensionLite, 0)); + assertEqualsExactType(true, message.getExtension(packedBoolExtensionLite, 0)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAR, message.getExtension(packedEnumExtensionLite, 0)); + assertEqualsExactType(701, message.getExtension(packedInt32ExtensionLite, 1)); + assertEqualsExactType(702L, message.getExtension(packedInt64ExtensionLite, 1)); + assertEqualsExactType(703, message.getExtension(packedUint32ExtensionLite, 1)); + assertEqualsExactType(704L, message.getExtension(packedUint64ExtensionLite, 1)); + assertEqualsExactType(705, message.getExtension(packedSint32ExtensionLite, 1)); + assertEqualsExactType(706L, message.getExtension(packedSint64ExtensionLite, 1)); + assertEqualsExactType(707, message.getExtension(packedFixed32ExtensionLite, 1)); + assertEqualsExactType(708L, message.getExtension(packedFixed64ExtensionLite, 1)); + assertEqualsExactType(709, message.getExtension(packedSfixed32ExtensionLite, 1)); + assertEqualsExactType(710L, message.getExtension(packedSfixed64ExtensionLite, 1)); + assertEqualsExactType(711F, message.getExtension(packedFloatExtensionLite, 1)); + assertEqualsExactType(712D, message.getExtension(packedDoubleExtensionLite, 1)); + assertEqualsExactType(false, message.getExtension(packedBoolExtensionLite, 1)); + assertEqualsExactType( + ForeignEnumLite.FOREIGN_LITE_BAZ, message.getExtension(packedEnumExtensionLite, 1)); } // =================================================================== // oneof public static void setOneof(TestOneof2.Builder message) { - message.setFooLazyMessage( - TestOneof2.NestedMessage.newBuilder().setQuxInt(100).build()); + message.setFooLazyMessage(TestOneof2.NestedMessage.newBuilder().setQuxInt(100).build()); message.setBarString("101"); message.setBazInt(102); message.setBazString("103"); } public static void assertOneofSet(TestOneof2 message) { - Assert.assertTrue(message.hasFooLazyMessage ()); + Assert.assertTrue(message.hasFooLazyMessage()); Assert.assertTrue(message.getFooLazyMessage().hasQuxInt()); Assert.assertTrue(message.hasBarString()); - Assert.assertTrue(message.hasBazInt ()); + Assert.assertTrue(message.hasBazInt()); Assert.assertTrue(message.hasBazString()); - Assert.assertEquals(100 , message.getFooLazyMessage().getQuxInt()); - Assert.assertEquals("101", message.getBarString ()); - Assert.assertEquals(102 , message.getBazInt ()); - Assert.assertEquals("103", message.getBazString ()); + Assert.assertEquals(100, message.getFooLazyMessage().getQuxInt()); + Assert.assertEquals("101", message.getBarString()); + Assert.assertEquals(102, message.getBazInt()); + Assert.assertEquals("103", message.getBazString()); } public static void assertAtMostOneFieldSetOneof(TestOneof2 message) { int count = 0; - if (message.hasFooInt()) { ++count; } - if (message.hasFooString()) { ++count; } - if (message.hasFooCord()) { ++count; } - if (message.hasFooStringPiece()) { ++count; } - if (message.hasFooBytes()) { ++count; } - if (message.hasFooEnum()) { ++count; } - if (message.hasFooMessage()) { ++count; } - if (message.hasFooGroup()) { ++count; } - if (message.hasFooLazyMessage()) { ++count; } + if (message.hasFooInt()) { + ++count; + } + if (message.hasFooString()) { + ++count; + } + if (message.hasFooCord()) { + ++count; + } + if (message.hasFooStringPiece()) { + ++count; + } + if (message.hasFooBytes()) { + ++count; + } + if (message.hasFooEnum()) { + ++count; + } + if (message.hasFooMessage()) { + ++count; + } + if (message.hasFooGroup()) { + ++count; + } + if (message.hasFooLazyMessage()) { + ++count; + } Assert.assertTrue(count <= 1); count = 0; - if (message.hasBarInt()) { ++count; } - if (message.hasBarString()) { ++count; } - if (message.hasBarCord()) { ++count; } - if (message.hasBarStringPiece()) { ++count; } - if (message.hasBarBytes()) { ++count; } - if (message.hasBarEnum()) { ++count; } + if (message.hasBarInt()) { + ++count; + } + if (message.hasBarString()) { + ++count; + } + if (message.hasBarCord()) { + ++count; + } + if (message.hasBarStringPiece()) { + ++count; + } + if (message.hasBarBytes()) { + ++count; + } + if (message.hasBarEnum()) { + ++count; + } Assert.assertTrue(count <= 1); switch (message.getFooCase()) { @@ -2634,11 +2640,11 @@ public final class TestUtil { } // ================================================================= + // BEGIN FULL-RUNTIME /** - * Performs the same things that the methods of {@code TestUtil} do, but - * via the reflection interface. This is its own class because it needs - * to know what descriptor to use. + * Performs the same things that the methods of {@code TestUtil} do, but via the reflection + * interface. This is its own class because it needs to know what descriptor to use. */ public static class ReflectionTester { private final Descriptors.Descriptor baseDescriptor; @@ -2677,20 +2683,16 @@ public final class TestUtil { private final Descriptors.EnumValueDescriptor importBaz; /** - * Construct a {@code ReflectionTester} that will expect messages using - * the given descriptor. + * Construct a {@code ReflectionTester} that will expect messages using the given descriptor. * - * Normally {@code baseDescriptor} should be a descriptor for the type - * {@code TestAllTypes}, defined in - * {@code google/protobuf/unittest.proto}. However, if - * {@code extensionRegistry} is non-null, then {@code baseDescriptor} should - * be for {@code TestAllExtensions} instead, and instead of reading and - * writing normal fields, the tester will read and write extensions. - * All of {@code TestAllExtensions}' extensions must be registered in the - * registry. + * <p>Normally {@code baseDescriptor} should be a descriptor for the type {@code TestAllTypes}, + * defined in {@code google/protobuf/unittest.proto}. However, if {@code extensionRegistry} + * is non-null, then {@code baseDescriptor} should be for {@code TestAllExtensions} instead, and + * instead of reading and writing normal fields, the tester will read and write extensions. All + * of {@code TestAllExtensions}' extensions must be registered in the registry. */ - public ReflectionTester(Descriptors.Descriptor baseDescriptor, - ExtensionRegistry extensionRegistry) { + public ReflectionTester( + Descriptors.Descriptor baseDescriptor, ExtensionRegistry extensionRegistry) { this.baseDescriptor = baseDescriptor; this.extensionRegistry = extensionRegistry; @@ -2711,39 +2713,34 @@ public final class TestUtil { // Use testAllTypes, rather than baseDescriptor, to allow // initialization using TestPackedTypes descriptors. These objects // won't be used by the methods for packed fields. - this.optionalGroup = - testAllTypes.findNestedTypeByName("OptionalGroup"); - this.repeatedGroup = - testAllTypes.findNestedTypeByName("RepeatedGroup"); + this.optionalGroup = testAllTypes.findNestedTypeByName("OptionalGroup"); + this.repeatedGroup = testAllTypes.findNestedTypeByName("RepeatedGroup"); } else { - this.optionalGroup = - file.findMessageTypeByName("OptionalGroup_extension"); - this.repeatedGroup = - file.findMessageTypeByName("RepeatedGroup_extension"); + this.optionalGroup = file.findMessageTypeByName("OptionalGroup_extension"); + this.repeatedGroup = file.findMessageTypeByName("RepeatedGroup_extension"); } this.nestedMessage = testAllTypes.findNestedTypeByName("NestedMessage"); this.foreignMessage = file.findMessageTypeByName("ForeignMessage"); this.importMessage = importFile.findMessageTypeByName("ImportMessage"); - this.publicImportMessage = publicImportFile.findMessageTypeByName( - "PublicImportMessage"); + this.publicImportMessage = publicImportFile.findMessageTypeByName("PublicImportMessage"); this.nestedEnum = testAllTypes.findEnumTypeByName("NestedEnum"); this.foreignEnum = file.findEnumTypeByName("ForeignEnum"); this.importEnum = importFile.findEnumTypeByName("ImportEnum"); - Assert.assertNotNull(optionalGroup ); - Assert.assertNotNull(repeatedGroup ); - Assert.assertNotNull(nestedMessage ); + Assert.assertNotNull(optionalGroup); + Assert.assertNotNull(repeatedGroup); + Assert.assertNotNull(nestedMessage); Assert.assertNotNull(foreignMessage); - Assert.assertNotNull(importMessage ); - Assert.assertNotNull(nestedEnum ); - Assert.assertNotNull(foreignEnum ); - Assert.assertNotNull(importEnum ); + Assert.assertNotNull(importMessage); + Assert.assertNotNull(nestedEnum); + Assert.assertNotNull(foreignEnum); + Assert.assertNotNull(importEnum); - this.nestedB = nestedMessage .findFieldByName("bb"); + this.nestedB = nestedMessage.findFieldByName("bb"); this.foreignC = foreignMessage.findFieldByName("c"); - this.importD = importMessage .findFieldByName("d"); - this.importE = publicImportMessage.findFieldByName("e"); + this.importD = importMessage.findFieldByName("d"); + this.importE = publicImportMessage.findFieldByName("e"); this.nestedFoo = nestedEnum.findValueByName("FOO"); this.nestedBar = nestedEnum.findValueByName("BAR"); this.nestedBaz = nestedEnum.findValueByName("BAZ"); @@ -2757,26 +2754,24 @@ public final class TestUtil { this.groupA = optionalGroup.findFieldByName("a"); this.repeatedGroupA = repeatedGroup.findFieldByName("a"); - Assert.assertNotNull(groupA ); + Assert.assertNotNull(groupA); Assert.assertNotNull(repeatedGroupA); - Assert.assertNotNull(nestedB ); - Assert.assertNotNull(foreignC ); - Assert.assertNotNull(importD ); - Assert.assertNotNull(importE ); - Assert.assertNotNull(nestedFoo ); - Assert.assertNotNull(nestedBar ); - Assert.assertNotNull(nestedBaz ); - Assert.assertNotNull(foreignFoo ); - Assert.assertNotNull(foreignBar ); - Assert.assertNotNull(foreignBaz ); - Assert.assertNotNull(importFoo ); - Assert.assertNotNull(importBar ); - Assert.assertNotNull(importBaz ); + Assert.assertNotNull(nestedB); + Assert.assertNotNull(foreignC); + Assert.assertNotNull(importD); + Assert.assertNotNull(importE); + Assert.assertNotNull(nestedFoo); + Assert.assertNotNull(nestedBar); + Assert.assertNotNull(nestedBaz); + Assert.assertNotNull(foreignFoo); + Assert.assertNotNull(foreignBar); + Assert.assertNotNull(foreignBaz); + Assert.assertNotNull(importFoo); + Assert.assertNotNull(importBar); + Assert.assertNotNull(importBaz); } - /** - * Shorthand to get a FieldDescriptor for a field of unittest::TestAllTypes. - */ + /** Shorthand to get a FieldDescriptor for a field of unittest::TestAllTypes. */ private Descriptors.FieldDescriptor f(String name) { Descriptors.FieldDescriptor result; if (extensionRegistry == null) { @@ -2789,9 +2784,8 @@ public final class TestUtil { } /** - * Calls {@code parent.newBuilderForField()} or uses the - * {@code ExtensionRegistry} to find an appropriate builder, depending - * on what type is being tested. + * Calls {@code parent.newBuilderForField()} or uses the {@code ExtensionRegistry} to find an + * appropriate builder, depending on what type is being tested. */ private Message.Builder newBuilderForField( Message.Builder parent, Descriptors.FieldDescriptor field) { @@ -2799,8 +2793,8 @@ public final class TestUtil { return parent.newBuilderForField(field); } else { ExtensionRegistry.ExtensionInfo extension = - extensionRegistry.findImmutableExtensionByNumber( - field.getContainingType(), field.getNumber()); + extensionRegistry.findImmutableExtensionByNumber( + field.getContainingType(), field.getNumber()); Assert.assertNotNull(extension); Assert.assertNotNull(extension.defaultInstance); return extension.defaultInstance.newBuilderForType(); @@ -2810,210 +2804,223 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Set every field of {@code message} to the values expected by - * {@code assertAllFieldsSet()}, using the {@link Message.Builder} - * reflection interface. + * Set every field of {@code message} to the values expected by {@code assertAllFieldsSet()}, + * using the {@link Message.Builder} reflection interface. */ void setAllFieldsViaReflection(Message.Builder message) { - message.setField(f("optional_int32" ), 101 ); - message.setField(f("optional_int64" ), 102L); - message.setField(f("optional_uint32" ), 103 ); - message.setField(f("optional_uint64" ), 104L); - message.setField(f("optional_sint32" ), 105 ); - message.setField(f("optional_sint64" ), 106L); - message.setField(f("optional_fixed32" ), 107 ); - message.setField(f("optional_fixed64" ), 108L); - message.setField(f("optional_sfixed32"), 109 ); + message.setField(f("optional_int32"), 101); + message.setField(f("optional_int64"), 102L); + message.setField(f("optional_uint32"), 103); + message.setField(f("optional_uint64"), 104L); + message.setField(f("optional_sint32"), 105); + message.setField(f("optional_sint64"), 106L); + message.setField(f("optional_fixed32"), 107); + message.setField(f("optional_fixed64"), 108L); + message.setField(f("optional_sfixed32"), 109); message.setField(f("optional_sfixed64"), 110L); - message.setField(f("optional_float" ), 111F); - message.setField(f("optional_double" ), 112D); - message.setField(f("optional_bool" ), true); - message.setField(f("optional_string" ), "115"); - message.setField(f("optional_bytes" ), toBytes("116")); - - message.setField(f("optionalgroup"), - newBuilderForField(message, f("optionalgroup")) - .setField(groupA, 117).build()); - message.setField(f("optional_nested_message"), - newBuilderForField(message, f("optional_nested_message")) - .setField(nestedB, 118).build()); - message.setField(f("optional_foreign_message"), - newBuilderForField(message, f("optional_foreign_message")) - .setField(foreignC, 119).build()); - message.setField(f("optional_import_message"), - newBuilderForField(message, f("optional_import_message")) - .setField(importD, 120).build()); - message.setField(f("optional_public_import_message"), - newBuilderForField(message, f("optional_public_import_message")) - .setField(importE, 126).build()); - message.setField(f("optional_lazy_message"), - newBuilderForField(message, f("optional_lazy_message")) - .setField(nestedB, 127).build()); - - message.setField(f("optional_nested_enum" ), nestedBaz); + message.setField(f("optional_float"), 111F); + message.setField(f("optional_double"), 112D); + message.setField(f("optional_bool"), true); + message.setField(f("optional_string"), "115"); + message.setField(f("optional_bytes"), toBytes("116")); + + message.setField( + f("optionalgroup"), + newBuilderForField(message, f("optionalgroup")).setField(groupA, 117).build()); + message.setField( + f("optional_nested_message"), + newBuilderForField(message, f("optional_nested_message")).setField(nestedB, 118).build()); + message.setField( + f("optional_foreign_message"), + newBuilderForField(message, f("optional_foreign_message")) + .setField(foreignC, 119) + .build()); + message.setField( + f("optional_import_message"), + newBuilderForField(message, f("optional_import_message")).setField(importD, 120).build()); + message.setField( + f("optional_public_import_message"), + newBuilderForField(message, f("optional_public_import_message")) + .setField(importE, 126) + .build()); + message.setField( + f("optional_lazy_message"), + newBuilderForField(message, f("optional_lazy_message")).setField(nestedB, 127).build()); + + message.setField(f("optional_nested_enum"), nestedBaz); message.setField(f("optional_foreign_enum"), foreignBaz); - message.setField(f("optional_import_enum" ), importBaz); + message.setField(f("optional_import_enum"), importBaz); - message.setField(f("optional_string_piece" ), "124"); - message.setField(f("optional_cord" ), "125"); + message.setField(f("optional_string_piece"), "124"); + message.setField(f("optional_cord"), "125"); // ----------------------------------------------------------------- - message.addRepeatedField(f("repeated_int32" ), 201 ); - message.addRepeatedField(f("repeated_int64" ), 202L); - message.addRepeatedField(f("repeated_uint32" ), 203 ); - message.addRepeatedField(f("repeated_uint64" ), 204L); - message.addRepeatedField(f("repeated_sint32" ), 205 ); - message.addRepeatedField(f("repeated_sint64" ), 206L); - message.addRepeatedField(f("repeated_fixed32" ), 207 ); - message.addRepeatedField(f("repeated_fixed64" ), 208L); - message.addRepeatedField(f("repeated_sfixed32"), 209 ); + message.addRepeatedField(f("repeated_int32"), 201); + message.addRepeatedField(f("repeated_int64"), 202L); + message.addRepeatedField(f("repeated_uint32"), 203); + message.addRepeatedField(f("repeated_uint64"), 204L); + message.addRepeatedField(f("repeated_sint32"), 205); + message.addRepeatedField(f("repeated_sint64"), 206L); + message.addRepeatedField(f("repeated_fixed32"), 207); + message.addRepeatedField(f("repeated_fixed64"), 208L); + message.addRepeatedField(f("repeated_sfixed32"), 209); message.addRepeatedField(f("repeated_sfixed64"), 210L); - message.addRepeatedField(f("repeated_float" ), 211F); - message.addRepeatedField(f("repeated_double" ), 212D); - message.addRepeatedField(f("repeated_bool" ), true); - message.addRepeatedField(f("repeated_string" ), "215"); - message.addRepeatedField(f("repeated_bytes" ), toBytes("216")); - - message.addRepeatedField(f("repeatedgroup"), - newBuilderForField(message, f("repeatedgroup")) - .setField(repeatedGroupA, 217).build()); - message.addRepeatedField(f("repeated_nested_message"), - newBuilderForField(message, f("repeated_nested_message")) - .setField(nestedB, 218).build()); - message.addRepeatedField(f("repeated_foreign_message"), - newBuilderForField(message, f("repeated_foreign_message")) - .setField(foreignC, 219).build()); - message.addRepeatedField(f("repeated_import_message"), - newBuilderForField(message, f("repeated_import_message")) - .setField(importD, 220).build()); - message.addRepeatedField(f("repeated_lazy_message"), - newBuilderForField(message, f("repeated_lazy_message")) - .setField(nestedB, 227).build()); - - message.addRepeatedField(f("repeated_nested_enum" ), nestedBar); + message.addRepeatedField(f("repeated_float"), 211F); + message.addRepeatedField(f("repeated_double"), 212D); + message.addRepeatedField(f("repeated_bool"), true); + message.addRepeatedField(f("repeated_string"), "215"); + message.addRepeatedField(f("repeated_bytes"), toBytes("216")); + + message.addRepeatedField( + f("repeatedgroup"), + newBuilderForField(message, f("repeatedgroup")).setField(repeatedGroupA, 217).build()); + message.addRepeatedField( + f("repeated_nested_message"), + newBuilderForField(message, f("repeated_nested_message")).setField(nestedB, 218).build()); + message.addRepeatedField( + f("repeated_foreign_message"), + newBuilderForField(message, f("repeated_foreign_message")) + .setField(foreignC, 219) + .build()); + message.addRepeatedField( + f("repeated_import_message"), + newBuilderForField(message, f("repeated_import_message")).setField(importD, 220).build()); + message.addRepeatedField( + f("repeated_lazy_message"), + newBuilderForField(message, f("repeated_lazy_message")).setField(nestedB, 227).build()); + + message.addRepeatedField(f("repeated_nested_enum"), nestedBar); message.addRepeatedField(f("repeated_foreign_enum"), foreignBar); - message.addRepeatedField(f("repeated_import_enum" ), importBar); + message.addRepeatedField(f("repeated_import_enum"), importBar); - message.addRepeatedField(f("repeated_string_piece" ), "224"); - message.addRepeatedField(f("repeated_cord" ), "225"); + message.addRepeatedField(f("repeated_string_piece"), "224"); + message.addRepeatedField(f("repeated_cord"), "225"); // Add a second one of each field. - message.addRepeatedField(f("repeated_int32" ), 301 ); - message.addRepeatedField(f("repeated_int64" ), 302L); - message.addRepeatedField(f("repeated_uint32" ), 303 ); - message.addRepeatedField(f("repeated_uint64" ), 304L); - message.addRepeatedField(f("repeated_sint32" ), 305 ); - message.addRepeatedField(f("repeated_sint64" ), 306L); - message.addRepeatedField(f("repeated_fixed32" ), 307 ); - message.addRepeatedField(f("repeated_fixed64" ), 308L); - message.addRepeatedField(f("repeated_sfixed32"), 309 ); + message.addRepeatedField(f("repeated_int32"), 301); + message.addRepeatedField(f("repeated_int64"), 302L); + message.addRepeatedField(f("repeated_uint32"), 303); + message.addRepeatedField(f("repeated_uint64"), 304L); + message.addRepeatedField(f("repeated_sint32"), 305); + message.addRepeatedField(f("repeated_sint64"), 306L); + message.addRepeatedField(f("repeated_fixed32"), 307); + message.addRepeatedField(f("repeated_fixed64"), 308L); + message.addRepeatedField(f("repeated_sfixed32"), 309); message.addRepeatedField(f("repeated_sfixed64"), 310L); - message.addRepeatedField(f("repeated_float" ), 311F); - message.addRepeatedField(f("repeated_double" ), 312D); - message.addRepeatedField(f("repeated_bool" ), false); - message.addRepeatedField(f("repeated_string" ), "315"); - message.addRepeatedField(f("repeated_bytes" ), toBytes("316")); - - message.addRepeatedField(f("repeatedgroup"), - newBuilderForField(message, f("repeatedgroup")) - .setField(repeatedGroupA, 317).build()); - message.addRepeatedField(f("repeated_nested_message"), - newBuilderForField(message, f("repeated_nested_message")) - .setField(nestedB, 318).build()); - message.addRepeatedField(f("repeated_foreign_message"), - newBuilderForField(message, f("repeated_foreign_message")) - .setField(foreignC, 319).build()); - message.addRepeatedField(f("repeated_import_message"), - newBuilderForField(message, f("repeated_import_message")) - .setField(importD, 320).build()); - message.addRepeatedField(f("repeated_lazy_message"), - newBuilderForField(message, f("repeated_lazy_message")) - .setField(nestedB, 327).build()); - - message.addRepeatedField(f("repeated_nested_enum" ), nestedBaz); + message.addRepeatedField(f("repeated_float"), 311F); + message.addRepeatedField(f("repeated_double"), 312D); + message.addRepeatedField(f("repeated_bool"), false); + message.addRepeatedField(f("repeated_string"), "315"); + message.addRepeatedField(f("repeated_bytes"), toBytes("316")); + + message.addRepeatedField( + f("repeatedgroup"), + newBuilderForField(message, f("repeatedgroup")).setField(repeatedGroupA, 317).build()); + message.addRepeatedField( + f("repeated_nested_message"), + newBuilderForField(message, f("repeated_nested_message")).setField(nestedB, 318).build()); + message.addRepeatedField( + f("repeated_foreign_message"), + newBuilderForField(message, f("repeated_foreign_message")) + .setField(foreignC, 319) + .build()); + message.addRepeatedField( + f("repeated_import_message"), + newBuilderForField(message, f("repeated_import_message")).setField(importD, 320).build()); + message.addRepeatedField( + f("repeated_lazy_message"), + newBuilderForField(message, f("repeated_lazy_message")).setField(nestedB, 327).build()); + + message.addRepeatedField(f("repeated_nested_enum"), nestedBaz); message.addRepeatedField(f("repeated_foreign_enum"), foreignBaz); - message.addRepeatedField(f("repeated_import_enum" ), importBaz); + message.addRepeatedField(f("repeated_import_enum"), importBaz); - message.addRepeatedField(f("repeated_string_piece" ), "324"); - message.addRepeatedField(f("repeated_cord" ), "325"); + message.addRepeatedField(f("repeated_string_piece"), "324"); + message.addRepeatedField(f("repeated_cord"), "325"); // ----------------------------------------------------------------- - message.setField(f("default_int32" ), 401 ); - message.setField(f("default_int64" ), 402L); - message.setField(f("default_uint32" ), 403 ); - message.setField(f("default_uint64" ), 404L); - message.setField(f("default_sint32" ), 405 ); - message.setField(f("default_sint64" ), 406L); - message.setField(f("default_fixed32" ), 407 ); - message.setField(f("default_fixed64" ), 408L); - message.setField(f("default_sfixed32"), 409 ); + message.setField(f("default_int32"), 401); + message.setField(f("default_int64"), 402L); + message.setField(f("default_uint32"), 403); + message.setField(f("default_uint64"), 404L); + message.setField(f("default_sint32"), 405); + message.setField(f("default_sint64"), 406L); + message.setField(f("default_fixed32"), 407); + message.setField(f("default_fixed64"), 408L); + message.setField(f("default_sfixed32"), 409); message.setField(f("default_sfixed64"), 410L); - message.setField(f("default_float" ), 411F); - message.setField(f("default_double" ), 412D); - message.setField(f("default_bool" ), false); - message.setField(f("default_string" ), "415"); - message.setField(f("default_bytes" ), toBytes("416")); + message.setField(f("default_float"), 411F); + message.setField(f("default_double"), 412D); + message.setField(f("default_bool"), false); + message.setField(f("default_string"), "415"); + message.setField(f("default_bytes"), toBytes("416")); - message.setField(f("default_nested_enum" ), nestedFoo); + message.setField(f("default_nested_enum"), nestedFoo); message.setField(f("default_foreign_enum"), foreignFoo); - message.setField(f("default_import_enum" ), importFoo); + message.setField(f("default_import_enum"), importFoo); - message.setField(f("default_string_piece" ), "424"); - message.setField(f("default_cord" ), "425"); + message.setField(f("default_string_piece"), "424"); + message.setField(f("default_cord"), "425"); - message.setField(f("oneof_uint32" ), 601); - message.setField(f("oneof_nested_message"), - newBuilderForField(message, f("oneof_nested_message")) - .setField(nestedB, 602).build()); - message.setField(f("oneof_string" ), "603"); - message.setField(f("oneof_bytes" ), toBytes("604")); + message.setField(f("oneof_uint32"), 601); + message.setField( + f("oneof_nested_message"), + newBuilderForField(message, f("oneof_nested_message")).setField(nestedB, 602).build()); + message.setField(f("oneof_string"), "603"); + message.setField(f("oneof_bytes"), toBytes("604")); } // ------------------------------------------------------------------- /** - * Modify the repeated fields of {@code message} to contain the values - * expected by {@code assertRepeatedFieldsModified()}, using the - * {@link Message.Builder} reflection interface. + * Modify the repeated fields of {@code message} to contain the values expected by {@code + * assertRepeatedFieldsModified()}, using the {@link Message.Builder} reflection interface. */ void modifyRepeatedFieldsViaReflection(Message.Builder message) { - message.setRepeatedField(f("repeated_int32" ), 1, 501 ); - message.setRepeatedField(f("repeated_int64" ), 1, 502L); - message.setRepeatedField(f("repeated_uint32" ), 1, 503 ); - message.setRepeatedField(f("repeated_uint64" ), 1, 504L); - message.setRepeatedField(f("repeated_sint32" ), 1, 505 ); - message.setRepeatedField(f("repeated_sint64" ), 1, 506L); - message.setRepeatedField(f("repeated_fixed32" ), 1, 507 ); - message.setRepeatedField(f("repeated_fixed64" ), 1, 508L); - message.setRepeatedField(f("repeated_sfixed32"), 1, 509 ); + message.setRepeatedField(f("repeated_int32"), 1, 501); + message.setRepeatedField(f("repeated_int64"), 1, 502L); + message.setRepeatedField(f("repeated_uint32"), 1, 503); + message.setRepeatedField(f("repeated_uint64"), 1, 504L); + message.setRepeatedField(f("repeated_sint32"), 1, 505); + message.setRepeatedField(f("repeated_sint64"), 1, 506L); + message.setRepeatedField(f("repeated_fixed32"), 1, 507); + message.setRepeatedField(f("repeated_fixed64"), 1, 508L); + message.setRepeatedField(f("repeated_sfixed32"), 1, 509); message.setRepeatedField(f("repeated_sfixed64"), 1, 510L); - message.setRepeatedField(f("repeated_float" ), 1, 511F); - message.setRepeatedField(f("repeated_double" ), 1, 512D); - message.setRepeatedField(f("repeated_bool" ), 1, true); - message.setRepeatedField(f("repeated_string" ), 1, "515"); - message.setRepeatedField(f("repeated_bytes" ), 1, toBytes("516")); - - message.setRepeatedField(f("repeatedgroup"), 1, - newBuilderForField(message, f("repeatedgroup")) - .setField(repeatedGroupA, 517).build()); - message.setRepeatedField(f("repeated_nested_message"), 1, - newBuilderForField(message, f("repeated_nested_message")) - .setField(nestedB, 518).build()); - message.setRepeatedField(f("repeated_foreign_message"), 1, - newBuilderForField(message, f("repeated_foreign_message")) - .setField(foreignC, 519).build()); - message.setRepeatedField(f("repeated_import_message"), 1, - newBuilderForField(message, f("repeated_import_message")) - .setField(importD, 520).build()); - message.setRepeatedField(f("repeated_lazy_message"), 1, - newBuilderForField(message, f("repeated_lazy_message")) - .setField(nestedB, 527).build()); - - message.setRepeatedField(f("repeated_nested_enum" ), 1, nestedFoo); + message.setRepeatedField(f("repeated_float"), 1, 511F); + message.setRepeatedField(f("repeated_double"), 1, 512D); + message.setRepeatedField(f("repeated_bool"), 1, true); + message.setRepeatedField(f("repeated_string"), 1, "515"); + message.setRepeatedField(f("repeated_bytes"), 1, toBytes("516")); + + message.setRepeatedField( + f("repeatedgroup"), + 1, + newBuilderForField(message, f("repeatedgroup")).setField(repeatedGroupA, 517).build()); + message.setRepeatedField( + f("repeated_nested_message"), + 1, + newBuilderForField(message, f("repeated_nested_message")).setField(nestedB, 518).build()); + message.setRepeatedField( + f("repeated_foreign_message"), + 1, + newBuilderForField(message, f("repeated_foreign_message")) + .setField(foreignC, 519) + .build()); + message.setRepeatedField( + f("repeated_import_message"), + 1, + newBuilderForField(message, f("repeated_import_message")).setField(importD, 520).build()); + message.setRepeatedField( + f("repeated_lazy_message"), + 1, + newBuilderForField(message, f("repeated_lazy_message")).setField(nestedB, 527).build()); + + message.setRepeatedField(f("repeated_nested_enum"), 1, nestedFoo); message.setRepeatedField(f("repeated_foreign_enum"), 1, foreignFoo); - message.setRepeatedField(f("repeated_import_enum" ), 1, importFoo); + message.setRepeatedField(f("repeated_import_enum"), 1, importFoo); message.setRepeatedField(f("repeated_string_piece"), 1, "524"); message.setRepeatedField(f("repeated_cord"), 1, "525"); @@ -3022,244 +3029,235 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are set to the values assigned by {@code setAllFields}, - * using the {@link Message} reflection interface. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to + * the values assigned by {@code setAllFields}, using the {@link Message} reflection interface. */ public void assertAllFieldsSetViaReflection(MessageOrBuilder message) { - Assert.assertTrue(message.hasField(f("optional_int32" ))); - Assert.assertTrue(message.hasField(f("optional_int64" ))); - Assert.assertTrue(message.hasField(f("optional_uint32" ))); - Assert.assertTrue(message.hasField(f("optional_uint64" ))); - Assert.assertTrue(message.hasField(f("optional_sint32" ))); - Assert.assertTrue(message.hasField(f("optional_sint64" ))); - Assert.assertTrue(message.hasField(f("optional_fixed32" ))); - Assert.assertTrue(message.hasField(f("optional_fixed64" ))); + Assert.assertTrue(message.hasField(f("optional_int32"))); + Assert.assertTrue(message.hasField(f("optional_int64"))); + Assert.assertTrue(message.hasField(f("optional_uint32"))); + Assert.assertTrue(message.hasField(f("optional_uint64"))); + Assert.assertTrue(message.hasField(f("optional_sint32"))); + Assert.assertTrue(message.hasField(f("optional_sint64"))); + Assert.assertTrue(message.hasField(f("optional_fixed32"))); + Assert.assertTrue(message.hasField(f("optional_fixed64"))); Assert.assertTrue(message.hasField(f("optional_sfixed32"))); Assert.assertTrue(message.hasField(f("optional_sfixed64"))); - Assert.assertTrue(message.hasField(f("optional_float" ))); - Assert.assertTrue(message.hasField(f("optional_double" ))); - Assert.assertTrue(message.hasField(f("optional_bool" ))); - Assert.assertTrue(message.hasField(f("optional_string" ))); - Assert.assertTrue(message.hasField(f("optional_bytes" ))); - - Assert.assertTrue(message.hasField(f("optionalgroup" ))); - Assert.assertTrue(message.hasField(f("optional_nested_message" ))); + Assert.assertTrue(message.hasField(f("optional_float"))); + Assert.assertTrue(message.hasField(f("optional_double"))); + Assert.assertTrue(message.hasField(f("optional_bool"))); + Assert.assertTrue(message.hasField(f("optional_string"))); + Assert.assertTrue(message.hasField(f("optional_bytes"))); + + Assert.assertTrue(message.hasField(f("optionalgroup"))); + Assert.assertTrue(message.hasField(f("optional_nested_message"))); Assert.assertTrue(message.hasField(f("optional_foreign_message"))); - Assert.assertTrue(message.hasField(f("optional_import_message" ))); + Assert.assertTrue(message.hasField(f("optional_import_message"))); + Assert.assertTrue(((Message) message.getField(f("optionalgroup"))).hasField(groupA)); Assert.assertTrue( - ((Message)message.getField(f("optionalgroup"))).hasField(groupA)); - Assert.assertTrue( - ((Message)message.getField(f("optional_nested_message"))) - .hasField(nestedB)); + ((Message) message.getField(f("optional_nested_message"))).hasField(nestedB)); Assert.assertTrue( - ((Message)message.getField(f("optional_foreign_message"))) - .hasField(foreignC)); + ((Message) message.getField(f("optional_foreign_message"))).hasField(foreignC)); Assert.assertTrue( - ((Message)message.getField(f("optional_import_message"))) - .hasField(importD)); + ((Message) message.getField(f("optional_import_message"))).hasField(importD)); - Assert.assertTrue(message.hasField(f("optional_nested_enum" ))); + Assert.assertTrue(message.hasField(f("optional_nested_enum"))); Assert.assertTrue(message.hasField(f("optional_foreign_enum"))); - Assert.assertTrue(message.hasField(f("optional_import_enum" ))); + Assert.assertTrue(message.hasField(f("optional_import_enum"))); Assert.assertTrue(message.hasField(f("optional_string_piece"))); Assert.assertTrue(message.hasField(f("optional_cord"))); - Assert.assertEquals(101 , message.getField(f("optional_int32" ))); - Assert.assertEquals(102L , message.getField(f("optional_int64" ))); - Assert.assertEquals(103 , message.getField(f("optional_uint32" ))); - Assert.assertEquals(104L , message.getField(f("optional_uint64" ))); - Assert.assertEquals(105 , message.getField(f("optional_sint32" ))); - Assert.assertEquals(106L , message.getField(f("optional_sint64" ))); - Assert.assertEquals(107 , message.getField(f("optional_fixed32" ))); - Assert.assertEquals(108L , message.getField(f("optional_fixed64" ))); - Assert.assertEquals(109 , message.getField(f("optional_sfixed32"))); - Assert.assertEquals(110L , message.getField(f("optional_sfixed64"))); - Assert.assertEquals(111F , message.getField(f("optional_float" ))); - Assert.assertEquals(112D , message.getField(f("optional_double" ))); - Assert.assertEquals(true , message.getField(f("optional_bool" ))); - Assert.assertEquals("115", message.getField(f("optional_string" ))); + Assert.assertEquals(101, message.getField(f("optional_int32"))); + Assert.assertEquals(102L, message.getField(f("optional_int64"))); + Assert.assertEquals(103, message.getField(f("optional_uint32"))); + Assert.assertEquals(104L, message.getField(f("optional_uint64"))); + Assert.assertEquals(105, message.getField(f("optional_sint32"))); + Assert.assertEquals(106L, message.getField(f("optional_sint64"))); + Assert.assertEquals(107, message.getField(f("optional_fixed32"))); + Assert.assertEquals(108L, message.getField(f("optional_fixed64"))); + Assert.assertEquals(109, message.getField(f("optional_sfixed32"))); + Assert.assertEquals(110L, message.getField(f("optional_sfixed64"))); + Assert.assertEquals(111F, message.getField(f("optional_float"))); + Assert.assertEquals(112D, message.getField(f("optional_double"))); + Assert.assertEquals(true, message.getField(f("optional_bool"))); + Assert.assertEquals("115", message.getField(f("optional_string"))); Assert.assertEquals(toBytes("116"), message.getField(f("optional_bytes"))); - Assert.assertEquals(117, - ((Message)message.getField(f("optionalgroup"))).getField(groupA)); - Assert.assertEquals(118, - ((Message)message.getField(f("optional_nested_message"))) - .getField(nestedB)); - Assert.assertEquals(119, - ((Message)message.getField(f("optional_foreign_message"))) - .getField(foreignC)); - Assert.assertEquals(120, - ((Message)message.getField(f("optional_import_message"))) - .getField(importD)); - Assert.assertEquals(126, - ((Message)message.getField(f("optional_public_import_message"))) - .getField(importE)); - Assert.assertEquals(127, - ((Message)message.getField(f("optional_lazy_message"))) - .getField(nestedB)); - - Assert.assertEquals( nestedBaz, message.getField(f("optional_nested_enum" ))); + Assert.assertEquals(117, ((Message) message.getField(f("optionalgroup"))).getField(groupA)); + Assert.assertEquals( + 118, ((Message) message.getField(f("optional_nested_message"))).getField(nestedB)); + Assert.assertEquals( + 119, ((Message) message.getField(f("optional_foreign_message"))).getField(foreignC)); + Assert.assertEquals( + 120, ((Message) message.getField(f("optional_import_message"))).getField(importD)); + Assert.assertEquals( + 126, ((Message) message.getField(f("optional_public_import_message"))).getField(importE)); + Assert.assertEquals( + 127, ((Message) message.getField(f("optional_lazy_message"))).getField(nestedB)); + + Assert.assertEquals(nestedBaz, message.getField(f("optional_nested_enum"))); Assert.assertEquals(foreignBaz, message.getField(f("optional_foreign_enum"))); - Assert.assertEquals( importBaz, message.getField(f("optional_import_enum" ))); + Assert.assertEquals(importBaz, message.getField(f("optional_import_enum"))); Assert.assertEquals("124", message.getField(f("optional_string_piece"))); Assert.assertEquals("125", message.getField(f("optional_cord"))); // ----------------------------------------------------------------- - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed64" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed64"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed32"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_float" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_double" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bool" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bytes" ))); - - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeatedgroup" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_message" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_float"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_double"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bool"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bytes"))); + + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeatedgroup"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_message"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_message" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_lazy_message" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_enum" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_enum" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_enum" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_message"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_lazy_message"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_enum"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string_piece"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_cord"))); - Assert.assertEquals(201 , message.getRepeatedField(f("repeated_int32" ), 0)); - Assert.assertEquals(202L , message.getRepeatedField(f("repeated_int64" ), 0)); - Assert.assertEquals(203 , message.getRepeatedField(f("repeated_uint32" ), 0)); - Assert.assertEquals(204L , message.getRepeatedField(f("repeated_uint64" ), 0)); - Assert.assertEquals(205 , message.getRepeatedField(f("repeated_sint32" ), 0)); - Assert.assertEquals(206L , message.getRepeatedField(f("repeated_sint64" ), 0)); - Assert.assertEquals(207 , message.getRepeatedField(f("repeated_fixed32" ), 0)); - Assert.assertEquals(208L , message.getRepeatedField(f("repeated_fixed64" ), 0)); - Assert.assertEquals(209 , message.getRepeatedField(f("repeated_sfixed32"), 0)); - Assert.assertEquals(210L , message.getRepeatedField(f("repeated_sfixed64"), 0)); - Assert.assertEquals(211F , message.getRepeatedField(f("repeated_float" ), 0)); - Assert.assertEquals(212D , message.getRepeatedField(f("repeated_double" ), 0)); - Assert.assertEquals(true , message.getRepeatedField(f("repeated_bool" ), 0)); - Assert.assertEquals("215", message.getRepeatedField(f("repeated_string" ), 0)); + Assert.assertEquals(201, message.getRepeatedField(f("repeated_int32"), 0)); + Assert.assertEquals(202L, message.getRepeatedField(f("repeated_int64"), 0)); + Assert.assertEquals(203, message.getRepeatedField(f("repeated_uint32"), 0)); + Assert.assertEquals(204L, message.getRepeatedField(f("repeated_uint64"), 0)); + Assert.assertEquals(205, message.getRepeatedField(f("repeated_sint32"), 0)); + Assert.assertEquals(206L, message.getRepeatedField(f("repeated_sint64"), 0)); + Assert.assertEquals(207, message.getRepeatedField(f("repeated_fixed32"), 0)); + Assert.assertEquals(208L, message.getRepeatedField(f("repeated_fixed64"), 0)); + Assert.assertEquals(209, message.getRepeatedField(f("repeated_sfixed32"), 0)); + Assert.assertEquals(210L, message.getRepeatedField(f("repeated_sfixed64"), 0)); + Assert.assertEquals(211F, message.getRepeatedField(f("repeated_float"), 0)); + Assert.assertEquals(212D, message.getRepeatedField(f("repeated_double"), 0)); + Assert.assertEquals(true, message.getRepeatedField(f("repeated_bool"), 0)); + Assert.assertEquals("215", message.getRepeatedField(f("repeated_string"), 0)); Assert.assertEquals(toBytes("216"), message.getRepeatedField(f("repeated_bytes"), 0)); - Assert.assertEquals(217, - ((Message)message.getRepeatedField(f("repeatedgroup"), 0)) - .getField(repeatedGroupA)); - Assert.assertEquals(218, - ((Message)message.getRepeatedField(f("repeated_nested_message"), 0)) - .getField(nestedB)); - Assert.assertEquals(219, - ((Message)message.getRepeatedField(f("repeated_foreign_message"), 0)) - .getField(foreignC)); - Assert.assertEquals(220, - ((Message)message.getRepeatedField(f("repeated_import_message"), 0)) - .getField(importD)); - Assert.assertEquals(227, - ((Message)message.getRepeatedField(f("repeated_lazy_message"), 0)) - .getField(nestedB)); - - Assert.assertEquals( nestedBar, message.getRepeatedField(f("repeated_nested_enum" ),0)); - Assert.assertEquals(foreignBar, message.getRepeatedField(f("repeated_foreign_enum"),0)); - Assert.assertEquals( importBar, message.getRepeatedField(f("repeated_import_enum" ),0)); + Assert.assertEquals( + 217, + ((Message) message.getRepeatedField(f("repeatedgroup"), 0)).getField(repeatedGroupA)); + Assert.assertEquals( + 218, + ((Message) message.getRepeatedField(f("repeated_nested_message"), 0)).getField(nestedB)); + Assert.assertEquals( + 219, + ((Message) message.getRepeatedField(f("repeated_foreign_message"), 0)) + .getField(foreignC)); + Assert.assertEquals( + 220, + ((Message) message.getRepeatedField(f("repeated_import_message"), 0)).getField(importD)); + Assert.assertEquals( + 227, + ((Message) message.getRepeatedField(f("repeated_lazy_message"), 0)).getField(nestedB)); + + Assert.assertEquals(nestedBar, message.getRepeatedField(f("repeated_nested_enum"), 0)); + Assert.assertEquals(foreignBar, message.getRepeatedField(f("repeated_foreign_enum"), 0)); + Assert.assertEquals(importBar, message.getRepeatedField(f("repeated_import_enum"), 0)); Assert.assertEquals("224", message.getRepeatedField(f("repeated_string_piece"), 0)); Assert.assertEquals("225", message.getRepeatedField(f("repeated_cord"), 0)); - Assert.assertEquals(301 , message.getRepeatedField(f("repeated_int32" ), 1)); - Assert.assertEquals(302L , message.getRepeatedField(f("repeated_int64" ), 1)); - Assert.assertEquals(303 , message.getRepeatedField(f("repeated_uint32" ), 1)); - Assert.assertEquals(304L , message.getRepeatedField(f("repeated_uint64" ), 1)); - Assert.assertEquals(305 , message.getRepeatedField(f("repeated_sint32" ), 1)); - Assert.assertEquals(306L , message.getRepeatedField(f("repeated_sint64" ), 1)); - Assert.assertEquals(307 , message.getRepeatedField(f("repeated_fixed32" ), 1)); - Assert.assertEquals(308L , message.getRepeatedField(f("repeated_fixed64" ), 1)); - Assert.assertEquals(309 , message.getRepeatedField(f("repeated_sfixed32"), 1)); - Assert.assertEquals(310L , message.getRepeatedField(f("repeated_sfixed64"), 1)); - Assert.assertEquals(311F , message.getRepeatedField(f("repeated_float" ), 1)); - Assert.assertEquals(312D , message.getRepeatedField(f("repeated_double" ), 1)); - Assert.assertEquals(false, message.getRepeatedField(f("repeated_bool" ), 1)); - Assert.assertEquals("315", message.getRepeatedField(f("repeated_string" ), 1)); + Assert.assertEquals(301, message.getRepeatedField(f("repeated_int32"), 1)); + Assert.assertEquals(302L, message.getRepeatedField(f("repeated_int64"), 1)); + Assert.assertEquals(303, message.getRepeatedField(f("repeated_uint32"), 1)); + Assert.assertEquals(304L, message.getRepeatedField(f("repeated_uint64"), 1)); + Assert.assertEquals(305, message.getRepeatedField(f("repeated_sint32"), 1)); + Assert.assertEquals(306L, message.getRepeatedField(f("repeated_sint64"), 1)); + Assert.assertEquals(307, message.getRepeatedField(f("repeated_fixed32"), 1)); + Assert.assertEquals(308L, message.getRepeatedField(f("repeated_fixed64"), 1)); + Assert.assertEquals(309, message.getRepeatedField(f("repeated_sfixed32"), 1)); + Assert.assertEquals(310L, message.getRepeatedField(f("repeated_sfixed64"), 1)); + Assert.assertEquals(311F, message.getRepeatedField(f("repeated_float"), 1)); + Assert.assertEquals(312D, message.getRepeatedField(f("repeated_double"), 1)); + Assert.assertEquals(false, message.getRepeatedField(f("repeated_bool"), 1)); + Assert.assertEquals("315", message.getRepeatedField(f("repeated_string"), 1)); Assert.assertEquals(toBytes("316"), message.getRepeatedField(f("repeated_bytes"), 1)); - Assert.assertEquals(317, - ((Message)message.getRepeatedField(f("repeatedgroup"), 1)) - .getField(repeatedGroupA)); - Assert.assertEquals(318, - ((Message)message.getRepeatedField(f("repeated_nested_message"), 1)) - .getField(nestedB)); - Assert.assertEquals(319, - ((Message)message.getRepeatedField(f("repeated_foreign_message"), 1)) - .getField(foreignC)); - Assert.assertEquals(320, - ((Message)message.getRepeatedField(f("repeated_import_message"), 1)) - .getField(importD)); - Assert.assertEquals(327, - ((Message)message.getRepeatedField(f("repeated_lazy_message"), 1)) - .getField(nestedB)); - - Assert.assertEquals( nestedBaz, message.getRepeatedField(f("repeated_nested_enum" ),1)); - Assert.assertEquals(foreignBaz, message.getRepeatedField(f("repeated_foreign_enum"),1)); - Assert.assertEquals( importBaz, message.getRepeatedField(f("repeated_import_enum" ),1)); + Assert.assertEquals( + 317, + ((Message) message.getRepeatedField(f("repeatedgroup"), 1)).getField(repeatedGroupA)); + Assert.assertEquals( + 318, + ((Message) message.getRepeatedField(f("repeated_nested_message"), 1)).getField(nestedB)); + Assert.assertEquals( + 319, + ((Message) message.getRepeatedField(f("repeated_foreign_message"), 1)) + .getField(foreignC)); + Assert.assertEquals( + 320, + ((Message) message.getRepeatedField(f("repeated_import_message"), 1)).getField(importD)); + Assert.assertEquals( + 327, + ((Message) message.getRepeatedField(f("repeated_lazy_message"), 1)).getField(nestedB)); + + Assert.assertEquals(nestedBaz, message.getRepeatedField(f("repeated_nested_enum"), 1)); + Assert.assertEquals(foreignBaz, message.getRepeatedField(f("repeated_foreign_enum"), 1)); + Assert.assertEquals(importBaz, message.getRepeatedField(f("repeated_import_enum"), 1)); Assert.assertEquals("324", message.getRepeatedField(f("repeated_string_piece"), 1)); Assert.assertEquals("325", message.getRepeatedField(f("repeated_cord"), 1)); // ----------------------------------------------------------------- - Assert.assertTrue(message.hasField(f("default_int32" ))); - Assert.assertTrue(message.hasField(f("default_int64" ))); - Assert.assertTrue(message.hasField(f("default_uint32" ))); - Assert.assertTrue(message.hasField(f("default_uint64" ))); - Assert.assertTrue(message.hasField(f("default_sint32" ))); - Assert.assertTrue(message.hasField(f("default_sint64" ))); - Assert.assertTrue(message.hasField(f("default_fixed32" ))); - Assert.assertTrue(message.hasField(f("default_fixed64" ))); + Assert.assertTrue(message.hasField(f("default_int32"))); + Assert.assertTrue(message.hasField(f("default_int64"))); + Assert.assertTrue(message.hasField(f("default_uint32"))); + Assert.assertTrue(message.hasField(f("default_uint64"))); + Assert.assertTrue(message.hasField(f("default_sint32"))); + Assert.assertTrue(message.hasField(f("default_sint64"))); + Assert.assertTrue(message.hasField(f("default_fixed32"))); + Assert.assertTrue(message.hasField(f("default_fixed64"))); Assert.assertTrue(message.hasField(f("default_sfixed32"))); Assert.assertTrue(message.hasField(f("default_sfixed64"))); - Assert.assertTrue(message.hasField(f("default_float" ))); - Assert.assertTrue(message.hasField(f("default_double" ))); - Assert.assertTrue(message.hasField(f("default_bool" ))); - Assert.assertTrue(message.hasField(f("default_string" ))); - Assert.assertTrue(message.hasField(f("default_bytes" ))); + Assert.assertTrue(message.hasField(f("default_float"))); + Assert.assertTrue(message.hasField(f("default_double"))); + Assert.assertTrue(message.hasField(f("default_bool"))); + Assert.assertTrue(message.hasField(f("default_string"))); + Assert.assertTrue(message.hasField(f("default_bytes"))); - Assert.assertTrue(message.hasField(f("default_nested_enum" ))); + Assert.assertTrue(message.hasField(f("default_nested_enum"))); Assert.assertTrue(message.hasField(f("default_foreign_enum"))); - Assert.assertTrue(message.hasField(f("default_import_enum" ))); + Assert.assertTrue(message.hasField(f("default_import_enum"))); Assert.assertTrue(message.hasField(f("default_string_piece"))); Assert.assertTrue(message.hasField(f("default_cord"))); - Assert.assertEquals(401 , message.getField(f("default_int32" ))); - Assert.assertEquals(402L , message.getField(f("default_int64" ))); - Assert.assertEquals(403 , message.getField(f("default_uint32" ))); - Assert.assertEquals(404L , message.getField(f("default_uint64" ))); - Assert.assertEquals(405 , message.getField(f("default_sint32" ))); - Assert.assertEquals(406L , message.getField(f("default_sint64" ))); - Assert.assertEquals(407 , message.getField(f("default_fixed32" ))); - Assert.assertEquals(408L , message.getField(f("default_fixed64" ))); - Assert.assertEquals(409 , message.getField(f("default_sfixed32"))); - Assert.assertEquals(410L , message.getField(f("default_sfixed64"))); - Assert.assertEquals(411F , message.getField(f("default_float" ))); - Assert.assertEquals(412D , message.getField(f("default_double" ))); - Assert.assertEquals(false, message.getField(f("default_bool" ))); - Assert.assertEquals("415", message.getField(f("default_string" ))); + Assert.assertEquals(401, message.getField(f("default_int32"))); + Assert.assertEquals(402L, message.getField(f("default_int64"))); + Assert.assertEquals(403, message.getField(f("default_uint32"))); + Assert.assertEquals(404L, message.getField(f("default_uint64"))); + Assert.assertEquals(405, message.getField(f("default_sint32"))); + Assert.assertEquals(406L, message.getField(f("default_sint64"))); + Assert.assertEquals(407, message.getField(f("default_fixed32"))); + Assert.assertEquals(408L, message.getField(f("default_fixed64"))); + Assert.assertEquals(409, message.getField(f("default_sfixed32"))); + Assert.assertEquals(410L, message.getField(f("default_sfixed64"))); + Assert.assertEquals(411F, message.getField(f("default_float"))); + Assert.assertEquals(412D, message.getField(f("default_double"))); + Assert.assertEquals(false, message.getField(f("default_bool"))); + Assert.assertEquals("415", message.getField(f("default_string"))); Assert.assertEquals(toBytes("416"), message.getField(f("default_bytes"))); - Assert.assertEquals( nestedFoo, message.getField(f("default_nested_enum" ))); + Assert.assertEquals(nestedFoo, message.getField(f("default_nested_enum"))); Assert.assertEquals(foreignFoo, message.getField(f("default_foreign_enum"))); - Assert.assertEquals( importFoo, message.getField(f("default_import_enum" ))); + Assert.assertEquals(importFoo, message.getField(f("default_import_enum"))); Assert.assertEquals("424", message.getField(f("default_string_piece"))); Assert.assertEquals("425", message.getField(f("default_cord"))); @@ -3276,9 +3274,9 @@ public final class TestUtil { Assert.assertTrue(message.hasField(f("oneof_nested_message"))); Assert.assertTrue(message.hasField(f("oneof_string"))); Assert.assertEquals(601, message.getField(f("oneof_uint32"))); - Assert.assertEquals(602, - ((MessageOrBuilder) message.getField(f("oneof_nested_message"))) - .getField(nestedB)); + Assert.assertEquals( + 602, + ((MessageOrBuilder) message.getField(f("oneof_nested_message"))).getField(nestedB)); Assert.assertEquals("603", message.getField(f("oneof_string"))); } } @@ -3286,175 +3284,163 @@ public final class TestUtil { // ------------------------------------------------------------------- /** - * Assert (using {@code junit.framework.Assert}} that all fields of - * {@code message} are cleared, and that getting the fields returns their - * default values, using the {@link Message} reflection interface. + * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are cleared, + * and that getting the fields returns their default values, using the {@link Message} + * reflection interface. */ public void assertClearViaReflection(MessageOrBuilder message) { // has_blah() should initially be false for all optional fields. - Assert.assertFalse(message.hasField(f("optional_int32" ))); - Assert.assertFalse(message.hasField(f("optional_int64" ))); - Assert.assertFalse(message.hasField(f("optional_uint32" ))); - Assert.assertFalse(message.hasField(f("optional_uint64" ))); - Assert.assertFalse(message.hasField(f("optional_sint32" ))); - Assert.assertFalse(message.hasField(f("optional_sint64" ))); - Assert.assertFalse(message.hasField(f("optional_fixed32" ))); - Assert.assertFalse(message.hasField(f("optional_fixed64" ))); + Assert.assertFalse(message.hasField(f("optional_int32"))); + Assert.assertFalse(message.hasField(f("optional_int64"))); + Assert.assertFalse(message.hasField(f("optional_uint32"))); + Assert.assertFalse(message.hasField(f("optional_uint64"))); + Assert.assertFalse(message.hasField(f("optional_sint32"))); + Assert.assertFalse(message.hasField(f("optional_sint64"))); + Assert.assertFalse(message.hasField(f("optional_fixed32"))); + Assert.assertFalse(message.hasField(f("optional_fixed64"))); Assert.assertFalse(message.hasField(f("optional_sfixed32"))); Assert.assertFalse(message.hasField(f("optional_sfixed64"))); - Assert.assertFalse(message.hasField(f("optional_float" ))); - Assert.assertFalse(message.hasField(f("optional_double" ))); - Assert.assertFalse(message.hasField(f("optional_bool" ))); - Assert.assertFalse(message.hasField(f("optional_string" ))); - Assert.assertFalse(message.hasField(f("optional_bytes" ))); - - Assert.assertFalse(message.hasField(f("optionalgroup" ))); - Assert.assertFalse(message.hasField(f("optional_nested_message" ))); + Assert.assertFalse(message.hasField(f("optional_float"))); + Assert.assertFalse(message.hasField(f("optional_double"))); + Assert.assertFalse(message.hasField(f("optional_bool"))); + Assert.assertFalse(message.hasField(f("optional_string"))); + Assert.assertFalse(message.hasField(f("optional_bytes"))); + + Assert.assertFalse(message.hasField(f("optionalgroup"))); + Assert.assertFalse(message.hasField(f("optional_nested_message"))); Assert.assertFalse(message.hasField(f("optional_foreign_message"))); - Assert.assertFalse(message.hasField(f("optional_import_message" ))); + Assert.assertFalse(message.hasField(f("optional_import_message"))); - Assert.assertFalse(message.hasField(f("optional_nested_enum" ))); + Assert.assertFalse(message.hasField(f("optional_nested_enum"))); Assert.assertFalse(message.hasField(f("optional_foreign_enum"))); - Assert.assertFalse(message.hasField(f("optional_import_enum" ))); + Assert.assertFalse(message.hasField(f("optional_import_enum"))); Assert.assertFalse(message.hasField(f("optional_string_piece"))); Assert.assertFalse(message.hasField(f("optional_cord"))); // Optional fields without defaults are set to zero or something like it. - Assert.assertEquals(0 , message.getField(f("optional_int32" ))); - Assert.assertEquals(0L , message.getField(f("optional_int64" ))); - Assert.assertEquals(0 , message.getField(f("optional_uint32" ))); - Assert.assertEquals(0L , message.getField(f("optional_uint64" ))); - Assert.assertEquals(0 , message.getField(f("optional_sint32" ))); - Assert.assertEquals(0L , message.getField(f("optional_sint64" ))); - Assert.assertEquals(0 , message.getField(f("optional_fixed32" ))); - Assert.assertEquals(0L , message.getField(f("optional_fixed64" ))); - Assert.assertEquals(0 , message.getField(f("optional_sfixed32"))); - Assert.assertEquals(0L , message.getField(f("optional_sfixed64"))); - Assert.assertEquals(0F , message.getField(f("optional_float" ))); - Assert.assertEquals(0D , message.getField(f("optional_double" ))); - Assert.assertEquals(false, message.getField(f("optional_bool" ))); - Assert.assertEquals("" , message.getField(f("optional_string" ))); + Assert.assertEquals(0, message.getField(f("optional_int32"))); + Assert.assertEquals(0L, message.getField(f("optional_int64"))); + Assert.assertEquals(0, message.getField(f("optional_uint32"))); + Assert.assertEquals(0L, message.getField(f("optional_uint64"))); + Assert.assertEquals(0, message.getField(f("optional_sint32"))); + Assert.assertEquals(0L, message.getField(f("optional_sint64"))); + Assert.assertEquals(0, message.getField(f("optional_fixed32"))); + Assert.assertEquals(0L, message.getField(f("optional_fixed64"))); + Assert.assertEquals(0, message.getField(f("optional_sfixed32"))); + Assert.assertEquals(0L, message.getField(f("optional_sfixed64"))); + Assert.assertEquals(0F, message.getField(f("optional_float"))); + Assert.assertEquals(0D, message.getField(f("optional_double"))); + Assert.assertEquals(false, message.getField(f("optional_bool"))); + Assert.assertEquals("", message.getField(f("optional_string"))); Assert.assertEquals(ByteString.EMPTY, message.getField(f("optional_bytes"))); // Embedded messages should also be clear. + Assert.assertFalse(((Message) message.getField(f("optionalgroup"))).hasField(groupA)); Assert.assertFalse( - ((Message)message.getField(f("optionalgroup"))).hasField(groupA)); - Assert.assertFalse( - ((Message)message.getField(f("optional_nested_message"))) - .hasField(nestedB)); + ((Message) message.getField(f("optional_nested_message"))).hasField(nestedB)); Assert.assertFalse( - ((Message)message.getField(f("optional_foreign_message"))) - .hasField(foreignC)); + ((Message) message.getField(f("optional_foreign_message"))).hasField(foreignC)); Assert.assertFalse( - ((Message)message.getField(f("optional_import_message"))) - .hasField(importD)); + ((Message) message.getField(f("optional_import_message"))).hasField(importD)); Assert.assertFalse( - ((Message)message.getField(f("optional_public_import_message"))) - .hasField(importE)); + ((Message) message.getField(f("optional_public_import_message"))).hasField(importE)); Assert.assertFalse( - ((Message)message.getField(f("optional_lazy_message"))) - .hasField(nestedB)); - - Assert.assertEquals(0, - ((Message)message.getField(f("optionalgroup"))).getField(groupA)); - Assert.assertEquals(0, - ((Message)message.getField(f("optional_nested_message"))) - .getField(nestedB)); - Assert.assertEquals(0, - ((Message)message.getField(f("optional_foreign_message"))) - .getField(foreignC)); - Assert.assertEquals(0, - ((Message)message.getField(f("optional_import_message"))) - .getField(importD)); - Assert.assertEquals(0, - ((Message)message.getField(f("optional_public_import_message"))) - .getField(importE)); - Assert.assertEquals(0, - ((Message)message.getField(f("optional_lazy_message"))) - .getField(nestedB)); + ((Message) message.getField(f("optional_lazy_message"))).hasField(nestedB)); + + Assert.assertEquals(0, ((Message) message.getField(f("optionalgroup"))).getField(groupA)); + Assert.assertEquals( + 0, ((Message) message.getField(f("optional_nested_message"))).getField(nestedB)); + Assert.assertEquals( + 0, ((Message) message.getField(f("optional_foreign_message"))).getField(foreignC)); + Assert.assertEquals( + 0, ((Message) message.getField(f("optional_import_message"))).getField(importD)); + Assert.assertEquals( + 0, ((Message) message.getField(f("optional_public_import_message"))).getField(importE)); + Assert.assertEquals( + 0, ((Message) message.getField(f("optional_lazy_message"))).getField(nestedB)); // Enums without defaults are set to the first value in the enum. - Assert.assertEquals( nestedFoo, message.getField(f("optional_nested_enum" ))); + Assert.assertEquals(nestedFoo, message.getField(f("optional_nested_enum"))); Assert.assertEquals(foreignFoo, message.getField(f("optional_foreign_enum"))); - Assert.assertEquals( importFoo, message.getField(f("optional_import_enum" ))); + Assert.assertEquals(importFoo, message.getField(f("optional_import_enum"))); Assert.assertEquals("", message.getField(f("optional_string_piece"))); Assert.assertEquals("", message.getField(f("optional_cord"))); // Repeated fields are empty. - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_int32" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_int64" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_uint32" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_uint64" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sint32" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sint64" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_fixed32" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_fixed64" ))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_int32"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_int64"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_uint32"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_uint64"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sint32"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sint64"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_fixed32"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_fixed64"))); Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sfixed32"))); Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_float" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_double" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_bool" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_string" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_bytes" ))); - - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeatedgroup" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_nested_message" ))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_float"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_double"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_bool"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_string"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_bytes"))); + + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeatedgroup"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_nested_message"))); Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_import_message" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_lazy_message" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_nested_enum" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_foreign_enum" ))); - Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_import_enum" ))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_import_message"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_lazy_message"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_import_enum"))); Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_string_piece"))); Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_cord"))); // has_blah() should also be false for all default fields. - Assert.assertFalse(message.hasField(f("default_int32" ))); - Assert.assertFalse(message.hasField(f("default_int64" ))); - Assert.assertFalse(message.hasField(f("default_uint32" ))); - Assert.assertFalse(message.hasField(f("default_uint64" ))); - Assert.assertFalse(message.hasField(f("default_sint32" ))); - Assert.assertFalse(message.hasField(f("default_sint64" ))); - Assert.assertFalse(message.hasField(f("default_fixed32" ))); - Assert.assertFalse(message.hasField(f("default_fixed64" ))); + Assert.assertFalse(message.hasField(f("default_int32"))); + Assert.assertFalse(message.hasField(f("default_int64"))); + Assert.assertFalse(message.hasField(f("default_uint32"))); + Assert.assertFalse(message.hasField(f("default_uint64"))); + Assert.assertFalse(message.hasField(f("default_sint32"))); + Assert.assertFalse(message.hasField(f("default_sint64"))); + Assert.assertFalse(message.hasField(f("default_fixed32"))); + Assert.assertFalse(message.hasField(f("default_fixed64"))); Assert.assertFalse(message.hasField(f("default_sfixed32"))); Assert.assertFalse(message.hasField(f("default_sfixed64"))); - Assert.assertFalse(message.hasField(f("default_float" ))); - Assert.assertFalse(message.hasField(f("default_double" ))); - Assert.assertFalse(message.hasField(f("default_bool" ))); - Assert.assertFalse(message.hasField(f("default_string" ))); - Assert.assertFalse(message.hasField(f("default_bytes" ))); + Assert.assertFalse(message.hasField(f("default_float"))); + Assert.assertFalse(message.hasField(f("default_double"))); + Assert.assertFalse(message.hasField(f("default_bool"))); + Assert.assertFalse(message.hasField(f("default_string"))); + Assert.assertFalse(message.hasField(f("default_bytes"))); - Assert.assertFalse(message.hasField(f("default_nested_enum" ))); + Assert.assertFalse(message.hasField(f("default_nested_enum"))); Assert.assertFalse(message.hasField(f("default_foreign_enum"))); - Assert.assertFalse(message.hasField(f("default_import_enum" ))); + Assert.assertFalse(message.hasField(f("default_import_enum"))); - Assert.assertFalse(message.hasField(f("default_string_piece" ))); - Assert.assertFalse(message.hasField(f("default_cord" ))); + Assert.assertFalse(message.hasField(f("default_string_piece"))); + Assert.assertFalse(message.hasField(f("default_cord"))); // Fields with defaults have their default values (duh). - Assert.assertEquals( 41 , message.getField(f("default_int32" ))); - Assert.assertEquals( 42L , message.getField(f("default_int64" ))); - Assert.assertEquals( 43 , message.getField(f("default_uint32" ))); - Assert.assertEquals( 44L , message.getField(f("default_uint64" ))); - Assert.assertEquals(-45 , message.getField(f("default_sint32" ))); - Assert.assertEquals( 46L , message.getField(f("default_sint64" ))); - Assert.assertEquals( 47 , message.getField(f("default_fixed32" ))); - Assert.assertEquals( 48L , message.getField(f("default_fixed64" ))); - Assert.assertEquals( 49 , message.getField(f("default_sfixed32"))); - Assert.assertEquals(-50L , message.getField(f("default_sfixed64"))); - Assert.assertEquals( 51.5F , message.getField(f("default_float" ))); - Assert.assertEquals( 52e3D , message.getField(f("default_double" ))); - Assert.assertEquals(true , message.getField(f("default_bool" ))); - Assert.assertEquals("hello", message.getField(f("default_string" ))); + Assert.assertEquals(41, message.getField(f("default_int32"))); + Assert.assertEquals(42L, message.getField(f("default_int64"))); + Assert.assertEquals(43, message.getField(f("default_uint32"))); + Assert.assertEquals(44L, message.getField(f("default_uint64"))); + Assert.assertEquals(-45, message.getField(f("default_sint32"))); + Assert.assertEquals(46L, message.getField(f("default_sint64"))); + Assert.assertEquals(47, message.getField(f("default_fixed32"))); + Assert.assertEquals(48L, message.getField(f("default_fixed64"))); + Assert.assertEquals(49, message.getField(f("default_sfixed32"))); + Assert.assertEquals(-50L, message.getField(f("default_sfixed64"))); + Assert.assertEquals(51.5F, message.getField(f("default_float"))); + Assert.assertEquals(52e3D, message.getField(f("default_double"))); + Assert.assertEquals(true, message.getField(f("default_bool"))); + Assert.assertEquals("hello", message.getField(f("default_string"))); Assert.assertEquals(toBytes("world"), message.getField(f("default_bytes"))); - Assert.assertEquals( nestedBar, message.getField(f("default_nested_enum" ))); + Assert.assertEquals(nestedBar, message.getField(f("default_nested_enum"))); Assert.assertEquals(foreignBar, message.getField(f("default_foreign_enum"))); - Assert.assertEquals( importBar, message.getField(f("default_import_enum" ))); + Assert.assertEquals(importBar, message.getField(f("default_import_enum"))); Assert.assertEquals("abc", message.getField(f("default_string_piece"))); Assert.assertEquals("123", message.getField(f("default_cord"))); @@ -3469,205 +3455,204 @@ public final class TestUtil { Assert.assertEquals(toBytes(""), message.getField(f("oneof_bytes"))); } - // --------------------------------------------------------------- - public void assertRepeatedFieldsModifiedViaReflection( - MessageOrBuilder message) { + public void assertRepeatedFieldsModifiedViaReflection(MessageOrBuilder message) { // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed64" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed64"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed32"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_float" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_double" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bool" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bytes" ))); - - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeatedgroup" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_message" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_float"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_double"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bool"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bytes"))); + + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeatedgroup"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_message"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_message" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_lazy_message" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_enum" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_enum" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_enum" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_message"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_lazy_message"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_enum"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string_piece"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_cord"))); - Assert.assertEquals(201 , message.getRepeatedField(f("repeated_int32" ), 0)); - Assert.assertEquals(202L , message.getRepeatedField(f("repeated_int64" ), 0)); - Assert.assertEquals(203 , message.getRepeatedField(f("repeated_uint32" ), 0)); - Assert.assertEquals(204L , message.getRepeatedField(f("repeated_uint64" ), 0)); - Assert.assertEquals(205 , message.getRepeatedField(f("repeated_sint32" ), 0)); - Assert.assertEquals(206L , message.getRepeatedField(f("repeated_sint64" ), 0)); - Assert.assertEquals(207 , message.getRepeatedField(f("repeated_fixed32" ), 0)); - Assert.assertEquals(208L , message.getRepeatedField(f("repeated_fixed64" ), 0)); - Assert.assertEquals(209 , message.getRepeatedField(f("repeated_sfixed32"), 0)); - Assert.assertEquals(210L , message.getRepeatedField(f("repeated_sfixed64"), 0)); - Assert.assertEquals(211F , message.getRepeatedField(f("repeated_float" ), 0)); - Assert.assertEquals(212D , message.getRepeatedField(f("repeated_double" ), 0)); - Assert.assertEquals(true , message.getRepeatedField(f("repeated_bool" ), 0)); - Assert.assertEquals("215", message.getRepeatedField(f("repeated_string" ), 0)); + Assert.assertEquals(201, message.getRepeatedField(f("repeated_int32"), 0)); + Assert.assertEquals(202L, message.getRepeatedField(f("repeated_int64"), 0)); + Assert.assertEquals(203, message.getRepeatedField(f("repeated_uint32"), 0)); + Assert.assertEquals(204L, message.getRepeatedField(f("repeated_uint64"), 0)); + Assert.assertEquals(205, message.getRepeatedField(f("repeated_sint32"), 0)); + Assert.assertEquals(206L, message.getRepeatedField(f("repeated_sint64"), 0)); + Assert.assertEquals(207, message.getRepeatedField(f("repeated_fixed32"), 0)); + Assert.assertEquals(208L, message.getRepeatedField(f("repeated_fixed64"), 0)); + Assert.assertEquals(209, message.getRepeatedField(f("repeated_sfixed32"), 0)); + Assert.assertEquals(210L, message.getRepeatedField(f("repeated_sfixed64"), 0)); + Assert.assertEquals(211F, message.getRepeatedField(f("repeated_float"), 0)); + Assert.assertEquals(212D, message.getRepeatedField(f("repeated_double"), 0)); + Assert.assertEquals(true, message.getRepeatedField(f("repeated_bool"), 0)); + Assert.assertEquals("215", message.getRepeatedField(f("repeated_string"), 0)); Assert.assertEquals(toBytes("216"), message.getRepeatedField(f("repeated_bytes"), 0)); - Assert.assertEquals(217, - ((Message)message.getRepeatedField(f("repeatedgroup"), 0)) - .getField(repeatedGroupA)); - Assert.assertEquals(218, - ((Message)message.getRepeatedField(f("repeated_nested_message"), 0)) - .getField(nestedB)); - Assert.assertEquals(219, - ((Message)message.getRepeatedField(f("repeated_foreign_message"), 0)) - .getField(foreignC)); - Assert.assertEquals(220, - ((Message)message.getRepeatedField(f("repeated_import_message"), 0)) - .getField(importD)); - Assert.assertEquals(227, - ((Message)message.getRepeatedField(f("repeated_lazy_message"), 0)) - .getField(nestedB)); - - Assert.assertEquals( nestedBar, message.getRepeatedField(f("repeated_nested_enum" ),0)); - Assert.assertEquals(foreignBar, message.getRepeatedField(f("repeated_foreign_enum"),0)); - Assert.assertEquals( importBar, message.getRepeatedField(f("repeated_import_enum" ),0)); + Assert.assertEquals( + 217, + ((Message) message.getRepeatedField(f("repeatedgroup"), 0)).getField(repeatedGroupA)); + Assert.assertEquals( + 218, + ((Message) message.getRepeatedField(f("repeated_nested_message"), 0)).getField(nestedB)); + Assert.assertEquals( + 219, + ((Message) message.getRepeatedField(f("repeated_foreign_message"), 0)) + .getField(foreignC)); + Assert.assertEquals( + 220, + ((Message) message.getRepeatedField(f("repeated_import_message"), 0)).getField(importD)); + Assert.assertEquals( + 227, + ((Message) message.getRepeatedField(f("repeated_lazy_message"), 0)).getField(nestedB)); + + Assert.assertEquals(nestedBar, message.getRepeatedField(f("repeated_nested_enum"), 0)); + Assert.assertEquals(foreignBar, message.getRepeatedField(f("repeated_foreign_enum"), 0)); + Assert.assertEquals(importBar, message.getRepeatedField(f("repeated_import_enum"), 0)); Assert.assertEquals("224", message.getRepeatedField(f("repeated_string_piece"), 0)); Assert.assertEquals("225", message.getRepeatedField(f("repeated_cord"), 0)); - Assert.assertEquals(501 , message.getRepeatedField(f("repeated_int32" ), 1)); - Assert.assertEquals(502L , message.getRepeatedField(f("repeated_int64" ), 1)); - Assert.assertEquals(503 , message.getRepeatedField(f("repeated_uint32" ), 1)); - Assert.assertEquals(504L , message.getRepeatedField(f("repeated_uint64" ), 1)); - Assert.assertEquals(505 , message.getRepeatedField(f("repeated_sint32" ), 1)); - Assert.assertEquals(506L , message.getRepeatedField(f("repeated_sint64" ), 1)); - Assert.assertEquals(507 , message.getRepeatedField(f("repeated_fixed32" ), 1)); - Assert.assertEquals(508L , message.getRepeatedField(f("repeated_fixed64" ), 1)); - Assert.assertEquals(509 , message.getRepeatedField(f("repeated_sfixed32"), 1)); - Assert.assertEquals(510L , message.getRepeatedField(f("repeated_sfixed64"), 1)); - Assert.assertEquals(511F , message.getRepeatedField(f("repeated_float" ), 1)); - Assert.assertEquals(512D , message.getRepeatedField(f("repeated_double" ), 1)); - Assert.assertEquals(true , message.getRepeatedField(f("repeated_bool" ), 1)); - Assert.assertEquals("515", message.getRepeatedField(f("repeated_string" ), 1)); + Assert.assertEquals(501, message.getRepeatedField(f("repeated_int32"), 1)); + Assert.assertEquals(502L, message.getRepeatedField(f("repeated_int64"), 1)); + Assert.assertEquals(503, message.getRepeatedField(f("repeated_uint32"), 1)); + Assert.assertEquals(504L, message.getRepeatedField(f("repeated_uint64"), 1)); + Assert.assertEquals(505, message.getRepeatedField(f("repeated_sint32"), 1)); + Assert.assertEquals(506L, message.getRepeatedField(f("repeated_sint64"), 1)); + Assert.assertEquals(507, message.getRepeatedField(f("repeated_fixed32"), 1)); + Assert.assertEquals(508L, message.getRepeatedField(f("repeated_fixed64"), 1)); + Assert.assertEquals(509, message.getRepeatedField(f("repeated_sfixed32"), 1)); + Assert.assertEquals(510L, message.getRepeatedField(f("repeated_sfixed64"), 1)); + Assert.assertEquals(511F, message.getRepeatedField(f("repeated_float"), 1)); + Assert.assertEquals(512D, message.getRepeatedField(f("repeated_double"), 1)); + Assert.assertEquals(true, message.getRepeatedField(f("repeated_bool"), 1)); + Assert.assertEquals("515", message.getRepeatedField(f("repeated_string"), 1)); Assert.assertEquals(toBytes("516"), message.getRepeatedField(f("repeated_bytes"), 1)); - Assert.assertEquals(517, - ((Message)message.getRepeatedField(f("repeatedgroup"), 1)) - .getField(repeatedGroupA)); - Assert.assertEquals(518, - ((Message)message.getRepeatedField(f("repeated_nested_message"), 1)) - .getField(nestedB)); - Assert.assertEquals(519, - ((Message)message.getRepeatedField(f("repeated_foreign_message"), 1)) - .getField(foreignC)); - Assert.assertEquals(520, - ((Message)message.getRepeatedField(f("repeated_import_message"), 1)) - .getField(importD)); - Assert.assertEquals(527, - ((Message)message.getRepeatedField(f("repeated_lazy_message"), 1)) - .getField(nestedB)); - - Assert.assertEquals( nestedFoo, message.getRepeatedField(f("repeated_nested_enum" ),1)); - Assert.assertEquals(foreignFoo, message.getRepeatedField(f("repeated_foreign_enum"),1)); - Assert.assertEquals( importFoo, message.getRepeatedField(f("repeated_import_enum" ),1)); + Assert.assertEquals( + 517, + ((Message) message.getRepeatedField(f("repeatedgroup"), 1)).getField(repeatedGroupA)); + Assert.assertEquals( + 518, + ((Message) message.getRepeatedField(f("repeated_nested_message"), 1)).getField(nestedB)); + Assert.assertEquals( + 519, + ((Message) message.getRepeatedField(f("repeated_foreign_message"), 1)) + .getField(foreignC)); + Assert.assertEquals( + 520, + ((Message) message.getRepeatedField(f("repeated_import_message"), 1)).getField(importD)); + Assert.assertEquals( + 527, + ((Message) message.getRepeatedField(f("repeated_lazy_message"), 1)).getField(nestedB)); + + Assert.assertEquals(nestedFoo, message.getRepeatedField(f("repeated_nested_enum"), 1)); + Assert.assertEquals(foreignFoo, message.getRepeatedField(f("repeated_foreign_enum"), 1)); + Assert.assertEquals(importFoo, message.getRepeatedField(f("repeated_import_enum"), 1)); Assert.assertEquals("524", message.getRepeatedField(f("repeated_string_piece"), 1)); Assert.assertEquals("525", message.getRepeatedField(f("repeated_cord"), 1)); } public void setPackedFieldsViaReflection(Message.Builder message) { - message.addRepeatedField(f("packed_int32" ), 601 ); - message.addRepeatedField(f("packed_int64" ), 602L); - message.addRepeatedField(f("packed_uint32" ), 603 ); - message.addRepeatedField(f("packed_uint64" ), 604L); - message.addRepeatedField(f("packed_sint32" ), 605 ); - message.addRepeatedField(f("packed_sint64" ), 606L); - message.addRepeatedField(f("packed_fixed32" ), 607 ); - message.addRepeatedField(f("packed_fixed64" ), 608L); - message.addRepeatedField(f("packed_sfixed32"), 609 ); + message.addRepeatedField(f("packed_int32"), 601); + message.addRepeatedField(f("packed_int64"), 602L); + message.addRepeatedField(f("packed_uint32"), 603); + message.addRepeatedField(f("packed_uint64"), 604L); + message.addRepeatedField(f("packed_sint32"), 605); + message.addRepeatedField(f("packed_sint64"), 606L); + message.addRepeatedField(f("packed_fixed32"), 607); + message.addRepeatedField(f("packed_fixed64"), 608L); + message.addRepeatedField(f("packed_sfixed32"), 609); message.addRepeatedField(f("packed_sfixed64"), 610L); - message.addRepeatedField(f("packed_float" ), 611F); - message.addRepeatedField(f("packed_double" ), 612D); - message.addRepeatedField(f("packed_bool" ), true); - message.addRepeatedField(f("packed_enum" ), foreignBar); + message.addRepeatedField(f("packed_float"), 611F); + message.addRepeatedField(f("packed_double"), 612D); + message.addRepeatedField(f("packed_bool"), true); + message.addRepeatedField(f("packed_enum"), foreignBar); // Add a second one of each field. - message.addRepeatedField(f("packed_int32" ), 701 ); - message.addRepeatedField(f("packed_int64" ), 702L); - message.addRepeatedField(f("packed_uint32" ), 703 ); - message.addRepeatedField(f("packed_uint64" ), 704L); - message.addRepeatedField(f("packed_sint32" ), 705 ); - message.addRepeatedField(f("packed_sint64" ), 706L); - message.addRepeatedField(f("packed_fixed32" ), 707 ); - message.addRepeatedField(f("packed_fixed64" ), 708L); - message.addRepeatedField(f("packed_sfixed32"), 709 ); + message.addRepeatedField(f("packed_int32"), 701); + message.addRepeatedField(f("packed_int64"), 702L); + message.addRepeatedField(f("packed_uint32"), 703); + message.addRepeatedField(f("packed_uint64"), 704L); + message.addRepeatedField(f("packed_sint32"), 705); + message.addRepeatedField(f("packed_sint64"), 706L); + message.addRepeatedField(f("packed_fixed32"), 707); + message.addRepeatedField(f("packed_fixed64"), 708L); + message.addRepeatedField(f("packed_sfixed32"), 709); message.addRepeatedField(f("packed_sfixed64"), 710L); - message.addRepeatedField(f("packed_float" ), 711F); - message.addRepeatedField(f("packed_double" ), 712D); - message.addRepeatedField(f("packed_bool" ), false); - message.addRepeatedField(f("packed_enum" ), foreignBaz); + message.addRepeatedField(f("packed_float"), 711F); + message.addRepeatedField(f("packed_double"), 712D); + message.addRepeatedField(f("packed_bool"), false); + message.addRepeatedField(f("packed_enum"), foreignBaz); } public void assertPackedFieldsSetViaReflection(MessageOrBuilder message) { - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_int32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_int64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_uint32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_uint64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sint32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sint64" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_fixed32" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_fixed64" ))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_int32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_int64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_uint32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_uint64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sint32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sint64"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_fixed32"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_fixed64"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sfixed32"))); Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sfixed64"))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_float" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_double" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_bool" ))); - Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_enum" ))); - Assert.assertEquals(601 , message.getRepeatedField(f("packed_int32" ), 0)); - Assert.assertEquals(602L , message.getRepeatedField(f("packed_int64" ), 0)); - Assert.assertEquals(603 , message.getRepeatedField(f("packed_uint32" ), 0)); - Assert.assertEquals(604L , message.getRepeatedField(f("packed_uint64" ), 0)); - Assert.assertEquals(605 , message.getRepeatedField(f("packed_sint32" ), 0)); - Assert.assertEquals(606L , message.getRepeatedField(f("packed_sint64" ), 0)); - Assert.assertEquals(607 , message.getRepeatedField(f("packed_fixed32" ), 0)); - Assert.assertEquals(608L , message.getRepeatedField(f("packed_fixed64" ), 0)); - Assert.assertEquals(609 , message.getRepeatedField(f("packed_sfixed32"), 0)); - Assert.assertEquals(610L , message.getRepeatedField(f("packed_sfixed64"), 0)); - Assert.assertEquals(611F , message.getRepeatedField(f("packed_float" ), 0)); - Assert.assertEquals(612D , message.getRepeatedField(f("packed_double" ), 0)); - Assert.assertEquals(true , message.getRepeatedField(f("packed_bool" ), 0)); - Assert.assertEquals(foreignBar, message.getRepeatedField(f("packed_enum" ),0)); - Assert.assertEquals(701 , message.getRepeatedField(f("packed_int32" ), 1)); - Assert.assertEquals(702L , message.getRepeatedField(f("packed_int64" ), 1)); - Assert.assertEquals(703 , message.getRepeatedField(f("packed_uint32" ), 1)); - Assert.assertEquals(704L , message.getRepeatedField(f("packed_uint64" ), 1)); - Assert.assertEquals(705 , message.getRepeatedField(f("packed_sint32" ), 1)); - Assert.assertEquals(706L , message.getRepeatedField(f("packed_sint64" ), 1)); - Assert.assertEquals(707 , message.getRepeatedField(f("packed_fixed32" ), 1)); - Assert.assertEquals(708L , message.getRepeatedField(f("packed_fixed64" ), 1)); - Assert.assertEquals(709 , message.getRepeatedField(f("packed_sfixed32"), 1)); - Assert.assertEquals(710L , message.getRepeatedField(f("packed_sfixed64"), 1)); - Assert.assertEquals(711F , message.getRepeatedField(f("packed_float" ), 1)); - Assert.assertEquals(712D , message.getRepeatedField(f("packed_double" ), 1)); - Assert.assertEquals(false, message.getRepeatedField(f("packed_bool" ), 1)); - Assert.assertEquals(foreignBaz, message.getRepeatedField(f("packed_enum" ),1)); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_float"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_double"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_bool"))); + Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_enum"))); + Assert.assertEquals(601, message.getRepeatedField(f("packed_int32"), 0)); + Assert.assertEquals(602L, message.getRepeatedField(f("packed_int64"), 0)); + Assert.assertEquals(603, message.getRepeatedField(f("packed_uint32"), 0)); + Assert.assertEquals(604L, message.getRepeatedField(f("packed_uint64"), 0)); + Assert.assertEquals(605, message.getRepeatedField(f("packed_sint32"), 0)); + Assert.assertEquals(606L, message.getRepeatedField(f("packed_sint64"), 0)); + Assert.assertEquals(607, message.getRepeatedField(f("packed_fixed32"), 0)); + Assert.assertEquals(608L, message.getRepeatedField(f("packed_fixed64"), 0)); + Assert.assertEquals(609, message.getRepeatedField(f("packed_sfixed32"), 0)); + Assert.assertEquals(610L, message.getRepeatedField(f("packed_sfixed64"), 0)); + Assert.assertEquals(611F, message.getRepeatedField(f("packed_float"), 0)); + Assert.assertEquals(612D, message.getRepeatedField(f("packed_double"), 0)); + Assert.assertEquals(true, message.getRepeatedField(f("packed_bool"), 0)); + Assert.assertEquals(foreignBar, message.getRepeatedField(f("packed_enum"), 0)); + Assert.assertEquals(701, message.getRepeatedField(f("packed_int32"), 1)); + Assert.assertEquals(702L, message.getRepeatedField(f("packed_int64"), 1)); + Assert.assertEquals(703, message.getRepeatedField(f("packed_uint32"), 1)); + Assert.assertEquals(704L, message.getRepeatedField(f("packed_uint64"), 1)); + Assert.assertEquals(705, message.getRepeatedField(f("packed_sint32"), 1)); + Assert.assertEquals(706L, message.getRepeatedField(f("packed_sint64"), 1)); + Assert.assertEquals(707, message.getRepeatedField(f("packed_fixed32"), 1)); + Assert.assertEquals(708L, message.getRepeatedField(f("packed_fixed64"), 1)); + Assert.assertEquals(709, message.getRepeatedField(f("packed_sfixed32"), 1)); + Assert.assertEquals(710L, message.getRepeatedField(f("packed_sfixed64"), 1)); + Assert.assertEquals(711F, message.getRepeatedField(f("packed_float"), 1)); + Assert.assertEquals(712D, message.getRepeatedField(f("packed_double"), 1)); + Assert.assertEquals(false, message.getRepeatedField(f("packed_bool"), 1)); + Assert.assertEquals(foreignBaz, message.getRepeatedField(f("packed_enum"), 1)); } /** * Verifies that the reflection setters for the given.Builder object throw a - * NullPointerException if they are passed a null value. Uses Assert to throw an - * appropriate assertion failure, if the condition is not verified. + * NullPointerException if they are passed a null value. Uses Assert to throw an appropriate + * assertion failure, if the condition is not verified. */ - public void assertReflectionSettersRejectNull(Message.Builder builder) - throws Exception { + public void assertReflectionSettersRejectNull(Message.Builder builder) throws Exception { try { builder.setField(f("optional_string"), null); Assert.fail("Exception was not thrown"); @@ -3687,15 +3672,13 @@ public final class TestUtil { // We expect this exception. } try { - builder.setField(f("optional_nested_message"), - (TestAllTypes.NestedMessage) null); + builder.setField(f("optional_nested_message"), (TestAllTypes.NestedMessage) null); Assert.fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. } try { - builder.setField(f("optional_nested_message"), - (TestAllTypes.NestedMessage.Builder) null); + builder.setField(f("optional_nested_message"), (TestAllTypes.NestedMessage.Builder) null); Assert.fail("Exception was not thrown"); } catch (NullPointerException e) { // We expect this exception. @@ -3729,7 +3712,7 @@ public final class TestUtil { /** * Verifies that the reflection repeated setters for the given Builder object throw a - * NullPointerException if they are passed a null value. Uses Assert to throw an appropriate + * NullPointerException if they are passed a null value. Uses Assert to throw an appropriate * assertion failure, if the condition is not verified. */ public void assertReflectionRepeatedSettersRejectNull(Message.Builder builder) @@ -3759,8 +3742,7 @@ public final class TestUtil { } builder.addRepeatedField( - f("repeated_nested_message"), - TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); + f("repeated_nested_message"), TestAllTypes.NestedMessage.newBuilder().setBb(218).build()); try { builder.setRepeatedField(f("repeated_nested_message"), 0, null); Assert.fail("Exception was not thrown"); @@ -3770,10 +3752,7 @@ public final class TestUtil { } } - /** - * @param filePath The path relative to - * {@link #getTestDataDir}. - */ + /** @param filePath The path relative to {@link #getTestDataDir}. */ public static String readTextFromFile(String filePath) { return readBytesFromFile(filePath).toStringUtf8(); } @@ -3785,8 +3764,7 @@ public final class TestUtil { try { ancestor = ancestor.getCanonicalFile(); } catch (IOException e) { - throw new RuntimeException( - "Couldn't get canonical name of working directory.", e); + throw new RuntimeException("Couldn't get canonical name of working directory.", e); } while (ancestor != null && ancestor.exists()) { if (new File(ancestor, "src/google/protobuf").exists()) { @@ -3796,15 +3774,13 @@ public final class TestUtil { } throw new RuntimeException( - "Could not find golden files. This test must be run from within the " + - "protobuf source package so that it can read test data files from the " + - "C++ source tree: " + initialPath); + "Could not find golden files. This test must be run from within the " + + "protobuf source package so that it can read test data files from the " + + "C++ source tree: " + + initialPath); } - /** - * @param filename The path relative to - * {@link #getTestDataDir}. - */ + /** @param filename The path relative to {@link #getTestDataDir}. */ public static ByteString readBytesFromFile(String filename) { File fullPath = new File(getTestDataDir(), filename); try { @@ -3815,50 +3791,59 @@ public final class TestUtil { } catch (IOException e) { // Throw a RuntimeException here so that we can call this function from // static initializers. - throw new IllegalArgumentException( - "Couldn't read file: " + fullPath.getPath(), e); + throw new IllegalArgumentException("Couldn't read file: " + fullPath.getPath(), e); + } + } + // END FULL-RUNTIME + + private static ByteString readBytesFromResource(String name) { + try { + return ByteString.copyFrom( + com.google.common.io.ByteStreams.toByteArray(TestUtil.class.getResourceAsStream(name))); + } catch (IOException e) { + throw new RuntimeException(e); } } /** - * Get the bytes of the "golden message". This is a serialized TestAllTypes - * with all fields set as they would be by - * {@link #setAllFields(TestAllTypes.Builder)}, but it is loaded from a file - * on disk rather than generated dynamically. The file is actually generated - * by C++ code, so testing against it verifies compatibility with C++. + * Get the bytes of the "golden message". This is a serialized TestAllTypes with all fields set as + * they would be by {@link #setAllFields(TestAllTypes.Builder)}, but it is loaded from a file on + * disk rather than generated dynamically. The file is actually generated by C++ code, so testing + * against it verifies compatibility with C++. */ public static ByteString getGoldenMessage() { if (goldenMessage == null) { - goldenMessage = readBytesFromFile("golden_message_oneof_implemented"); + goldenMessage = + readBytesFromResource("/google/protobuf/testdata/golden_message_oneof_implemented"); } return goldenMessage; } + private static ByteString goldenMessage = null; /** - * Get the bytes of the "golden packed fields message". This is a serialized - * TestPackedTypes with all fields set as they would be by - * {@link #setPackedFields(TestPackedTypes.Builder)}, but it is loaded from a - * file on disk rather than generated dynamically. The file is actually - * generated by C++ code, so testing against it verifies compatibility with - * C++. + * Get the bytes of the "golden packed fields message". This is a serialized TestPackedTypes with + * all fields set as they would be by {@link #setPackedFields(TestPackedTypes.Builder)}, but it is + * loaded from a file on disk rather than generated dynamically. The file is actually generated by + * C++ code, so testing against it verifies compatibility with C++. */ public static ByteString getGoldenPackedFieldsMessage() { if (goldenPackedFieldsMessage == null) { goldenPackedFieldsMessage = - readBytesFromFile("golden_packed_fields_message"); + readBytesFromResource("/google/protobuf/testdata/golden_packed_fields_message"); } return goldenPackedFieldsMessage; } + private static ByteString goldenPackedFieldsMessage = null; + // BEGIN FULL-RUNTIME /** * Mock implementation of {@link GeneratedMessage.BuilderParent} for testing. * * @author jonp@google.com (Jon Perlow) */ - public static class MockBuilderParent - implements GeneratedMessage.BuilderParent { + public static class MockBuilderParent implements GeneratedMessage.BuilderParent { private int invalidations; @@ -3871,4 +3856,5 @@ public final class TestUtil { return invalidations; } } + // END FULL-RUNTIME } diff --git a/java/core/src/test/java/com/google/protobuf/TestUtilLite.java b/java/core/src/test/java/com/google/protobuf/TestUtilLite.java index 8f33fa14..31565fc4 100644 --- a/java/core/src/test/java/com/google/protobuf/TestUtilLite.java +++ b/java/core/src/test/java/com/google/protobuf/TestUtilLite.java @@ -30,8 +30,6 @@ package com.google.protobuf; -import static com.google.protobuf.UnittestLite.OptionalGroup_extension_lite; -import static com.google.protobuf.UnittestLite.RepeatedGroup_extension_lite; import static com.google.protobuf.UnittestLite.defaultBoolExtensionLite; import static com.google.protobuf.UnittestLite.defaultBytesExtensionLite; import static com.google.protobuf.UnittestLite.defaultCordExtensionLite; @@ -127,6 +125,8 @@ import com.google.protobuf.UnittestImportLite.ImportMessageLite; import com.google.protobuf.UnittestImportPublicLite.PublicImportMessageLite; import com.google.protobuf.UnittestLite.ForeignEnumLite; import com.google.protobuf.UnittestLite.ForeignMessageLite; +import com.google.protobuf.UnittestLite.OptionalGroup_extension_lite; +import com.google.protobuf.UnittestLite.RepeatedGroup_extension_lite; import com.google.protobuf.UnittestLite.TestAllExtensionsLite; import com.google.protobuf.UnittestLite.TestAllTypesLite; import com.google.protobuf.UnittestLite.TestPackedExtensionsLite; @@ -136,8 +136,7 @@ import com.google.protobuf.UnittestLite.TestPackedExtensionsLite; * and {@code TestPackedExtensionsLite}. This is analogous to the functionality in TestUtil.java but * does not depend on the presence of any non-lite protos. * - * <p>This code is not to be used outside of {@code com.google.protobuf} and - * subpackages. + * <p>This code is not to be used outside of {@code com.google.protobuf} and subpackages. */ public final class TestUtilLite { private TestUtilLite() {} @@ -148,8 +147,8 @@ public final class TestUtilLite { } /** - * Get a {@code TestAllTypesLite.Builder} with all fields set as they would be by - * {@link #setAllFields(TestAllTypesLite.Builder)}. + * Get a {@code TestAllTypesLite.Builder} with all fields set as they would be by {@link + * #setAllFields(TestAllTypesLite.Builder)}. */ public static TestAllTypesLite.Builder getAllLiteSetBuilder() { TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder(); @@ -158,8 +157,8 @@ public final class TestUtilLite { } /** - * Get a {@code TestAllExtensionsLite} with all fields set as they would be by - * {@link #setAllExtensions(TestAllExtensionsLite.Builder)}. + * Get a {@code TestAllExtensionsLite} with all fields set as they would be by {@link + * #setAllExtensions(TestAllExtensionsLite.Builder)}. */ public static TestAllExtensionsLite getAllLiteExtensionsSet() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.newBuilder(); @@ -172,154 +171,137 @@ public final class TestUtilLite { setPackedExtensions(builder); return builder.build(); } - - /** - * Set every field of {@code builder} to the values expected by - * {@code assertAllFieldsSet()}. - */ + + /** Set every field of {@code builder} to the values expected by {@code assertAllFieldsSet()}. */ public static void setAllFields(TestAllTypesLite.Builder builder) { - builder.setOptionalInt32 (101); - builder.setOptionalInt64 (102); - builder.setOptionalUint32 (103); - builder.setOptionalUint64 (104); - builder.setOptionalSint32 (105); - builder.setOptionalSint64 (106); - builder.setOptionalFixed32 (107); - builder.setOptionalFixed64 (108); + builder.setOptionalInt32(101); + builder.setOptionalInt64(102); + builder.setOptionalUint32(103); + builder.setOptionalUint64(104); + builder.setOptionalSint32(105); + builder.setOptionalSint64(106); + builder.setOptionalFixed32(107); + builder.setOptionalFixed64(108); builder.setOptionalSfixed32(109); builder.setOptionalSfixed64(110); - builder.setOptionalFloat (111); - builder.setOptionalDouble (112); - builder.setOptionalBool (true); - builder.setOptionalString ("115"); - builder.setOptionalBytes (toBytes("116")); - - builder.setOptionalGroup( - TestAllTypesLite.OptionalGroup.newBuilder().setA(117).build()); + builder.setOptionalFloat(111); + builder.setOptionalDouble(112); + builder.setOptionalBool(true); + builder.setOptionalString("115"); + builder.setOptionalBytes(toBytes("116")); + + builder.setOptionalGroup(TestAllTypesLite.OptionalGroup.newBuilder().setA(117).build()); builder.setOptionalNestedMessage( TestAllTypesLite.NestedMessage.newBuilder().setBb(118).build()); - builder.setOptionalForeignMessage( - ForeignMessageLite.newBuilder().setC(119).build()); - builder.setOptionalImportMessage( - ImportMessageLite.newBuilder().setD(120).build()); - builder.setOptionalPublicImportMessage( - PublicImportMessageLite.newBuilder().setE(126).build()); - builder.setOptionalLazyMessage( - TestAllTypesLite.NestedMessage.newBuilder().setBb(127).build()); + builder.setOptionalForeignMessage(ForeignMessageLite.newBuilder().setC(119).build()); + builder.setOptionalImportMessage(ImportMessageLite.newBuilder().setD(120).build()); + builder.setOptionalPublicImportMessage(PublicImportMessageLite.newBuilder().setE(126).build()); + builder.setOptionalLazyMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(127).build()); - builder.setOptionalNestedEnum (TestAllTypesLite.NestedEnum.BAZ); + builder.setOptionalNestedEnum(TestAllTypesLite.NestedEnum.BAZ); builder.setOptionalForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAZ); - builder.setOptionalImportEnum (ImportEnumLite.IMPORT_LITE_BAZ); + builder.setOptionalImportEnum(ImportEnumLite.IMPORT_LITE_BAZ); builder.setOptionalStringPiece("124"); builder.setOptionalCord("125"); // ----------------------------------------------------------------- - builder.addRepeatedInt32 (201); - builder.addRepeatedInt64 (202); - builder.addRepeatedUint32 (203); - builder.addRepeatedUint64 (204); - builder.addRepeatedSint32 (205); - builder.addRepeatedSint64 (206); - builder.addRepeatedFixed32 (207); - builder.addRepeatedFixed64 (208); + builder.addRepeatedInt32(201); + builder.addRepeatedInt64(202); + builder.addRepeatedUint32(203); + builder.addRepeatedUint64(204); + builder.addRepeatedSint32(205); + builder.addRepeatedSint64(206); + builder.addRepeatedFixed32(207); + builder.addRepeatedFixed64(208); builder.addRepeatedSfixed32(209); builder.addRepeatedSfixed64(210); - builder.addRepeatedFloat (211); - builder.addRepeatedDouble (212); - builder.addRepeatedBool (true); - builder.addRepeatedString ("215"); - builder.addRepeatedBytes (toBytes("216")); - - builder.addRepeatedGroup( - TestAllTypesLite.RepeatedGroup.newBuilder().setA(217).build()); + builder.addRepeatedFloat(211); + builder.addRepeatedDouble(212); + builder.addRepeatedBool(true); + builder.addRepeatedString("215"); + builder.addRepeatedBytes(toBytes("216")); + + builder.addRepeatedGroup(TestAllTypesLite.RepeatedGroup.newBuilder().setA(217).build()); builder.addRepeatedNestedMessage( TestAllTypesLite.NestedMessage.newBuilder().setBb(218).build()); - builder.addRepeatedForeignMessage( - ForeignMessageLite.newBuilder().setC(219).build()); - builder.addRepeatedImportMessage( - ImportMessageLite.newBuilder().setD(220).build()); - builder.addRepeatedLazyMessage( - TestAllTypesLite.NestedMessage.newBuilder().setBb(227).build()); + builder.addRepeatedForeignMessage(ForeignMessageLite.newBuilder().setC(219).build()); + builder.addRepeatedImportMessage(ImportMessageLite.newBuilder().setD(220).build()); + builder.addRepeatedLazyMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(227).build()); - builder.addRepeatedNestedEnum (TestAllTypesLite.NestedEnum.BAR); + builder.addRepeatedNestedEnum(TestAllTypesLite.NestedEnum.BAR); builder.addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR); - builder.addRepeatedImportEnum (ImportEnumLite.IMPORT_LITE_BAR); + builder.addRepeatedImportEnum(ImportEnumLite.IMPORT_LITE_BAR); builder.addRepeatedStringPiece("224"); builder.addRepeatedCord("225"); // Add a second one of each field. - builder.addRepeatedInt32 (301); - builder.addRepeatedInt64 (302); - builder.addRepeatedUint32 (303); - builder.addRepeatedUint64 (304); - builder.addRepeatedSint32 (305); - builder.addRepeatedSint64 (306); - builder.addRepeatedFixed32 (307); - builder.addRepeatedFixed64 (308); + builder.addRepeatedInt32(301); + builder.addRepeatedInt64(302); + builder.addRepeatedUint32(303); + builder.addRepeatedUint64(304); + builder.addRepeatedSint32(305); + builder.addRepeatedSint64(306); + builder.addRepeatedFixed32(307); + builder.addRepeatedFixed64(308); builder.addRepeatedSfixed32(309); builder.addRepeatedSfixed64(310); - builder.addRepeatedFloat (311); - builder.addRepeatedDouble (312); - builder.addRepeatedBool (false); - builder.addRepeatedString ("315"); - builder.addRepeatedBytes (toBytes("316")); - - builder.addRepeatedGroup( - TestAllTypesLite.RepeatedGroup.newBuilder().setA(317).build()); + builder.addRepeatedFloat(311); + builder.addRepeatedDouble(312); + builder.addRepeatedBool(false); + builder.addRepeatedString("315"); + builder.addRepeatedBytes(toBytes("316")); + + builder.addRepeatedGroup(TestAllTypesLite.RepeatedGroup.newBuilder().setA(317).build()); builder.addRepeatedNestedMessage( TestAllTypesLite.NestedMessage.newBuilder().setBb(318).build()); - builder.addRepeatedForeignMessage( - ForeignMessageLite.newBuilder().setC(319).build()); - builder.addRepeatedImportMessage( - ImportMessageLite.newBuilder().setD(320).build()); - builder.addRepeatedLazyMessage( - TestAllTypesLite.NestedMessage.newBuilder().setBb(327).build()); + builder.addRepeatedForeignMessage(ForeignMessageLite.newBuilder().setC(319).build()); + builder.addRepeatedImportMessage(ImportMessageLite.newBuilder().setD(320).build()); + builder.addRepeatedLazyMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(327).build()); - builder.addRepeatedNestedEnum (TestAllTypesLite.NestedEnum.BAZ); + builder.addRepeatedNestedEnum(TestAllTypesLite.NestedEnum.BAZ); builder.addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAZ); - builder.addRepeatedImportEnum (ImportEnumLite.IMPORT_LITE_BAZ); + builder.addRepeatedImportEnum(ImportEnumLite.IMPORT_LITE_BAZ); builder.addRepeatedStringPiece("324"); builder.addRepeatedCord("325"); // ----------------------------------------------------------------- - builder.setDefaultInt32 (401); - builder.setDefaultInt64 (402); - builder.setDefaultUint32 (403); - builder.setDefaultUint64 (404); - builder.setDefaultSint32 (405); - builder.setDefaultSint64 (406); - builder.setDefaultFixed32 (407); - builder.setDefaultFixed64 (408); + builder.setDefaultInt32(401); + builder.setDefaultInt64(402); + builder.setDefaultUint32(403); + builder.setDefaultUint64(404); + builder.setDefaultSint32(405); + builder.setDefaultSint64(406); + builder.setDefaultFixed32(407); + builder.setDefaultFixed64(408); builder.setDefaultSfixed32(409); builder.setDefaultSfixed64(410); - builder.setDefaultFloat (411); - builder.setDefaultDouble (412); - builder.setDefaultBool (false); - builder.setDefaultString ("415"); - builder.setDefaultBytes (toBytes("416")); + builder.setDefaultFloat(411); + builder.setDefaultDouble(412); + builder.setDefaultBool(false); + builder.setDefaultString("415"); + builder.setDefaultBytes(toBytes("416")); - builder.setDefaultNestedEnum (TestAllTypesLite.NestedEnum.FOO); + builder.setDefaultNestedEnum(TestAllTypesLite.NestedEnum.FOO); builder.setDefaultForeignEnum(ForeignEnumLite.FOREIGN_LITE_FOO); - builder.setDefaultImportEnum (ImportEnumLite.IMPORT_LITE_FOO); + builder.setDefaultImportEnum(ImportEnumLite.IMPORT_LITE_FOO); builder.setDefaultStringPiece("424"); builder.setDefaultCord("425"); builder.setOneofUint32(601); - builder.setOneofNestedMessage( - TestAllTypesLite.NestedMessage.newBuilder().setBb(602).build()); + builder.setOneofNestedMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(602).build()); builder.setOneofString("603"); builder.setOneofBytes(toBytes("604")); } /** - * Get an unmodifiable {@link ExtensionRegistryLite} containing all the - * extensions of {@code TestAllExtensionsLite}. + * Get an unmodifiable {@link ExtensionRegistryLite} containing all the extensions of {@code + * TestAllExtensionsLite}. */ public static ExtensionRegistryLite getExtensionRegistryLite() { ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance(); @@ -328,8 +310,8 @@ public final class TestUtilLite { } /** - * Register all of {@code TestAllExtensionsLite}'s extensions with the - * given {@link ExtensionRegistryLite}. + * Register all of {@code TestAllExtensionsLite}'s extensions with the given {@link + * ExtensionRegistryLite}. */ public static void registerAllExtensionsLite(ExtensionRegistryLite registry) { UnittestLite.registerAllExtensions(registry); @@ -339,38 +321,40 @@ public final class TestUtilLite { // Lite extensions /** - * Set every field of {@code message} to the values expected by - * {@code assertAllExtensionsSet()}. + * Set every field of {@code message} to the values expected by {@code assertAllExtensionsSet()}. */ public static void setAllExtensions(TestAllExtensionsLite.Builder message) { - message.setExtension(optionalInt32ExtensionLite , 101); - message.setExtension(optionalInt64ExtensionLite , 102L); - message.setExtension(optionalUint32ExtensionLite , 103); - message.setExtension(optionalUint64ExtensionLite , 104L); - message.setExtension(optionalSint32ExtensionLite , 105); - message.setExtension(optionalSint64ExtensionLite , 106L); - message.setExtension(optionalFixed32ExtensionLite , 107); - message.setExtension(optionalFixed64ExtensionLite , 108L); + message.setExtension(optionalInt32ExtensionLite, 101); + message.setExtension(optionalInt64ExtensionLite, 102L); + message.setExtension(optionalUint32ExtensionLite, 103); + message.setExtension(optionalUint64ExtensionLite, 104L); + message.setExtension(optionalSint32ExtensionLite, 105); + message.setExtension(optionalSint64ExtensionLite, 106L); + message.setExtension(optionalFixed32ExtensionLite, 107); + message.setExtension(optionalFixed64ExtensionLite, 108L); message.setExtension(optionalSfixed32ExtensionLite, 109); message.setExtension(optionalSfixed64ExtensionLite, 110L); - message.setExtension(optionalFloatExtensionLite , 111F); - message.setExtension(optionalDoubleExtensionLite , 112D); - message.setExtension(optionalBoolExtensionLite , true); - message.setExtension(optionalStringExtensionLite , "115"); - message.setExtension(optionalBytesExtensionLite , toBytes("116")); - - message.setExtension(optionalGroupExtensionLite, - OptionalGroup_extension_lite.newBuilder().setA(117).build()); - message.setExtension(optionalNestedMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(118).build()); - message.setExtension(optionalForeignMessageExtensionLite, - ForeignMessageLite.newBuilder().setC(119).build()); - message.setExtension(optionalImportMessageExtensionLite, - ImportMessageLite.newBuilder().setD(120).build()); - message.setExtension(optionalPublicImportMessageExtensionLite, - PublicImportMessageLite.newBuilder().setE(126).build()); - message.setExtension(optionalLazyMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(127).build()); + message.setExtension(optionalFloatExtensionLite, 111F); + message.setExtension(optionalDoubleExtensionLite, 112D); + message.setExtension(optionalBoolExtensionLite, true); + message.setExtension(optionalStringExtensionLite, "115"); + message.setExtension(optionalBytesExtensionLite, toBytes("116")); + + message.setExtension( + optionalGroupExtensionLite, OptionalGroup_extension_lite.newBuilder().setA(117).build()); + message.setExtension( + optionalNestedMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(118).build()); + message.setExtension( + optionalForeignMessageExtensionLite, ForeignMessageLite.newBuilder().setC(119).build()); + message.setExtension( + optionalImportMessageExtensionLite, ImportMessageLite.newBuilder().setD(120).build()); + message.setExtension( + optionalPublicImportMessageExtensionLite, + PublicImportMessageLite.newBuilder().setE(126).build()); + message.setExtension( + optionalLazyMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(127).build()); message.setExtension(optionalNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.BAZ); message.setExtension(optionalForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAZ); @@ -381,32 +365,34 @@ public final class TestUtilLite { // ----------------------------------------------------------------- - message.addExtension(repeatedInt32ExtensionLite , 201); - message.addExtension(repeatedInt64ExtensionLite , 202L); - message.addExtension(repeatedUint32ExtensionLite , 203); - message.addExtension(repeatedUint64ExtensionLite , 204L); - message.addExtension(repeatedSint32ExtensionLite , 205); - message.addExtension(repeatedSint64ExtensionLite , 206L); - message.addExtension(repeatedFixed32ExtensionLite , 207); - message.addExtension(repeatedFixed64ExtensionLite , 208L); + message.addExtension(repeatedInt32ExtensionLite, 201); + message.addExtension(repeatedInt64ExtensionLite, 202L); + message.addExtension(repeatedUint32ExtensionLite, 203); + message.addExtension(repeatedUint64ExtensionLite, 204L); + message.addExtension(repeatedSint32ExtensionLite, 205); + message.addExtension(repeatedSint64ExtensionLite, 206L); + message.addExtension(repeatedFixed32ExtensionLite, 207); + message.addExtension(repeatedFixed64ExtensionLite, 208L); message.addExtension(repeatedSfixed32ExtensionLite, 209); message.addExtension(repeatedSfixed64ExtensionLite, 210L); - message.addExtension(repeatedFloatExtensionLite , 211F); - message.addExtension(repeatedDoubleExtensionLite , 212D); - message.addExtension(repeatedBoolExtensionLite , true); - message.addExtension(repeatedStringExtensionLite , "215"); - message.addExtension(repeatedBytesExtensionLite , toBytes("216")); - - message.addExtension(repeatedGroupExtensionLite, - RepeatedGroup_extension_lite.newBuilder().setA(217).build()); - message.addExtension(repeatedNestedMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(218).build()); - message.addExtension(repeatedForeignMessageExtensionLite, - ForeignMessageLite.newBuilder().setC(219).build()); - message.addExtension(repeatedImportMessageExtensionLite, - ImportMessageLite.newBuilder().setD(220).build()); - message.addExtension(repeatedLazyMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(227).build()); + message.addExtension(repeatedFloatExtensionLite, 211F); + message.addExtension(repeatedDoubleExtensionLite, 212D); + message.addExtension(repeatedBoolExtensionLite, true); + message.addExtension(repeatedStringExtensionLite, "215"); + message.addExtension(repeatedBytesExtensionLite, toBytes("216")); + + message.addExtension( + repeatedGroupExtensionLite, RepeatedGroup_extension_lite.newBuilder().setA(217).build()); + message.addExtension( + repeatedNestedMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(218).build()); + message.addExtension( + repeatedForeignMessageExtensionLite, ForeignMessageLite.newBuilder().setC(219).build()); + message.addExtension( + repeatedImportMessageExtensionLite, ImportMessageLite.newBuilder().setD(220).build()); + message.addExtension( + repeatedLazyMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(227).build()); message.addExtension(repeatedNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.BAR); message.addExtension(repeatedForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAR); @@ -416,32 +402,34 @@ public final class TestUtilLite { message.addExtension(repeatedCordExtensionLite, "225"); // Add a second one of each field. - message.addExtension(repeatedInt32ExtensionLite , 301); - message.addExtension(repeatedInt64ExtensionLite , 302L); - message.addExtension(repeatedUint32ExtensionLite , 303); - message.addExtension(repeatedUint64ExtensionLite , 304L); - message.addExtension(repeatedSint32ExtensionLite , 305); - message.addExtension(repeatedSint64ExtensionLite , 306L); - message.addExtension(repeatedFixed32ExtensionLite , 307); - message.addExtension(repeatedFixed64ExtensionLite , 308L); + message.addExtension(repeatedInt32ExtensionLite, 301); + message.addExtension(repeatedInt64ExtensionLite, 302L); + message.addExtension(repeatedUint32ExtensionLite, 303); + message.addExtension(repeatedUint64ExtensionLite, 304L); + message.addExtension(repeatedSint32ExtensionLite, 305); + message.addExtension(repeatedSint64ExtensionLite, 306L); + message.addExtension(repeatedFixed32ExtensionLite, 307); + message.addExtension(repeatedFixed64ExtensionLite, 308L); message.addExtension(repeatedSfixed32ExtensionLite, 309); message.addExtension(repeatedSfixed64ExtensionLite, 310L); - message.addExtension(repeatedFloatExtensionLite , 311F); - message.addExtension(repeatedDoubleExtensionLite , 312D); - message.addExtension(repeatedBoolExtensionLite , false); - message.addExtension(repeatedStringExtensionLite , "315"); - message.addExtension(repeatedBytesExtensionLite , toBytes("316")); - - message.addExtension(repeatedGroupExtensionLite, - RepeatedGroup_extension_lite.newBuilder().setA(317).build()); - message.addExtension(repeatedNestedMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(318).build()); - message.addExtension(repeatedForeignMessageExtensionLite, - ForeignMessageLite.newBuilder().setC(319).build()); - message.addExtension(repeatedImportMessageExtensionLite, - ImportMessageLite.newBuilder().setD(320).build()); - message.addExtension(repeatedLazyMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(327).build()); + message.addExtension(repeatedFloatExtensionLite, 311F); + message.addExtension(repeatedDoubleExtensionLite, 312D); + message.addExtension(repeatedBoolExtensionLite, false); + message.addExtension(repeatedStringExtensionLite, "315"); + message.addExtension(repeatedBytesExtensionLite, toBytes("316")); + + message.addExtension( + repeatedGroupExtensionLite, RepeatedGroup_extension_lite.newBuilder().setA(317).build()); + message.addExtension( + repeatedNestedMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(318).build()); + message.addExtension( + repeatedForeignMessageExtensionLite, ForeignMessageLite.newBuilder().setC(319).build()); + message.addExtension( + repeatedImportMessageExtensionLite, ImportMessageLite.newBuilder().setD(320).build()); + message.addExtension( + repeatedLazyMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(327).build()); message.addExtension(repeatedNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.BAZ); message.addExtension(repeatedForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAZ); @@ -452,21 +440,21 @@ public final class TestUtilLite { // ----------------------------------------------------------------- - message.setExtension(defaultInt32ExtensionLite , 401); - message.setExtension(defaultInt64ExtensionLite , 402L); - message.setExtension(defaultUint32ExtensionLite , 403); - message.setExtension(defaultUint64ExtensionLite , 404L); - message.setExtension(defaultSint32ExtensionLite , 405); - message.setExtension(defaultSint64ExtensionLite , 406L); - message.setExtension(defaultFixed32ExtensionLite , 407); - message.setExtension(defaultFixed64ExtensionLite , 408L); + message.setExtension(defaultInt32ExtensionLite, 401); + message.setExtension(defaultInt64ExtensionLite, 402L); + message.setExtension(defaultUint32ExtensionLite, 403); + message.setExtension(defaultUint64ExtensionLite, 404L); + message.setExtension(defaultSint32ExtensionLite, 405); + message.setExtension(defaultSint64ExtensionLite, 406L); + message.setExtension(defaultFixed32ExtensionLite, 407); + message.setExtension(defaultFixed64ExtensionLite, 408L); message.setExtension(defaultSfixed32ExtensionLite, 409); message.setExtension(defaultSfixed64ExtensionLite, 410L); - message.setExtension(defaultFloatExtensionLite , 411F); - message.setExtension(defaultDoubleExtensionLite , 412D); - message.setExtension(defaultBoolExtensionLite , false); - message.setExtension(defaultStringExtensionLite , "415"); - message.setExtension(defaultBytesExtensionLite , toBytes("416")); + message.setExtension(defaultFloatExtensionLite, 411F); + message.setExtension(defaultDoubleExtensionLite, 412D); + message.setExtension(defaultBoolExtensionLite, false); + message.setExtension(defaultStringExtensionLite, "415"); + message.setExtension(defaultBytesExtensionLite, toBytes("416")); message.setExtension(defaultNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.FOO); message.setExtension(defaultForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_FOO); @@ -476,8 +464,9 @@ public final class TestUtilLite { message.setExtension(defaultCordExtensionLite, "425"); message.setExtension(oneofUint32ExtensionLite, 601); - message.setExtension(oneofNestedMessageExtensionLite, - TestAllTypesLite.NestedMessage.newBuilder().setBb(602).build()); + message.setExtension( + oneofNestedMessageExtensionLite, + TestAllTypesLite.NestedMessage.newBuilder().setBb(602).build()); message.setExtension(oneofStringExtensionLite, "603"); message.setExtension(oneofBytesExtensionLite, toBytes("604")); } @@ -485,75 +474,78 @@ public final class TestUtilLite { // ------------------------------------------------------------------- /** - * Modify the repeated extensions of {@code message} to contain the values - * expected by {@code assertRepeatedExtensionsModified()}. + * Modify the repeated extensions of {@code message} to contain the values expected by {@code + * assertRepeatedExtensionsModified()}. */ - public static void modifyRepeatedExtensions( - TestAllExtensionsLite.Builder message) { - message.setExtension(repeatedInt32ExtensionLite , 1, 501); - message.setExtension(repeatedInt64ExtensionLite , 1, 502L); - message.setExtension(repeatedUint32ExtensionLite , 1, 503); - message.setExtension(repeatedUint64ExtensionLite , 1, 504L); - message.setExtension(repeatedSint32ExtensionLite , 1, 505); - message.setExtension(repeatedSint64ExtensionLite , 1, 506L); - message.setExtension(repeatedFixed32ExtensionLite , 1, 507); - message.setExtension(repeatedFixed64ExtensionLite , 1, 508L); + public static void modifyRepeatedExtensions(TestAllExtensionsLite.Builder message) { + message.setExtension(repeatedInt32ExtensionLite, 1, 501); + message.setExtension(repeatedInt64ExtensionLite, 1, 502L); + message.setExtension(repeatedUint32ExtensionLite, 1, 503); + message.setExtension(repeatedUint64ExtensionLite, 1, 504L); + message.setExtension(repeatedSint32ExtensionLite, 1, 505); + message.setExtension(repeatedSint64ExtensionLite, 1, 506L); + message.setExtension(repeatedFixed32ExtensionLite, 1, 507); + message.setExtension(repeatedFixed64ExtensionLite, 1, 508L); message.setExtension(repeatedSfixed32ExtensionLite, 1, 509); message.setExtension(repeatedSfixed64ExtensionLite, 1, 510L); - message.setExtension(repeatedFloatExtensionLite , 1, 511F); - message.setExtension(repeatedDoubleExtensionLite , 1, 512D); - message.setExtension(repeatedBoolExtensionLite , 1, true); - message.setExtension(repeatedStringExtensionLite , 1, "515"); - message.setExtension(repeatedBytesExtensionLite , 1, toBytes("516")); - - message.setExtension(repeatedGroupExtensionLite, 1, - RepeatedGroup_extension_lite.newBuilder().setA(517).build()); - message.setExtension(repeatedNestedMessageExtensionLite, 1, - TestAllTypesLite.NestedMessage.newBuilder().setBb(518).build()); - message.setExtension(repeatedForeignMessageExtensionLite, 1, - ForeignMessageLite.newBuilder().setC(519).build()); - message.setExtension(repeatedImportMessageExtensionLite, 1, - ImportMessageLite.newBuilder().setD(520).build()); - message.setExtension(repeatedLazyMessageExtensionLite, 1, - TestAllTypesLite.NestedMessage.newBuilder().setBb(527).build()); - - message.setExtension(repeatedNestedEnumExtensionLite , 1, TestAllTypesLite.NestedEnum.FOO); + message.setExtension(repeatedFloatExtensionLite, 1, 511F); + message.setExtension(repeatedDoubleExtensionLite, 1, 512D); + message.setExtension(repeatedBoolExtensionLite, 1, true); + message.setExtension(repeatedStringExtensionLite, 1, "515"); + message.setExtension(repeatedBytesExtensionLite, 1, toBytes("516")); + + message.setExtension( + repeatedGroupExtensionLite, 1, RepeatedGroup_extension_lite.newBuilder().setA(517).build()); + message.setExtension( + repeatedNestedMessageExtensionLite, + 1, + TestAllTypesLite.NestedMessage.newBuilder().setBb(518).build()); + message.setExtension( + repeatedForeignMessageExtensionLite, 1, ForeignMessageLite.newBuilder().setC(519).build()); + message.setExtension( + repeatedImportMessageExtensionLite, 1, ImportMessageLite.newBuilder().setD(520).build()); + message.setExtension( + repeatedLazyMessageExtensionLite, + 1, + TestAllTypesLite.NestedMessage.newBuilder().setBb(527).build()); + + message.setExtension(repeatedNestedEnumExtensionLite, 1, TestAllTypesLite.NestedEnum.FOO); message.setExtension(repeatedForeignEnumExtensionLite, 1, ForeignEnumLite.FOREIGN_LITE_FOO); - message.setExtension(repeatedImportEnumExtensionLite , 1, ImportEnumLite.IMPORT_LITE_FOO); + message.setExtension(repeatedImportEnumExtensionLite, 1, ImportEnumLite.IMPORT_LITE_FOO); message.setExtension(repeatedStringPieceExtensionLite, 1, "524"); message.setExtension(repeatedCordExtensionLite, 1, "525"); } public static void setPackedExtensions(TestPackedExtensionsLite.Builder message) { - message.addExtension(packedInt32ExtensionLite , 601); - message.addExtension(packedInt64ExtensionLite , 602L); - message.addExtension(packedUint32ExtensionLite , 603); - message.addExtension(packedUint64ExtensionLite , 604L); - message.addExtension(packedSint32ExtensionLite , 605); - message.addExtension(packedSint64ExtensionLite , 606L); - message.addExtension(packedFixed32ExtensionLite , 607); - message.addExtension(packedFixed64ExtensionLite , 608L); + message.addExtension(packedInt32ExtensionLite, 601); + message.addExtension(packedInt64ExtensionLite, 602L); + message.addExtension(packedUint32ExtensionLite, 603); + message.addExtension(packedUint64ExtensionLite, 604L); + message.addExtension(packedSint32ExtensionLite, 605); + message.addExtension(packedSint64ExtensionLite, 606L); + message.addExtension(packedFixed32ExtensionLite, 607); + message.addExtension(packedFixed64ExtensionLite, 608L); message.addExtension(packedSfixed32ExtensionLite, 609); message.addExtension(packedSfixed64ExtensionLite, 610L); - message.addExtension(packedFloatExtensionLite , 611F); - message.addExtension(packedDoubleExtensionLite , 612D); - message.addExtension(packedBoolExtensionLite , true); + message.addExtension(packedFloatExtensionLite, 611F); + message.addExtension(packedDoubleExtensionLite, 612D); + message.addExtension(packedBoolExtensionLite, true); message.addExtension(packedEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAR); // Add a second one of each field. - message.addExtension(packedInt32ExtensionLite , 701); - message.addExtension(packedInt64ExtensionLite , 702L); - message.addExtension(packedUint32ExtensionLite , 703); - message.addExtension(packedUint64ExtensionLite , 704L); - message.addExtension(packedSint32ExtensionLite , 705); - message.addExtension(packedSint64ExtensionLite , 706L); - message.addExtension(packedFixed32ExtensionLite , 707); - message.addExtension(packedFixed64ExtensionLite , 708L); + message.addExtension(packedInt32ExtensionLite, 701); + message.addExtension(packedInt64ExtensionLite, 702L); + message.addExtension(packedUint32ExtensionLite, 703); + message.addExtension(packedUint64ExtensionLite, 704L); + message.addExtension(packedSint32ExtensionLite, 705); + message.addExtension(packedSint64ExtensionLite, 706L); + message.addExtension(packedFixed32ExtensionLite, 707); + message.addExtension(packedFixed64ExtensionLite, 708L); message.addExtension(packedSfixed32ExtensionLite, 709); message.addExtension(packedSfixed64ExtensionLite, 710L); - message.addExtension(packedFloatExtensionLite , 711F); - message.addExtension(packedDoubleExtensionLite , 712D); - message.addExtension(packedBoolExtensionLite , false); + message.addExtension(packedFloatExtensionLite, 711F); + message.addExtension(packedDoubleExtensionLite, 712D); + message.addExtension(packedBoolExtensionLite, false); message.addExtension(packedEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAZ); } } diff --git a/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java b/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java index e338af21..ff413720 100644 --- a/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java +++ b/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java @@ -33,12 +33,9 @@ package com.google.protobuf; import com.google.protobuf.Descriptors.Descriptor; import com.google.protobuf.Descriptors.FieldDescriptor; import protobuf_unittest.UnittestProto.TestAllTypes; - import junit.framework.TestCase; -/** - * Test @{link TextFormatParseInfoTree}. - */ +/** Test @{link TextFormatParseInfoTree}. */ public class TextFormatParseInfoTreeTest extends TestCase { private static final Descriptor DESCRIPTOR = TestAllTypes.getDescriptor(); @@ -75,7 +72,7 @@ public class TextFormatParseInfoTreeTest extends TestCase { TextFormatParseInfoTree root = rootBuilder.build(); assertEquals(LOC0, root.getLocation(OPTIONAL_INT32, 0)); assertEquals(1, root.getLocations(OPTIONAL_INT32).size()); - } + } public void testGetLocationsReturnsNoParseLocationsForUnknownField() { assertTrue(rootBuilder.build().getLocations(OPTIONAL_INT32).isEmpty()); diff --git a/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java b/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java index c42bfa6e..19abc3f8 100644 --- a/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java +++ b/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java @@ -32,9 +32,7 @@ package com.google.protobuf; import junit.framework.TestCase; -/** - * Test @{link TextFormatParseLocation}. - */ +/** Test @{link TextFormatParseLocation}. */ public class TextFormatParseLocationTest extends TestCase { public void testCreateEmpty() { diff --git a/java/core/src/test/java/com/google/protobuf/TextFormatTest.java b/java/core/src/test/java/com/google/protobuf/TextFormatTest.java index 720061d2..d240088c 100644 --- a/java/core/src/test/java/com/google/protobuf/TextFormatTest.java +++ b/java/core/src/test/java/com/google/protobuf/TextFormatTest.java @@ -54,7 +54,7 @@ import junit.framework.TestCase; /** * Test case for {@link TextFormat}. * - * TODO(wenboz): ExtensionTest and rest of text_format_unittest.cc. + * <p>TODO(wenboz): ExtensionTest and rest of text_format_unittest.cc. * * @author wenboz@google.com (Wenbo Zhu) */ @@ -62,76 +62,82 @@ public class TextFormatTest extends TestCase { // A basic string with different escapable characters for testing. private static final String ESCAPE_TEST_STRING = - "\"A string with ' characters \n and \r newlines and \t tabs and \001 " + "slashes \\"; + "\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\"; // A representation of the above string with all the characters escaped. private static final String ESCAPE_TEST_STRING_ESCAPED = "\\\"A string with \\' characters \\n and \\r newlines " + "and \\t tabs and \\001 slashes \\\\"; - private static String allFieldsSetText = TestUtil.readTextFromFile( - "text_format_unittest_data_oneof_implemented.txt"); - private static String allExtensionsSetText = TestUtil.readTextFromFile( - "text_format_unittest_extensions_data.txt"); + private static String allFieldsSetText = + TestUtil.readTextFromFile("text_format_unittest_data_oneof_implemented.txt"); + private static String allExtensionsSetText = + TestUtil.readTextFromFile("text_format_unittest_extensions_data.txt"); private static String exoticText = - "repeated_int32: -1\n" + - "repeated_int32: -2147483648\n" + - "repeated_int64: -1,\n" + - "repeated_int64: -9223372036854775808\n" + - "repeated_uint32: 4294967295\n" + - "repeated_uint32: 2147483648\n" + - "repeated_uint64: 18446744073709551615\n" + - "repeated_uint64: 9223372036854775808\n" + - "repeated_double: 123.0\n" + - "repeated_double: 123.5\n" + - "repeated_double: 0.125\n" + - "repeated_double: .125\n" + - "repeated_double: -.125\n" + - "repeated_double: 1.23E17\n" + - "repeated_double: 1.23E+17\n" + - "repeated_double: -1.23e-17\n" + - "repeated_double: .23e+17\n" + - "repeated_double: -.23E17\n" + - "repeated_double: 1.235E22\n" + - "repeated_double: 1.235E-18\n" + - "repeated_double: 123.456789\n" + - "repeated_double: Infinity\n" + - "repeated_double: -Infinity\n" + - "repeated_double: NaN\n" + - "repeated_string: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"" + - "\\341\\210\\264\"\n" + - "repeated_bytes: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\376\"\n"; + "" + + "repeated_int32: -1\n" + + "repeated_int32: -2147483648\n" + + "repeated_int64: -1,\n" + + "repeated_int64: -9223372036854775808\n" + + "repeated_uint32: 4294967295\n" + + "repeated_uint32: 2147483648\n" + + "repeated_uint64: 18446744073709551615\n" + + "repeated_uint64: 9223372036854775808\n" + + "repeated_double: 123.0\n" + + "repeated_double: 123.5\n" + + "repeated_double: 0.125\n" + + "repeated_double: .125\n" + + "repeated_double: -.125\n" + + "repeated_double: 1.23E17\n" + + "repeated_double: 1.23E+17\n" + + "repeated_double: -1.23e-17\n" + + "repeated_double: .23e+17\n" + + "repeated_double: -.23E17\n" + + "repeated_double: 1.235E22\n" + + "repeated_double: 1.235E-18\n" + + "repeated_double: 123.456789\n" + + "repeated_double: Infinity\n" + + "repeated_double: -Infinity\n" + + "repeated_double: NaN\n" + + "repeated_string: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"" + + "\\341\\210\\264\"\n" + + "repeated_bytes: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\376\"\n"; private static String canonicalExoticText = - exoticText.replace(": .", ": 0.").replace(": -.", ": -0.") // short-form double - .replace("23e", "23E").replace("E+", "E").replace("0.23E17", "2.3E16").replace(",", ""); + exoticText + .replace(": .", ": 0.") + .replace(": -.", ": -0.") // short-form double + .replace("23e", "23E") + .replace("E+", "E") + .replace("0.23E17", "2.3E16") + .replace(",", ""); private String messageSetText = - "[protobuf_unittest.TestMessageSetExtension1] {\n" + - " i: 123\n" + - "}\n" + - "[protobuf_unittest.TestMessageSetExtension2] {\n" + - " str: \"foo\"\n" + - "}\n"; + "" + + "[protobuf_unittest.TestMessageSetExtension1] {\n" + + " i: 123\n" + + "}\n" + + "[protobuf_unittest.TestMessageSetExtension2] {\n" + + " str: \"foo\"\n" + + "}\n"; private String messageSetTextWithRepeatedExtension = - "[protobuf_unittest.TestMessageSetExtension1] {\n" + - " i: 123\n" + - "}\n" + - "[protobuf_unittest.TestMessageSetExtension1] {\n" + - " i: 456\n" + - "}\n"; + "" + + "[protobuf_unittest.TestMessageSetExtension1] {\n" + + " i: 123\n" + + "}\n" + + "[protobuf_unittest.TestMessageSetExtension1] {\n" + + " i: 456\n" + + "}\n"; private final TextFormat.Parser parserWithOverwriteForbidden = TextFormat.Parser.newBuilder() - .setSingularOverwritePolicy( - SingularOverwritePolicy.FORBID_SINGULAR_OVERWRITES) + .setSingularOverwritePolicy(SingularOverwritePolicy.FORBID_SINGULAR_OVERWRITES) .build(); - private final TextFormat.Parser defaultParser = - TextFormat.Parser.newBuilder().build(); + private final TextFormat.Parser defaultParser = TextFormat.Parser.newBuilder().build(); /** Print TestAllTypes and compare with golden file. */ public void testPrintMessage() throws Exception { @@ -173,38 +179,32 @@ public class TextFormatTest extends TestCase { private UnknownFieldSet makeUnknownFieldSet() { return UnknownFieldSet.newBuilder() - .addField(5, + .addField( + 5, UnknownFieldSet.Field.newBuilder() - .addVarint(1) - .addFixed32(2) - .addFixed64(3) - .addLengthDelimited(ByteString.copyFromUtf8("4")) - .addLengthDelimited(UnknownFieldSet.newBuilder() - .addField(12, - UnknownFieldSet.Field.newBuilder() - .addVarint(6) + .addVarint(1) + .addFixed32(2) + .addFixed64(3) + .addLengthDelimited(ByteString.copyFromUtf8("4")) + .addLengthDelimited( + UnknownFieldSet.newBuilder() + .addField(12, UnknownFieldSet.Field.newBuilder().addVarint(6).build()) + .build() + .toByteString()) + .addGroup( + UnknownFieldSet.newBuilder() + .addField(10, UnknownFieldSet.Field.newBuilder().addVarint(5).build()) .build()) - .build().toByteString()) - .addGroup( - UnknownFieldSet.newBuilder() - .addField(10, - UnknownFieldSet.Field.newBuilder() - .addVarint(5) - .build()) .build()) - .build()) - .addField(8, - UnknownFieldSet.Field.newBuilder() - .addVarint(1) - .addVarint(2) - .addVarint(3) - .build()) - .addField(15, + .addField( + 8, UnknownFieldSet.Field.newBuilder().addVarint(1).addVarint(2).addVarint(3).build()) + .addField( + 15, UnknownFieldSet.Field.newBuilder() - .addVarint(0xABCDEF1234567890L) - .addFixed32(0xABCD1234) - .addFixed64(0xABCDEF1234567890L) - .build()) + .addVarint(0xABCDEF1234567890L) + .addFixed32(0xABCD1234) + .addFixed64(0xABCDEF1234567890L) + .build()) .build(); } @@ -212,9 +212,7 @@ public class TextFormatTest extends TestCase { // Test printing of unknown fields in a message. TestEmptyMessage message = - TestEmptyMessage.newBuilder() - .setUnknownFields(makeUnknownFieldSet()) - .build(); + TestEmptyMessage.newBuilder().setUnknownFields(makeUnknownFieldSet()).build(); assertEquals( "5: 1\n" @@ -237,34 +235,29 @@ public class TextFormatTest extends TestCase { } public void testPrintField() throws Exception { - final FieldDescriptor dataField = - OneString.getDescriptor().findFieldByName("data"); - assertEquals( - "data: \"test data\"\n", - TextFormat.printFieldToString(dataField, "test data")); + final FieldDescriptor dataField = OneString.getDescriptor().findFieldByName("data"); + assertEquals("data: \"test data\"\n", TextFormat.printFieldToString(dataField, "test data")); final FieldDescriptor optionalField = - TestAllTypes.getDescriptor().findFieldByName("optional_nested_message"); + TestAllTypes.getDescriptor().findFieldByName("optional_nested_message"); final Object value = NestedMessage.newBuilder().setBb(42).build(); assertEquals( - "optional_nested_message {\n bb: 42\n}\n", - TextFormat.printFieldToString(optionalField, value)); + "optional_nested_message {\n bb: 42\n}\n", + TextFormat.printFieldToString(optionalField, value)); } /** - * Helper to construct a ByteString from a String containing only 8-bit - * characters. The characters are converted directly to bytes, *not* - * encoded using UTF-8. + * Helper to construct a ByteString from a String containing only 8-bit characters. The characters + * are converted directly to bytes, *not* encoded using UTF-8. */ private ByteString bytes(String str) { return ByteString.copyFrom(str.getBytes(Internal.ISO_8859_1)); } /** - * Helper to construct a ByteString from a bunch of bytes. The inputs are - * actually ints so that I can use hex notation and not get stupid errors - * about precision. + * Helper to construct a ByteString from a bunch of bytes. The inputs are actually ints so that I + * can use hex notation and not get stupid errors about precision. */ private ByteString bytes(int... bytesAsInts) { byte[] bytes = new byte[bytesAsInts.length]; @@ -275,54 +268,54 @@ public class TextFormatTest extends TestCase { } public void testPrintExotic() throws Exception { - Message message = TestAllTypes.newBuilder() - // Signed vs. unsigned numbers. - .addRepeatedInt32 (-1) - .addRepeatedUint32(-1) - .addRepeatedInt64 (-1) - .addRepeatedUint64(-1) - - .addRepeatedInt32 (1 << 31) - .addRepeatedUint32(1 << 31) - .addRepeatedInt64 (1L << 63) - .addRepeatedUint64(1L << 63) - - // Floats of various precisions and exponents. - .addRepeatedDouble(123) - .addRepeatedDouble(123.5) - .addRepeatedDouble(0.125) - .addRepeatedDouble(.125) - .addRepeatedDouble(-.125) - .addRepeatedDouble(123e15) - .addRepeatedDouble(123e15) - .addRepeatedDouble(-1.23e-17) - .addRepeatedDouble(.23e17) - .addRepeatedDouble(-23e15) - .addRepeatedDouble(123.5e20) - .addRepeatedDouble(123.5e-20) - .addRepeatedDouble(123.456789) - .addRepeatedDouble(Double.POSITIVE_INFINITY) - .addRepeatedDouble(Double.NEGATIVE_INFINITY) - .addRepeatedDouble(Double.NaN) - - // Strings and bytes that needing escaping. - .addRepeatedString("\0\001\007\b\f\n\r\t\013\\\'\"\u1234") - .addRepeatedBytes(bytes("\0\001\007\b\f\n\r\t\013\\\'\"\u00fe")) - .build(); + Message message = + TestAllTypes.newBuilder() + // Signed vs. unsigned numbers. + .addRepeatedInt32(-1) + .addRepeatedUint32(-1) + .addRepeatedInt64(-1) + .addRepeatedUint64(-1) + .addRepeatedInt32(1 << 31) + .addRepeatedUint32(1 << 31) + .addRepeatedInt64(1L << 63) + .addRepeatedUint64(1L << 63) + + // Floats of various precisions and exponents. + .addRepeatedDouble(123) + .addRepeatedDouble(123.5) + .addRepeatedDouble(0.125) + .addRepeatedDouble(.125) + .addRepeatedDouble(-.125) + .addRepeatedDouble(123e15) + .addRepeatedDouble(123e15) + .addRepeatedDouble(-1.23e-17) + .addRepeatedDouble(.23e17) + .addRepeatedDouble(-23e15) + .addRepeatedDouble(123.5e20) + .addRepeatedDouble(123.5e-20) + .addRepeatedDouble(123.456789) + .addRepeatedDouble(Double.POSITIVE_INFINITY) + .addRepeatedDouble(Double.NEGATIVE_INFINITY) + .addRepeatedDouble(Double.NaN) + + // Strings and bytes that needing escaping. + .addRepeatedString("\0\001\007\b\f\n\r\t\013\\\'\"\u1234") + .addRepeatedBytes(bytes("\0\001\007\b\f\n\r\t\013\\\'\"\u00fe")) + .build(); assertEquals(canonicalExoticText, message.toString()); } public void testPrintMessageSet() throws Exception { TestMessageSet messageSet = - TestMessageSet.newBuilder() - .setExtension( - TestMessageSetExtension1.messageSetExtension, - TestMessageSetExtension1.newBuilder().setI(123).build()) - .setExtension( - TestMessageSetExtension2.messageSetExtension, - TestMessageSetExtension2.newBuilder().setStr("foo").build()) - .build(); + TestMessageSet.newBuilder() + .setExtension( + TestMessageSetExtension1.messageSetExtension, + TestMessageSetExtension1.newBuilder().setI(123).build()) + .setExtension( + TestMessageSetExtension2.messageSetExtension, + TestMessageSetExtension2.newBuilder().setStr("foo").build()) + .build(); assertEquals(messageSetText, messageSet.toString()); } @@ -336,22 +329,19 @@ public class TextFormatTest extends TestCase { } public void testParse() throws Exception { - TestUtil.assertAllFieldsSet( - TextFormat.parse(allFieldsSetText, TestAllTypes.class)); + TestUtil.assertAllFieldsSet(TextFormat.parse(allFieldsSetText, TestAllTypes.class)); } public void testMergeInitialized() throws Exception { TestRequired.Builder builder = TestRequired.newBuilder(); TextFormat.merge(TEST_REQUIRED_INITIALIZED.toString(), builder); - assertEquals(TEST_REQUIRED_INITIALIZED.toString(), - builder.buildPartial().toString()); + assertEquals(TEST_REQUIRED_INITIALIZED.toString(), builder.buildPartial().toString()); assertTrue(builder.isInitialized()); } public void testParseInitialized() throws Exception { TestRequired parsed = - TextFormat.parse(TEST_REQUIRED_INITIALIZED.toString(), - TestRequired.class); + TextFormat.parse(TEST_REQUIRED_INITIALIZED.toString(), TestRequired.class); assertEquals(TEST_REQUIRED_INITIALIZED.toString(), parsed.toString()); assertTrue(parsed.isInitialized()); } @@ -359,15 +349,13 @@ public class TextFormatTest extends TestCase { public void testMergeUninitialized() throws Exception { TestRequired.Builder builder = TestRequired.newBuilder(); TextFormat.merge(TEST_REQUIRED_UNINITIALIZED.toString(), builder); - assertEquals(TEST_REQUIRED_UNINITIALIZED.toString(), - builder.buildPartial().toString()); + assertEquals(TEST_REQUIRED_UNINITIALIZED.toString(), builder.buildPartial().toString()); assertFalse(builder.isInitialized()); } public void testParseUninitialized() throws Exception { try { - TextFormat.parse(TEST_REQUIRED_UNINITIALIZED.toString(), - TestRequired.class); + TextFormat.parse(TEST_REQUIRED_UNINITIALIZED.toString(), TestRequired.class); fail("Expected UninitializedMessageException."); } catch (UninitializedMessageException e) { assertEquals("Message missing required fields: b, c", e.getMessage()); @@ -382,44 +370,43 @@ public class TextFormatTest extends TestCase { public void testMergeExtensions() throws Exception { TestAllExtensions.Builder builder = TestAllExtensions.newBuilder(); - TextFormat.merge(allExtensionsSetText, - TestUtil.getExtensionRegistry(), - builder); + TextFormat.merge(allExtensionsSetText, TestUtil.getFullExtensionRegistry(), builder); TestUtil.assertAllExtensionsSet(builder.build()); } public void testParseExtensions() throws Exception { TestUtil.assertAllExtensionsSet( - TextFormat.parse(allExtensionsSetText, - TestUtil.getExtensionRegistry(), - TestAllExtensions.class)); + TextFormat.parse( + allExtensionsSetText, TestUtil.getFullExtensionRegistry(), TestAllExtensions.class)); } public void testMergeAndParseCompatibility() throws Exception { - String original = "repeated_float: inf\n" + - "repeated_float: -inf\n" + - "repeated_float: nan\n" + - "repeated_float: inff\n" + - "repeated_float: -inff\n" + - "repeated_float: nanf\n" + - "repeated_float: 1.0f\n" + - "repeated_float: infinityf\n" + - "repeated_float: -Infinityf\n" + - "repeated_double: infinity\n" + - "repeated_double: -infinity\n" + - "repeated_double: nan\n"; - String canonical = "repeated_float: Infinity\n" + - "repeated_float: -Infinity\n" + - "repeated_float: NaN\n" + - "repeated_float: Infinity\n" + - "repeated_float: -Infinity\n" + - "repeated_float: NaN\n" + - "repeated_float: 1.0\n" + - "repeated_float: Infinity\n" + - "repeated_float: -Infinity\n" + - "repeated_double: Infinity\n" + - "repeated_double: -Infinity\n" + - "repeated_double: NaN\n"; + String original = + "repeated_float: inf\n" + + "repeated_float: -inf\n" + + "repeated_float: nan\n" + + "repeated_float: inff\n" + + "repeated_float: -inff\n" + + "repeated_float: nanf\n" + + "repeated_float: 1.0f\n" + + "repeated_float: infinityf\n" + + "repeated_float: -Infinityf\n" + + "repeated_double: infinity\n" + + "repeated_double: -infinity\n" + + "repeated_double: nan\n"; + String canonical = + "repeated_float: Infinity\n" + + "repeated_float: -Infinity\n" + + "repeated_float: NaN\n" + + "repeated_float: Infinity\n" + + "repeated_float: -Infinity\n" + + "repeated_float: NaN\n" + + "repeated_float: 1.0\n" + + "repeated_float: Infinity\n" + + "repeated_float: -Infinity\n" + + "repeated_double: Infinity\n" + + "repeated_double: -Infinity\n" + + "repeated_double: NaN\n"; // Test merge(). TestAllTypes.Builder builder = TestAllTypes.newBuilder(); @@ -427,8 +414,7 @@ public class TextFormatTest extends TestCase { assertEquals(canonical, builder.build().toString()); // Test parse(). - assertEquals(canonical, - TextFormat.parse(original, TestAllTypes.class).toString()); + assertEquals(canonical, TextFormat.parse(original, TestAllTypes.class).toString()); } public void testMergeAndParseExotic() throws Exception { @@ -438,8 +424,7 @@ public class TextFormatTest extends TestCase { // Too lazy to check things individually. Don't try to debug this // if testPrintExotic() is failing. assertEquals(canonicalExoticText, builder.build().toString()); - assertEquals(canonicalExoticText, - TextFormat.parse(exoticText, TestAllTypes.class).toString()); + assertEquals(canonicalExoticText, TextFormat.parse(exoticText, TestAllTypes.class).toString()); } public void testMergeMessageSet() throws Exception { @@ -451,21 +436,16 @@ public class TextFormatTest extends TestCase { TextFormat.merge(messageSetText, extensionRegistry, builder); TestMessageSet messageSet = builder.build(); - assertTrue(messageSet.hasExtension( - TestMessageSetExtension1.messageSetExtension)); - assertEquals(123, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); - assertTrue(messageSet.hasExtension( - TestMessageSetExtension2.messageSetExtension)); - assertEquals("foo", messageSet.getExtension( - TestMessageSetExtension2.messageSetExtension).getStr()); + assertTrue(messageSet.hasExtension(TestMessageSetExtension1.messageSetExtension)); + assertEquals(123, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); + assertTrue(messageSet.hasExtension(TestMessageSetExtension2.messageSetExtension)); + assertEquals( + "foo", messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr()); builder = TestMessageSet.newBuilder(); - TextFormat.merge(messageSetTextWithRepeatedExtension, extensionRegistry, - builder); + TextFormat.merge(messageSetTextWithRepeatedExtension, extensionRegistry, builder); messageSet = builder.build(); - assertEquals(456, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); + assertEquals(456, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); } public void testMergeMessageSetWithOverwriteForbidden() throws Exception { @@ -474,13 +454,11 @@ public class TextFormatTest extends TestCase { extensionRegistry.add(TestMessageSetExtension2.messageSetExtension); TestMessageSet.Builder builder = TestMessageSet.newBuilder(); - parserWithOverwriteForbidden.merge( - messageSetText, extensionRegistry, builder); + parserWithOverwriteForbidden.merge(messageSetText, extensionRegistry, builder); TestMessageSet messageSet = builder.build(); - assertEquals(123, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); - assertEquals("foo", messageSet.getExtension( - TestMessageSetExtension2.messageSetExtension).getStr()); + assertEquals(123, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); + assertEquals( + "foo", messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr()); builder = TestMessageSet.newBuilder(); try { @@ -488,9 +466,10 @@ public class TextFormatTest extends TestCase { messageSetTextWithRepeatedExtension, extensionRegistry, builder); fail("expected parse exception"); } catch (TextFormat.ParseException e) { - assertEquals("6:1: Non-repeated field " - + "\"protobuf_unittest.TestMessageSetExtension1.message_set_extension\"" - + " cannot be overwritten.", + assertEquals( + "6:1: Non-repeated field " + + "\"protobuf_unittest.TestMessageSetExtension1.message_set_extension\"" + + " cannot be overwritten.", e.getMessage()); } } @@ -511,10 +490,11 @@ public class TextFormatTest extends TestCase { public void testMergeComment() throws Exception { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TextFormat.merge( - "# this is a comment\n" + - "optional_int32: 1 # another comment\n" + - "optional_int64: 2\n" + - "# EOF comment", builder); + "# this is a comment\n" + + "optional_int32: 1 # another comment\n" + + "optional_int64: 2\n" + + "# EOF comment", + builder); assertEquals(1, builder.getOptionalInt32()); assertEquals(2, builder.getOptionalInt64()); } @@ -523,7 +503,7 @@ public class TextFormatTest extends TestCase { // Test merge(). TestAllTypes.Builder builder = TestAllTypes.newBuilder(); try { - TextFormat.merge(text, TestUtil.getExtensionRegistry(), builder); + TextFormat.merge(text, TestUtil.getFullExtensionRegistry(), builder); fail("Expected parse exception."); } catch (TextFormat.ParseException e) { assertEquals(error, e.getMessage()); @@ -531,8 +511,7 @@ public class TextFormatTest extends TestCase { // Test parse(). try { - TextFormat.parse( - text, TestUtil.getExtensionRegistry(), TestAllTypes.class); + TextFormat.parse(text, TestUtil.getFullExtensionRegistry(), TestAllTypes.class); fail("Expected parse exception."); } catch (TextFormat.ParseException e) { assertEquals(error, e.getMessage()); @@ -540,131 +519,101 @@ public class TextFormatTest extends TestCase { } - private void assertParseErrorWithOverwriteForbidden(String error, - String text) { + private void assertParseErrorWithOverwriteForbidden(String error, String text) { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); try { - parserWithOverwriteForbidden.merge( - text, TestUtil.getExtensionRegistry(), builder); + parserWithOverwriteForbidden.merge(text, TestUtil.getFullExtensionRegistry(), builder); fail("Expected parse exception."); } catch (TextFormat.ParseException e) { assertEquals(error, e.getMessage()); } } - private TestAllTypes assertParseSuccessWithOverwriteForbidden( - String text) throws TextFormat.ParseException { + private TestAllTypes assertParseSuccessWithOverwriteForbidden(String text) + throws TextFormat.ParseException { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); - parserWithOverwriteForbidden.merge( - text, TestUtil.getExtensionRegistry(), builder); + parserWithOverwriteForbidden.merge(text, TestUtil.getFullExtensionRegistry(), builder); return builder.build(); } public void testParseErrors() throws Exception { + assertParseError("1:16: Expected \":\".", "optional_int32 123"); + assertParseError("1:23: Expected identifier. Found '?'", "optional_nested_enum: ?"); assertParseError( - "1:16: Expected \":\".", - "optional_int32 123"); - assertParseError( - "1:23: Expected identifier. Found '?'", - "optional_nested_enum: ?"); - assertParseError( - "1:18: Couldn't parse integer: Number must be positive: -1", - "optional_uint32: -1"); - assertParseError( - "1:17: Couldn't parse integer: Number out of range for 32-bit signed " + - "integer: 82301481290849012385230157", - "optional_int32: 82301481290849012385230157"); + "1:18: Couldn't parse integer: Number must be positive: -1", "optional_uint32: -1"); assertParseError( - "1:16: Expected \"true\" or \"false\". Found \"maybe\".", - "optional_bool: maybe"); + "1:17: Couldn't parse integer: Number out of range for 32-bit signed " + + "integer: 82301481290849012385230157", + "optional_int32: 82301481290849012385230157"); assertParseError( - "1:16: Expected \"true\" or \"false\". Found \"2\".", - "optional_bool: 2"); + "1:16: Expected \"true\" or \"false\". Found \"maybe\".", "optional_bool: maybe"); + assertParseError("1:16: Expected \"true\" or \"false\". Found \"2\".", "optional_bool: 2"); + assertParseError("1:18: Expected string.", "optional_string: 123"); + assertParseError("1:18: String missing ending quote.", "optional_string: \"ueoauaoe"); assertParseError( - "1:18: Expected string.", - "optional_string: 123"); + "1:18: String missing ending quote.", "optional_string: \"ueoauaoe\noptional_int32: 123"); + assertParseError("1:18: Invalid escape sequence: '\\z'", "optional_string: \"\\z\""); assertParseError( - "1:18: String missing ending quote.", - "optional_string: \"ueoauaoe"); + "1:18: String missing ending quote.", "optional_string: \"ueoauaoe\noptional_int32: 123"); assertParseError( - "1:18: String missing ending quote.", - "optional_string: \"ueoauaoe\n" + - "optional_int32: 123"); + "1:2: Input contains unknown fields and/or extensions:\n" + + "1:2:\tprotobuf_unittest.TestAllTypes.[nosuchext]", + "[nosuchext]: 123"); assertParseError( - "1:18: Invalid escape sequence: '\\z'", - "optional_string: \"\\z\""); + "1:20: Extension \"protobuf_unittest.optional_int32_extension\" does " + + "not extend message type \"protobuf_unittest.TestAllTypes\".", + "[protobuf_unittest.optional_int32_extension]: 123"); assertParseError( - "1:18: String missing ending quote.", - "optional_string: \"ueoauaoe\n" + - "optional_int32: 123"); + "1:1: Input contains unknown fields and/or extensions:\n" + + "1:1:\tprotobuf_unittest.TestAllTypes.nosuchfield", + "nosuchfield: 123"); + assertParseError("1:21: Expected \">\".", "OptionalGroup < a: 1"); assertParseError( - "1:2: Input contains unknown fields and/or extensions:\n" + - "1:2:\tprotobuf_unittest.TestAllTypes.[nosuchext]", - "[nosuchext]: 123"); + "1:23: Enum type \"protobuf_unittest.TestAllTypes.NestedEnum\" has no " + + "value named \"NO_SUCH_VALUE\".", + "optional_nested_enum: NO_SUCH_VALUE"); assertParseError( - "1:20: Extension \"protobuf_unittest.optional_int32_extension\" does " + - "not extend message type \"protobuf_unittest.TestAllTypes\".", - "[protobuf_unittest.optional_int32_extension]: 123"); - assertParseError( - "1:1: Input contains unknown fields and/or extensions:\n" + - "1:1:\tprotobuf_unittest.TestAllTypes.nosuchfield", - "nosuchfield: 123"); - assertParseError( - "1:21: Expected \">\".", - "OptionalGroup < a: 1"); - assertParseError( - "1:23: Enum type \"protobuf_unittest.TestAllTypes.NestedEnum\" has no " + - "value named \"NO_SUCH_VALUE\".", - "optional_nested_enum: NO_SUCH_VALUE"); - assertParseError( - "1:23: Enum type \"protobuf_unittest.TestAllTypes.NestedEnum\" has no " + - "value with number 123.", - "optional_nested_enum: 123"); + "1:23: Enum type \"protobuf_unittest.TestAllTypes.NestedEnum\" has no " + + "value with number 123.", + "optional_nested_enum: 123"); // Delimiters must match. - assertParseError( - "1:22: Expected identifier. Found '}'", - "OptionalGroup < a: 1 }"); - assertParseError( - "1:22: Expected identifier. Found '>'", - "OptionalGroup { a: 1 >"); + assertParseError("1:22: Expected identifier. Found '}'", "OptionalGroup < a: 1 }"); + assertParseError("1:22: Expected identifier. Found '>'", "OptionalGroup { a: 1 >"); } // ================================================================= public void testEscape() throws Exception { // Escape sequences. - assertEquals("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\177", - TextFormat.escapeBytes(bytes("\0\001\007\b\f\n\r\t\013\\\'\"\177"))); - assertEquals("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\177", - TextFormat.escapeText("\0\001\007\b\f\n\r\t\013\\\'\"\177")); - assertEquals(bytes("\0\001\007\b\f\n\r\t\013\\\'\""), - TextFormat.unescapeBytes("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); - assertEquals("\0\001\007\b\f\n\r\t\013\\\'\"", - TextFormat.unescapeText("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); + assertEquals( + "\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\177", + TextFormat.escapeBytes(bytes("\0\001\007\b\f\n\r\t\013\\\'\"\177"))); + assertEquals( + "\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\177", + TextFormat.escapeText("\0\001\007\b\f\n\r\t\013\\\'\"\177")); + assertEquals( + bytes("\0\001\007\b\f\n\r\t\013\\\'\""), + TextFormat.unescapeBytes("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); + assertEquals( + "\0\001\007\b\f\n\r\t\013\\\'\"", + TextFormat.unescapeText("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); assertEquals(ESCAPE_TEST_STRING_ESCAPED, TextFormat.escapeText(ESCAPE_TEST_STRING)); assertEquals(ESCAPE_TEST_STRING, TextFormat.unescapeText(ESCAPE_TEST_STRING_ESCAPED)); // Invariant - assertEquals("hello", - TextFormat.escapeBytes(bytes("hello"))); - assertEquals("hello", - TextFormat.escapeText("hello")); - assertEquals(bytes("hello"), - TextFormat.unescapeBytes("hello")); - assertEquals("hello", - TextFormat.unescapeText("hello")); + assertEquals("hello", TextFormat.escapeBytes(bytes("hello"))); + assertEquals("hello", TextFormat.escapeText("hello")); + assertEquals(bytes("hello"), TextFormat.unescapeBytes("hello")); + assertEquals("hello", TextFormat.unescapeText("hello")); // Unicode handling. assertEquals("\\341\\210\\264", TextFormat.escapeText("\u1234")); - assertEquals("\\341\\210\\264", - TextFormat.escapeBytes(bytes(0xe1, 0x88, 0xb4))); + assertEquals("\\341\\210\\264", TextFormat.escapeBytes(bytes(0xe1, 0x88, 0xb4))); assertEquals("\u1234", TextFormat.unescapeText("\\341\\210\\264")); - assertEquals(bytes(0xe1, 0x88, 0xb4), - TextFormat.unescapeBytes("\\341\\210\\264")); + assertEquals(bytes(0xe1, 0x88, 0xb4), TextFormat.unescapeBytes("\\341\\210\\264")); assertEquals("\u1234", TextFormat.unescapeText("\\xe1\\x88\\xb4")); - assertEquals(bytes(0xe1, 0x88, 0xb4), - TextFormat.unescapeBytes("\\xe1\\x88\\xb4")); + assertEquals(bytes(0xe1, 0x88, 0xb4), TextFormat.unescapeBytes("\\xe1\\x88\\xb4")); // Handling of strings with unescaped Unicode characters > 255. final String zh = "\u9999\u6e2f\u4e0a\u6d77\ud84f\udf80\u8c50\u9280\u884c"; @@ -695,53 +644,48 @@ public class TextFormatTest extends TestCase { } public void testParseInteger() throws Exception { - assertEquals( 0, TextFormat.parseInt32( "0")); - assertEquals( 1, TextFormat.parseInt32( "1")); - assertEquals( -1, TextFormat.parseInt32( "-1")); - assertEquals( 12345, TextFormat.parseInt32( "12345")); - assertEquals( -12345, TextFormat.parseInt32( "-12345")); - assertEquals( 2147483647, TextFormat.parseInt32( "2147483647")); + assertEquals(0, TextFormat.parseInt32("0")); + assertEquals(1, TextFormat.parseInt32("1")); + assertEquals(-1, TextFormat.parseInt32("-1")); + assertEquals(12345, TextFormat.parseInt32("12345")); + assertEquals(-12345, TextFormat.parseInt32("-12345")); + assertEquals(2147483647, TextFormat.parseInt32("2147483647")); assertEquals(-2147483648, TextFormat.parseInt32("-2147483648")); - assertEquals( 0, TextFormat.parseUInt32( "0")); - assertEquals( 1, TextFormat.parseUInt32( "1")); - assertEquals( 12345, TextFormat.parseUInt32( "12345")); - assertEquals( 2147483647, TextFormat.parseUInt32("2147483647")); + assertEquals(0, TextFormat.parseUInt32("0")); + assertEquals(1, TextFormat.parseUInt32("1")); + assertEquals(12345, TextFormat.parseUInt32("12345")); + assertEquals(2147483647, TextFormat.parseUInt32("2147483647")); assertEquals((int) 2147483648L, TextFormat.parseUInt32("2147483648")); assertEquals((int) 4294967295L, TextFormat.parseUInt32("4294967295")); - assertEquals( 0L, TextFormat.parseInt64( "0")); - assertEquals( 1L, TextFormat.parseInt64( "1")); - assertEquals( -1L, TextFormat.parseInt64( "-1")); - assertEquals( 12345L, TextFormat.parseInt64( "12345")); - assertEquals( -12345L, TextFormat.parseInt64( "-12345")); - assertEquals( 2147483647L, TextFormat.parseInt64( "2147483647")); + assertEquals(0L, TextFormat.parseInt64("0")); + assertEquals(1L, TextFormat.parseInt64("1")); + assertEquals(-1L, TextFormat.parseInt64("-1")); + assertEquals(12345L, TextFormat.parseInt64("12345")); + assertEquals(-12345L, TextFormat.parseInt64("-12345")); + assertEquals(2147483647L, TextFormat.parseInt64("2147483647")); assertEquals(-2147483648L, TextFormat.parseInt64("-2147483648")); - assertEquals( 4294967295L, TextFormat.parseInt64( "4294967295")); - assertEquals( 4294967296L, TextFormat.parseInt64( "4294967296")); - assertEquals(9223372036854775807L, - TextFormat.parseInt64("9223372036854775807")); - assertEquals(-9223372036854775808L, - TextFormat.parseInt64("-9223372036854775808")); - - assertEquals( 0L, TextFormat.parseUInt64( "0")); - assertEquals( 1L, TextFormat.parseUInt64( "1")); - assertEquals( 12345L, TextFormat.parseUInt64( "12345")); - assertEquals( 2147483647L, TextFormat.parseUInt64( "2147483647")); - assertEquals( 4294967295L, TextFormat.parseUInt64( "4294967295")); - assertEquals( 4294967296L, TextFormat.parseUInt64( "4294967296")); - assertEquals(9223372036854775807L, - TextFormat.parseUInt64("9223372036854775807")); - assertEquals(-9223372036854775808L, - TextFormat.parseUInt64("9223372036854775808")); + assertEquals(4294967295L, TextFormat.parseInt64("4294967295")); + assertEquals(4294967296L, TextFormat.parseInt64("4294967296")); + assertEquals(9223372036854775807L, TextFormat.parseInt64("9223372036854775807")); + assertEquals(-9223372036854775808L, TextFormat.parseInt64("-9223372036854775808")); + + assertEquals(0L, TextFormat.parseUInt64("0")); + assertEquals(1L, TextFormat.parseUInt64("1")); + assertEquals(12345L, TextFormat.parseUInt64("12345")); + assertEquals(2147483647L, TextFormat.parseUInt64("2147483647")); + assertEquals(4294967295L, TextFormat.parseUInt64("4294967295")); + assertEquals(4294967296L, TextFormat.parseUInt64("4294967296")); + assertEquals(9223372036854775807L, TextFormat.parseUInt64("9223372036854775807")); + assertEquals(-9223372036854775808L, TextFormat.parseUInt64("9223372036854775808")); assertEquals(-1L, TextFormat.parseUInt64("18446744073709551615")); // Hex assertEquals(0x1234abcd, TextFormat.parseInt32("0x1234abcd")); assertEquals(-0x1234abcd, TextFormat.parseInt32("-0x1234abcd")); assertEquals(-1, TextFormat.parseUInt64("0xffffffffffffffff")); - assertEquals(0x7fffffffffffffffL, - TextFormat.parseInt64("0x7fffffffffffffff")); + assertEquals(0x7fffffffffffffffL, TextFormat.parseInt64("0x7fffffffffffffff")); // Octal assertEquals(01234567, TextFormat.parseInt32("01234567")); @@ -821,26 +765,26 @@ public class TextFormatTest extends TestCase { public void testParseLongString() throws Exception { String longText = - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890" + - "123456789012345678901234567890123456789012345678901234567890"; + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890" + + "123456789012345678901234567890123456789012345678901234567890"; TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TextFormat.merge("optional_string: \"" + longText + "\"", builder); @@ -849,16 +793,16 @@ public class TextFormatTest extends TestCase { public void testParseBoolean() throws Exception { String goodText = - "repeated_bool: t repeated_bool : 0\n" + - "repeated_bool :f repeated_bool:1\n" + - "repeated_bool: False repeated_bool: True"; + "repeated_bool: t repeated_bool : 0\n" + + "repeated_bool :f repeated_bool:1\n" + + "repeated_bool: False repeated_bool: True"; String goodTextCanonical = - "repeated_bool: true\n" + - "repeated_bool: false\n" + - "repeated_bool: false\n" + - "repeated_bool: true\n" + - "repeated_bool: false\n" + - "repeated_bool: true\n"; + "repeated_bool: true\n" + + "repeated_bool: false\n" + + "repeated_bool: false\n" + + "repeated_bool: true\n" + + "repeated_bool: false\n" + + "repeated_bool: true\n"; TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TextFormat.merge(goodText, builder); assertEquals(goodTextCanonical, builder.build().toString()); @@ -887,83 +831,75 @@ public class TextFormatTest extends TestCase { public void testPrintFieldValue() throws Exception { assertPrintFieldValue("\"Hello\"", "Hello", "repeated_string"); - assertPrintFieldValue("123.0", 123f, "repeated_float"); - assertPrintFieldValue("123.0", 123d, "repeated_double"); - assertPrintFieldValue("123", 123, "repeated_int32"); - assertPrintFieldValue("123", 123L, "repeated_int64"); - assertPrintFieldValue("true", true, "repeated_bool"); + assertPrintFieldValue("123.0", 123f, "repeated_float"); + assertPrintFieldValue("123.0", 123d, "repeated_double"); + assertPrintFieldValue("123", 123, "repeated_int32"); + assertPrintFieldValue("123", 123L, "repeated_int64"); + assertPrintFieldValue("true", true, "repeated_bool"); assertPrintFieldValue("4294967295", 0xFFFFFFFF, "repeated_uint32"); - assertPrintFieldValue("18446744073709551615", 0xFFFFFFFFFFFFFFFFL, - "repeated_uint64"); - assertPrintFieldValue("\"\\001\\002\\003\"", - ByteString.copyFrom(new byte[] {1, 2, 3}), "repeated_bytes"); + assertPrintFieldValue("18446744073709551615", 0xFFFFFFFFFFFFFFFFL, "repeated_uint64"); + assertPrintFieldValue( + "\"\\001\\002\\003\"", ByteString.copyFrom(new byte[] {1, 2, 3}), "repeated_bytes"); } - private void assertPrintFieldValue(String expect, Object value, - String fieldName) throws Exception { + private void assertPrintFieldValue(String expect, Object value, String fieldName) + throws Exception { StringBuilder sb = new StringBuilder(); - TextFormat.printFieldValue( - TestAllTypes.getDescriptor().findFieldByName(fieldName), - value, sb); + TextFormat.printFieldValue(TestAllTypes.getDescriptor().findFieldByName(fieldName), value, sb); assertEquals(expect, sb.toString()); } public void testShortDebugString() { - assertEquals("optional_nested_message { bb: 42 } repeated_int32: 1" - + " repeated_uint32: 2", - TextFormat.shortDebugString(TestAllTypes.newBuilder() - .addRepeatedInt32(1) - .addRepeatedUint32(2) - .setOptionalNestedMessage( - NestedMessage.newBuilder().setBb(42).build()) - .build())); + assertEquals( + "optional_nested_message { bb: 42 } repeated_int32: 1 repeated_uint32: 2", + TextFormat.shortDebugString( + TestAllTypes.newBuilder() + .addRepeatedInt32(1) + .addRepeatedUint32(2) + .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(42).build()) + .build())); } public void testShortDebugString_field() { - final FieldDescriptor dataField = - OneString.getDescriptor().findFieldByName("data"); - assertEquals( - "data: \"test data\"", - TextFormat.shortDebugString(dataField, "test data")); + final FieldDescriptor dataField = OneString.getDescriptor().findFieldByName("data"); + assertEquals("data: \"test data\"", TextFormat.shortDebugString(dataField, "test data")); final FieldDescriptor optionalField = - TestAllTypes.getDescriptor().findFieldByName("optional_nested_message"); + TestAllTypes.getDescriptor().findFieldByName("optional_nested_message"); final Object value = NestedMessage.newBuilder().setBb(42).build(); assertEquals( - "optional_nested_message { bb: 42 }", - TextFormat.shortDebugString(optionalField, value)); + "optional_nested_message { bb: 42 }", TextFormat.shortDebugString(optionalField, value)); } public void testShortDebugString_unknown() { - assertEquals("5: 1 5: 0x00000002 5: 0x0000000000000003 5: \"4\" 5: { 12: 6 } 5 { 10: 5 }" - + " 8: 1 8: 2 8: 3 15: 12379813812177893520 15: 0xabcd1234 15:" - + " 0xabcdef1234567890", + assertEquals( + "5: 1 5: 0x00000002 5: 0x0000000000000003 5: \"4\" 5: { 12: 6 } 5 { 10: 5 }" + + " 8: 1 8: 2 8: 3 15: 12379813812177893520 15: 0xabcd1234 15:" + + " 0xabcdef1234567890", TextFormat.shortDebugString(makeUnknownFieldSet())); } public void testPrintToUnicodeString() throws Exception { assertEquals( - "optional_string: \"abc\u3042efg\"\n" + - "optional_bytes: \"\\343\\201\\202\"\n" + - "repeated_string: \"\u3093XYZ\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("abc\u3042efg") - .setOptionalBytes(bytes(0xe3, 0x81, 0x82)) - .addRepeatedString("\u3093XYZ") - .build())); + "optional_string: \"abc\u3042efg\"\n" + + "optional_bytes: \"\\343\\201\\202\"\n" + + "repeated_string: \"\u3093XYZ\"\n", + TextFormat.printToUnicodeString( + TestAllTypes.newBuilder() + .setOptionalString("abc\u3042efg") + .setOptionalBytes(bytes(0xe3, 0x81, 0x82)) + .addRepeatedString("\u3093XYZ") + .build())); // Double quotes and backslashes should be escaped assertEquals( "optional_string: \"a\\\\bc\\\"ef\\\"g\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("a\\bc\"ef\"g") - .build())); + TextFormat.printToUnicodeString( + TestAllTypes.newBuilder().setOptionalString("a\\bc\"ef\"g").build())); // Test escaping roundtrip - TestAllTypes message = TestAllTypes.newBuilder() - .setOptionalString("a\\bc\\\"ef\"g") - .build(); + TestAllTypes message = TestAllTypes.newBuilder().setOptionalString("a\\bc\\\"ef\"g").build(); TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TextFormat.merge(TextFormat.printToUnicodeString(message), builder); assertEquals(message.getOptionalString(), builder.getOptionalString()); @@ -971,35 +907,34 @@ public class TextFormatTest extends TestCase { public void testPrintToUnicodeStringWithNewlines() throws Exception { // No newlines at start and end - assertEquals("optional_string: \"test newlines\\n\\nin\\nstring\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("test newlines\n\nin\nstring") - .build())); + assertEquals( + "optional_string: \"test newlines\\n\\nin\\nstring\"\n", + TextFormat.printToUnicodeString( + TestAllTypes.newBuilder().setOptionalString("test newlines\n\nin\nstring").build())); // Newlines at start and end - assertEquals("optional_string: \"\\ntest\\nnewlines\\n\\nin\\nstring\\n\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("\ntest\nnewlines\n\nin\nstring\n") - .build())); + assertEquals( + "optional_string: \"\\ntest\\nnewlines\\n\\nin\\nstring\\n\"\n", + TextFormat.printToUnicodeString( + TestAllTypes.newBuilder() + .setOptionalString("\ntest\nnewlines\n\nin\nstring\n") + .build())); // Strings with 0, 1 and 2 newlines. - assertEquals("optional_string: \"\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("") - .build())); - assertEquals("optional_string: \"\\n\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("\n") - .build())); - assertEquals("optional_string: \"\\n\\n\"\n", - TextFormat.printToUnicodeString(TestAllTypes.newBuilder() - .setOptionalString("\n\n") - .build())); + assertEquals( + "optional_string: \"\"\n", + TextFormat.printToUnicodeString(TestAllTypes.newBuilder().setOptionalString("").build())); + assertEquals( + "optional_string: \"\\n\"\n", + TextFormat.printToUnicodeString(TestAllTypes.newBuilder().setOptionalString("\n").build())); + assertEquals( + "optional_string: \"\\n\\n\"\n", + TextFormat.printToUnicodeString( + TestAllTypes.newBuilder().setOptionalString("\n\n").build())); // Test escaping roundtrip - TestAllTypes message = TestAllTypes.newBuilder() - .setOptionalString("\ntest\nnewlines\n\nin\nstring\n") - .build(); + TestAllTypes message = + TestAllTypes.newBuilder().setOptionalString("\ntest\nnewlines\n\nin\nstring\n").build(); TestAllTypes.Builder builder = TestAllTypes.newBuilder(); TextFormat.merge(TextFormat.printToUnicodeString(message), builder); assertEquals(message.getOptionalString(), builder.getOptionalString()); @@ -1008,57 +943,51 @@ public class TextFormatTest extends TestCase { public void testPrintToUnicodeString_unknown() { assertEquals( "1: \"\\343\\201\\202\"\n", - TextFormat.printToUnicodeString(UnknownFieldSet.newBuilder() - .addField(1, - UnknownFieldSet.Field.newBuilder() - .addLengthDelimited(bytes(0xe3, 0x81, 0x82)).build()) - .build())); + TextFormat.printToUnicodeString( + UnknownFieldSet.newBuilder() + .addField( + 1, + UnknownFieldSet.Field.newBuilder() + .addLengthDelimited(bytes(0xe3, 0x81, 0x82)) + .build()) + .build())); } // See additional coverage in testOneofOverwriteForbidden and testMapOverwriteForbidden. public void testParseNonRepeatedFields() throws Exception { + assertParseSuccessWithOverwriteForbidden("repeated_int32: 1\nrepeated_int32: 2\n"); + assertParseSuccessWithOverwriteForbidden("RepeatedGroup { a: 1 }\nRepeatedGroup { a: 2 }\n"); assertParseSuccessWithOverwriteForbidden( - "repeated_int32: 1\n" + - "repeated_int32: 2\n"); - assertParseSuccessWithOverwriteForbidden( - "RepeatedGroup { a: 1 }\n" + - "RepeatedGroup { a: 2 }\n"); - assertParseSuccessWithOverwriteForbidden( - "repeated_nested_message { bb: 1 }\n" + - "repeated_nested_message { bb: 2 }\n"); + "repeated_nested_message { bb: 1 }\nrepeated_nested_message { bb: 2 }\n"); assertParseErrorWithOverwriteForbidden( - "3:17: Non-repeated field " + - "\"protobuf_unittest.TestAllTypes.optional_int32\" " + - "cannot be overwritten.", - "optional_int32: 1\n" + - "optional_bool: true\n" + - "optional_int32: 1\n"); + "3:17: Non-repeated field " + + "\"protobuf_unittest.TestAllTypes.optional_int32\" " + + "cannot be overwritten.", + "optional_int32: 1\noptional_bool: true\noptional_int32: 1\n"); assertParseErrorWithOverwriteForbidden( - "2:17: Non-repeated field " + - "\"protobuf_unittest.TestAllTypes.optionalgroup\" " + - "cannot be overwritten.", - "OptionalGroup { a: 1 }\n" + - "OptionalGroup { }\n"); + "2:17: Non-repeated field " + + "\"protobuf_unittest.TestAllTypes.optionalgroup\" " + + "cannot be overwritten.", + "OptionalGroup { a: 1 }\nOptionalGroup { }\n"); assertParseErrorWithOverwriteForbidden( - "2:33: Non-repeated field " + - "\"protobuf_unittest.TestAllTypes.optional_nested_message\" " + - "cannot be overwritten.", - "optional_nested_message { }\n" + - "optional_nested_message { bb: 3 }\n"); + "2:33: Non-repeated field " + + "\"protobuf_unittest.TestAllTypes.optional_nested_message\" " + + "cannot be overwritten.", + "optional_nested_message { }\noptional_nested_message { bb: 3 }\n"); assertParseErrorWithOverwriteForbidden( - "2:16: Non-repeated field " + - "\"protobuf_unittest.TestAllTypes.default_int32\" " + - "cannot be overwritten.", - "default_int32: 41\n" + // the default value - "default_int32: 41\n"); + "2:16: Non-repeated field " + + "\"protobuf_unittest.TestAllTypes.default_int32\" " + + "cannot be overwritten.", + "default_int32: 41\n" + + // the default value + "default_int32: 41\n"); assertParseErrorWithOverwriteForbidden( - "2:17: Non-repeated field " + - "\"protobuf_unittest.TestAllTypes.default_string\" " + - "cannot be overwritten.", - "default_string: \"zxcv\"\n" + - "default_string: \"asdf\"\n"); + "2:17: Non-repeated field " + + "\"protobuf_unittest.TestAllTypes.default_string\" " + + "cannot be overwritten.", + "default_string: \"zxcv\"\ndefault_string: \"asdf\"\n"); } public void testParseShortRepeatedFormOfRepeatedFields() throws Exception { @@ -1079,27 +1008,20 @@ public class TextFormatTest extends TestCase { public void testParseShortRepeatedFormWithTrailingComma() throws Exception { assertParseErrorWithOverwriteForbidden( - "1:38: Expected identifier. Found \']\'", - "repeated_foreign_enum: [FOREIGN_FOO, ]\n"); - assertParseErrorWithOverwriteForbidden( - "1:22: Couldn't parse integer: For input string: \"]\"", - "repeated_int32: [ 1, ]\n"); + "1:38: Expected identifier. Found \']\'", "repeated_foreign_enum: [FOREIGN_FOO, ]\n"); assertParseErrorWithOverwriteForbidden( - "1:25: Expected \"{\".", - "RepeatedGroup [{ a: 1 },]\n"); + "1:22: Couldn't parse integer: For input string: \"]\"", "repeated_int32: [ 1, ]\n"); + assertParseErrorWithOverwriteForbidden("1:25: Expected \"{\".", "RepeatedGroup [{ a: 1 },]\n"); assertParseErrorWithOverwriteForbidden( - "1:37: Expected \"{\".", - "repeated_nested_message [{ bb: 1 }, ]\n"); + "1:37: Expected \"{\".", "repeated_nested_message [{ bb: 1 }, ]\n"); // See also testMapShortFormTrailingComma. } public void testParseShortRepeatedFormOfNonRepeatedFields() throws Exception { assertParseErrorWithOverwriteForbidden( - "1:17: Couldn't parse integer: For input string: \"[\"", - "optional_int32: [1]\n"); + "1:17: Couldn't parse integer: For input string: \"[\"", "optional_int32: [1]\n"); assertParseErrorWithOverwriteForbidden( - "1:17: Couldn't parse integer: For input string: \"[\"", - "optional_int32: []\n"); + "1:17: Couldn't parse integer: For input string: \"[\"", "optional_int32: []\n"); } // ======================================================================= @@ -1118,20 +1040,21 @@ public class TextFormatTest extends TestCase { String input = "foo_string: \"stringvalue\" foo_int: 123"; TestOneof2.Builder builder = TestOneof2.newBuilder(); try { - parserWithOverwriteForbidden.merge( - input, TestUtil.getExtensionRegistry(), builder); + parserWithOverwriteForbidden.merge(input, TestUtil.getFullExtensionRegistry(), builder); fail("Expected parse exception."); } catch (TextFormat.ParseException e) { - assertEquals("1:36: Field \"protobuf_unittest.TestOneof2.foo_int\"" - + " is specified along with field \"protobuf_unittest.TestOneof2.foo_string\"," - + " another member of oneof \"foo\".", e.getMessage()); + assertEquals( + "1:36: Field \"protobuf_unittest.TestOneof2.foo_int\"" + + " is specified along with field \"protobuf_unittest.TestOneof2.foo_string\"," + + " another member of oneof \"foo\".", + e.getMessage()); } } public void testOneofOverwriteAllowed() throws Exception { String input = "foo_string: \"stringvalue\" foo_int: 123"; TestOneof2.Builder builder = TestOneof2.newBuilder(); - defaultParser.merge(input, TestUtil.getExtensionRegistry(), builder); + defaultParser.merge(input, TestUtil.getFullExtensionRegistry(), builder); // Only the last value sticks. TestOneof2 oneof = builder.build(); assertFalse(oneof.hasFooString()); @@ -1164,8 +1087,8 @@ public class TextFormatTest extends TestCase { public void testMapShortForm() throws Exception { String text = "string_to_int32_field [{ key: 'x' value: 10 }, { key: 'y' value: 20 }]\n" - + "int32_to_message_field " - + "[{ key: 1 value { value: 100 } }, { key: 2 value: { value: 200 } }]\n"; + + "int32_to_message_field " + + "[{ key: 1 value { value: 100 } }, { key: 2 value: { value: 200 } }]\n"; TestMap.Builder dest = TestMap.newBuilder(); parserWithOverwriteForbidden.merge(text, dest); TestMap message = dest.build(); @@ -1176,8 +1099,7 @@ public class TextFormatTest extends TestCase { } public void testMapShortFormEmpty() throws Exception { - String text = "string_to_int32_field []\n" - + "int32_to_message_field: []\n"; + String text = "string_to_int32_field []\nint32_to_message_field: []\n"; TestMap.Builder dest = TestMap.newBuilder(); parserWithOverwriteForbidden.merge(text, dest); TestMap message = dest.build(); @@ -1238,19 +1160,19 @@ public class TextFormatTest extends TestCase { final String stringData = "optional_int32: 1\n" - + "optional_int64: 2\n" - + " optional_double: 2.4\n" - + "repeated_int32: 5\n" - + "repeated_int32: 10\n" - + "optional_nested_message <\n" - + " bb: 78\n" - + ">\n" - + "repeated_nested_message <\n" - + " bb: 79\n" - + ">\n" - + "repeated_nested_message <\n" - + " bb: 80\n" - + ">"; + + "optional_int64: 2\n" + + " optional_double: 2.4\n" + + "repeated_int32: 5\n" + + "repeated_int32: 10\n" + + "optional_nested_message <\n" + + " bb: 78\n" + + ">\n" + + "repeated_nested_message <\n" + + " bb: 79\n" + + ">\n" + + "repeated_nested_message <\n" + + " bb: 80\n" + + ">"; parser.merge(stringData, builder); TextFormatParseInfoTree tree = treeBuilder.build(); @@ -1310,9 +1232,7 @@ public class TextFormatTest extends TestCase { fail( String.format( "Tree/descriptor/fieldname did not contain index %d, line %d column %d expected", - index, - line, - column)); + index, line, column)); } } } diff --git a/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java b/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java index 88cbbf86..cc18547b 100644 --- a/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java +++ b/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java @@ -39,8 +39,7 @@ import com.google.protobuf.TextFormat.ParseException; import junit.framework.TestCase; /** - * Unit tests for protos that keep unknown enum values rather than discard - * them as unknown fields. + * Unit tests for protos that keep unknown enum values rather than discard them as unknown fields. */ public class UnknownEnumValueTest extends TestCase { public void testUnknownEnumValues() throws Exception { @@ -58,7 +57,7 @@ public class UnknownEnumValueTest extends TestCase { assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, message.getRepeatedNestedEnum(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, message.getRepeatedNestedEnumList().get(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, message.getPackedNestedEnum(0)); - + // Test serialization and parsing. ByteString data = message.toByteString(); message = TestAllTypes.parseFrom(data); @@ -71,19 +70,19 @@ public class UnknownEnumValueTest extends TestCase { assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, message.getRepeatedNestedEnum(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, message.getRepeatedNestedEnumList().get(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, message.getPackedNestedEnum(0)); - + // Test toBuilder(). builder = message.toBuilder(); assertEquals(4321, builder.getOptionalNestedEnumValue()); assertEquals(5432, builder.getRepeatedNestedEnumValue(0)); assertEquals(5432, builder.getRepeatedNestedEnumValueList().get(0).intValue()); - assertEquals(6543, builder.getPackedNestedEnumValue(0)); + assertEquals(6543, builder.getPackedNestedEnumValue(0)); // Returns UNRECOGNIZED if an enum type is requested. assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getOptionalNestedEnum()); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getRepeatedNestedEnum(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getRepeatedNestedEnumList().get(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getPackedNestedEnum(0)); - + // Test mergeFrom(). builder = TestAllTypes.newBuilder().mergeFrom(message); assertEquals(4321, builder.getOptionalNestedEnumValue()); @@ -95,7 +94,7 @@ public class UnknownEnumValueTest extends TestCase { assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getRepeatedNestedEnum(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getRepeatedNestedEnumList().get(0)); assertEquals(TestAllTypes.NestedEnum.UNRECOGNIZED, builder.getPackedNestedEnum(0)); - + // Test equals() and hashCode() TestAllTypes sameMessage = builder.build(); assertEquals(message, sameMessage); @@ -123,7 +122,7 @@ public class UnknownEnumValueTest extends TestCase { // Expected. } } - + public void testUnknownEnumValueInReflectionApi() throws Exception { Descriptor descriptor = TestAllTypes.getDescriptor(); FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum"); @@ -132,14 +131,13 @@ public class UnknownEnumValueTest extends TestCase { EnumDescriptor enumType = TestAllTypes.NestedEnum.getDescriptor(); TestAllTypes.Builder builder = TestAllTypes.newBuilder(); - builder.setField(optionalNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(4321)); - builder.addRepeatedField(repeatedNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(5432)); - builder.addRepeatedField(packedNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(6543)); + builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(4321)); + builder.addRepeatedField( + repeatedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(5432)); + builder.addRepeatedField( + packedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(6543)); TestAllTypes message = builder.build(); - + // Getters will return unknown enum values as EnumValueDescriptor. EnumValueDescriptor unknown4321 = (EnumValueDescriptor) message.getField(optionalNestedEnumField); @@ -166,79 +164,78 @@ public class UnknownEnumValueTest extends TestCase { message = builder.build(); // Like other descriptors, unknown EnumValueDescriptor can be compared by // object identity. - assertTrue(unknown6543 == message.getField(optionalNestedEnumField)); - assertTrue(unknown4321 == message.getRepeatedField(repeatedNestedEnumField, 0)); - assertTrue(unknown5432 == message.getRepeatedField(packedNestedEnumField, 0)); + assertSame(message.getField(optionalNestedEnumField), unknown6543); + assertSame(message.getRepeatedField(repeatedNestedEnumField, 0), unknown4321); + assertSame(message.getRepeatedField(packedNestedEnumField, 0), unknown5432); } - + public void testUnknownEnumValueWithDynamicMessage() throws Exception { Descriptor descriptor = TestAllTypes.getDescriptor(); FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum"); FieldDescriptor repeatedNestedEnumField = descriptor.findFieldByName("repeated_nested_enum"); FieldDescriptor packedNestedEnumField = descriptor.findFieldByName("packed_nested_enum"); EnumDescriptor enumType = TestAllTypes.NestedEnum.getDescriptor(); - + Message dynamicMessageDefaultInstance = DynamicMessage.getDefaultInstance(descriptor); Message.Builder builder = dynamicMessageDefaultInstance.newBuilderForType(); - builder.setField(optionalNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(4321)); - builder.addRepeatedField(repeatedNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(5432)); - builder.addRepeatedField(packedNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(6543)); + builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(4321)); + builder.addRepeatedField( + repeatedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(5432)); + builder.addRepeatedField( + packedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(6543)); Message message = builder.build(); - assertEquals(4321, - ((EnumValueDescriptor) message.getField(optionalNestedEnumField)).getNumber()); - assertEquals(5432, + assertEquals( + 4321, ((EnumValueDescriptor) message.getField(optionalNestedEnumField)).getNumber()); + assertEquals( + 5432, ((EnumValueDescriptor) message.getRepeatedField(repeatedNestedEnumField, 0)).getNumber()); - assertEquals(6543, + assertEquals( + 6543, ((EnumValueDescriptor) message.getRepeatedField(packedNestedEnumField, 0)).getNumber()); - + // Test reflection based serialization/parsing implementation. ByteString data = message.toByteString(); - message = dynamicMessageDefaultInstance - .newBuilderForType() - .mergeFrom(data) - .build(); - assertEquals(4321, - ((EnumValueDescriptor) message.getField(optionalNestedEnumField)).getNumber()); - assertEquals(5432, + message = dynamicMessageDefaultInstance.newBuilderForType().mergeFrom(data).build(); + assertEquals( + 4321, ((EnumValueDescriptor) message.getField(optionalNestedEnumField)).getNumber()); + assertEquals( + 5432, ((EnumValueDescriptor) message.getRepeatedField(repeatedNestedEnumField, 0)).getNumber()); - assertEquals(6543, + assertEquals( + 6543, ((EnumValueDescriptor) message.getRepeatedField(packedNestedEnumField, 0)).getNumber()); - + // Test reflection based equals()/hashCode(). builder = dynamicMessageDefaultInstance.newBuilderForType(); - builder.setField(optionalNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(4321)); - builder.addRepeatedField(repeatedNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(5432)); - builder.addRepeatedField(packedNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(6543)); + builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(4321)); + builder.addRepeatedField( + repeatedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(5432)); + builder.addRepeatedField( + packedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(6543)); Message sameMessage = builder.build(); assertEquals(message, sameMessage); assertEquals(message.hashCode(), sameMessage.hashCode()); - builder.setField(optionalNestedEnumField, - enumType.findValueByNumberCreatingIfUnknown(0)); + builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(0)); Message differentMessage = builder.build(); assertFalse(message.equals(differentMessage)); } - + public void testUnknownEnumValuesInTextFormat() { TestAllTypes.Builder builder = TestAllTypes.newBuilder(); builder.setOptionalNestedEnumValue(4321); builder.addRepeatedNestedEnumValue(5432); builder.addPackedNestedEnumValue(6543); TestAllTypes message = builder.build(); - + // We can print a message with unknown enum values. String textData = TextFormat.printToString(message); assertEquals( "optional_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_4321\n" - + "repeated_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_5432\n" - + "packed_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_6543\n", textData); - + + "repeated_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_5432\n" + + "packed_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_6543\n", + textData); + // Parsing unknown enum values will fail just like parsing other kinds of // unknown fields. try { diff --git a/java/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java b/java/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java index 8ce0ca73..a947d271 100644 --- a/java/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java +++ b/java/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java @@ -110,9 +110,7 @@ public class UnknownFieldSetLiteTest extends TestCase { } public void testMergeFieldFrom() throws IOException { - Foo foo = Foo.newBuilder() - .setValue(2) - .build(); + Foo foo = Foo.newBuilder().setValue(2).build(); CodedInputStream input = CodedInputStream.newInstance(foo.toByteArray()); @@ -123,9 +121,7 @@ public class UnknownFieldSetLiteTest extends TestCase { } public void testSerializedSize() throws IOException { - Foo foo = Foo.newBuilder() - .setValue(2) - .build(); + Foo foo = Foo.newBuilder().setValue(2).build(); CodedInputStream input = CodedInputStream.newInstance(foo.toByteArray()); @@ -136,9 +132,7 @@ public class UnknownFieldSetLiteTest extends TestCase { } public void testHashCodeAfterDeserialization() throws IOException { - Foo foo = Foo.newBuilder() - .setValue(2) - .build(); + Foo foo = Foo.newBuilder().setValue(2).build(); Foo fooDeserialized = Foo.parseFrom(foo.toByteArray()); @@ -172,8 +166,7 @@ public class UnknownFieldSetLiteTest extends TestCase { UnknownFieldSetLite builder = UnknownFieldSetLite.newInstance(); builder.mergeVarintField(10, -6); - CodedInputStream input = - CodedInputStream.newInstance(toByteString(builder).toByteArray()); + CodedInputStream input = CodedInputStream.newInstance(toByteString(builder).toByteArray()); int tag = input.readTag(); assertEquals(10, WireFormat.getTagFieldNumber(tag)); @@ -217,8 +210,9 @@ public class UnknownFieldSetLiteTest extends TestCase { } public void testMutableCopyOf_empty() { - UnknownFieldSetLite unknownFields = UnknownFieldSetLite.mutableCopyOf( - UnknownFieldSetLite.getDefaultInstance(), UnknownFieldSetLite.getDefaultInstance()); + UnknownFieldSetLite unknownFields = + UnknownFieldSetLite.mutableCopyOf( + UnknownFieldSetLite.getDefaultInstance(), UnknownFieldSetLite.getDefaultInstance()); unknownFields.checkMutable(); assertEquals(0, unknownFields.getSerializedSize()); @@ -226,18 +220,17 @@ public class UnknownFieldSetLiteTest extends TestCase { } public void testRoundTrips() throws InvalidProtocolBufferException { - Foo foo = Foo.newBuilder() - .setValue(1) - .setExtension(Bar.fooExt, Bar.newBuilder() - .setName("name") - .build()) - .setExtension(LiteEqualsAndHash.varint, 22) - .setExtension(LiteEqualsAndHash.fixed32, 44) - .setExtension(LiteEqualsAndHash.fixed64, 66L) - .setExtension(LiteEqualsAndHash.myGroup, LiteEqualsAndHash.MyGroup.newBuilder() - .setGroupValue("value") - .build()) - .build(); + Foo foo = + Foo.newBuilder() + .setValue(1) + .setExtension(Bar.fooExt, Bar.newBuilder().setName("name").build()) + .setExtension(LiteEqualsAndHash.varint, 22) + .setExtension(LiteEqualsAndHash.fixed32, 44) + .setExtension(LiteEqualsAndHash.fixed64, 66L) + .setExtension( + LiteEqualsAndHash.myGroup, + LiteEqualsAndHash.MyGroup.newBuilder().setGroupValue("value").build()) + .build(); Foo copy = Foo.parseFrom(foo.toByteArray()); @@ -310,16 +303,15 @@ public class UnknownFieldSetLiteTest extends TestCase { } public void testTruncatedInput() { - Foo foo = Foo.newBuilder() - .setValue(1) - .setExtension(Bar.fooExt, Bar.newBuilder() - .setName("name") - .build()) - .setExtension(LiteEqualsAndHash.varint, 22) - .setExtension(LiteEqualsAndHash.myGroup, LiteEqualsAndHash.MyGroup.newBuilder() - .setGroupValue("value") - .build()) - .build(); + Foo foo = + Foo.newBuilder() + .setValue(1) + .setExtension(Bar.fooExt, Bar.newBuilder().setName("name").build()) + .setExtension(LiteEqualsAndHash.varint, 22) + .setExtension( + LiteEqualsAndHash.myGroup, + LiteEqualsAndHash.MyGroup.newBuilder().setGroupValue("value").build()) + .build(); try { Foo.parseFrom(foo.toByteString().substring(0, foo.toByteString().size() - 10)); @@ -328,63 +320,72 @@ public class UnknownFieldSetLiteTest extends TestCase { // Expected. } } - + public void testMakeImmutable() throws Exception { UnknownFieldSetLite unknownFields = UnknownFieldSetLite.newInstance(); unknownFields.makeImmutable(); - + try { unknownFields.mergeVarintField(1, 1); fail(); - } catch (UnsupportedOperationException expected) {} - + } catch (UnsupportedOperationException expected) { + } + try { unknownFields.mergeLengthDelimitedField(2, ByteString.copyFromUtf8("hello")); fail(); - } catch (UnsupportedOperationException expected) {} - + } catch (UnsupportedOperationException expected) { + } + try { unknownFields.mergeFieldFrom(1, CodedInputStream.newInstance(new byte[0])); fail(); - } catch (UnsupportedOperationException expected) {} + } catch (UnsupportedOperationException expected) { + } } - + public void testEndToEnd() throws Exception { TestAllTypesLite testAllTypes = TestAllTypesLite.getDefaultInstance(); try { testAllTypes.unknownFields.checkMutable(); fail(); - } catch (UnsupportedOperationException expected) {} - + } catch (UnsupportedOperationException expected) { + } + testAllTypes = TestAllTypesLite.parseFrom(new byte[0]); try { testAllTypes.unknownFields.checkMutable(); fail(); - } catch (UnsupportedOperationException expected) {} - + } catch (UnsupportedOperationException expected) { + } + testAllTypes = TestAllTypesLite.newBuilder().build(); try { testAllTypes.unknownFields.checkMutable(); fail(); - } catch (UnsupportedOperationException expected) {} - - testAllTypes = TestAllTypesLite.newBuilder() - .setDefaultBool(true) - .build(); + } catch (UnsupportedOperationException expected) { + } + + testAllTypes = TestAllTypesLite.newBuilder().setDefaultBool(true).build(); try { testAllTypes.unknownFields.checkMutable(); fail(); - } catch (UnsupportedOperationException expected) {} - - TestAllExtensionsLite testAllExtensions = TestAllExtensionsLite.newBuilder() - .mergeFrom(TestAllExtensionsLite.newBuilder() - .setExtension(UnittestLite.optionalInt32ExtensionLite, 2) - .build().toByteArray()) - .build(); + } catch (UnsupportedOperationException expected) { + } + + TestAllExtensionsLite testAllExtensions = + TestAllExtensionsLite.newBuilder() + .mergeFrom( + TestAllExtensionsLite.newBuilder() + .setExtension(UnittestLite.optionalInt32ExtensionLite, 2) + .build() + .toByteArray()) + .build(); try { testAllExtensions.unknownFields.checkMutable(); fail(); - } catch (UnsupportedOperationException expected) {} + } catch (UnsupportedOperationException expected) { + } } private ByteString toByteString(UnknownFieldSetLite unknownFields) { diff --git a/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java b/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java index 1a84806a..86630f65 100644 --- a/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java +++ b/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java @@ -69,13 +69,10 @@ public class UnknownFieldSetTest extends TestCase { ByteString getBizarroData() throws Exception { UnknownFieldSet.Builder bizarroFields = UnknownFieldSet.newBuilder(); - UnknownFieldSet.Field varintField = - UnknownFieldSet.Field.newBuilder().addVarint(1).build(); - UnknownFieldSet.Field fixed32Field = - UnknownFieldSet.Field.newBuilder().addFixed32(1).build(); + UnknownFieldSet.Field varintField = UnknownFieldSet.Field.newBuilder().addVarint(1).build(); + UnknownFieldSet.Field fixed32Field = UnknownFieldSet.Field.newBuilder().addFixed32(1).build(); - for (Map.Entry<Integer, UnknownFieldSet.Field> entry : - unknownFields.asMap().entrySet()) { + for (Map.Entry<Integer, UnknownFieldSet.Field> entry : unknownFields.asMap().entrySet()) { if (entry.getValue().getVarintList().isEmpty()) { // Original field is not a varint, so use a varint. bizarroFields.addField(entry.getKey(), varintField); @@ -102,34 +99,30 @@ public class UnknownFieldSetTest extends TestCase { public void testVarint() throws Exception { UnknownFieldSet.Field field = getField("optional_int32"); assertEquals(1, field.getVarintList().size()); - assertEquals(allFields.getOptionalInt32(), - (long) field.getVarintList().get(0)); + assertEquals(allFields.getOptionalInt32(), (long) field.getVarintList().get(0)); } public void testFixed32() throws Exception { UnknownFieldSet.Field field = getField("optional_fixed32"); assertEquals(1, field.getFixed32List().size()); - assertEquals(allFields.getOptionalFixed32(), - (int) field.getFixed32List().get(0)); + assertEquals(allFields.getOptionalFixed32(), (int) field.getFixed32List().get(0)); } public void testFixed64() throws Exception { UnknownFieldSet.Field field = getField("optional_fixed64"); assertEquals(1, field.getFixed64List().size()); - assertEquals(allFields.getOptionalFixed64(), - (long) field.getFixed64List().get(0)); + assertEquals(allFields.getOptionalFixed64(), (long) field.getFixed64List().get(0)); } public void testLengthDelimited() throws Exception { UnknownFieldSet.Field field = getField("optional_bytes"); assertEquals(1, field.getLengthDelimitedList().size()); - assertEquals(allFields.getOptionalBytes(), - field.getLengthDelimitedList().get(0)); + assertEquals(allFields.getOptionalBytes(), field.getLengthDelimitedList().get(0)); } public void testGroup() throws Exception { Descriptors.FieldDescriptor nestedFieldDescriptor = - TestAllTypes.OptionalGroup.getDescriptor().findFieldByName("a"); + TestAllTypes.OptionalGroup.getDescriptor().findFieldByName("a"); assertNotNull(nestedFieldDescriptor); UnknownFieldSet.Field field = getField("optionalgroup"); @@ -139,11 +132,9 @@ public class UnknownFieldSetTest extends TestCase { assertEquals(1, group.asMap().size()); assertTrue(group.hasField(nestedFieldDescriptor.getNumber())); - UnknownFieldSet.Field nestedField = - group.getField(nestedFieldDescriptor.getNumber()); + UnknownFieldSet.Field nestedField = group.getField(nestedFieldDescriptor.getNumber()); assertEquals(1, nestedField.getVarintList().size()); - assertEquals(allFields.getOptionalGroup().getA(), - (long) nestedField.getVarintList().get(0)); + assertEquals(allFields.getOptionalGroup().getA(), (long) nestedField.getVarintList().get(0)); } public void testSerialize() throws Exception { @@ -154,59 +145,44 @@ public class UnknownFieldSetTest extends TestCase { } public void testCopyFrom() throws Exception { - TestEmptyMessage message = - TestEmptyMessage.newBuilder().mergeFrom(emptyMessage).build(); + TestEmptyMessage message = TestEmptyMessage.newBuilder().mergeFrom(emptyMessage).build(); assertEquals(emptyMessage.toString(), message.toString()); } public void testMergeFrom() throws Exception { TestEmptyMessage source = - TestEmptyMessage.newBuilder() - .setUnknownFields( - UnknownFieldSet.newBuilder() - .addField(2, - UnknownFieldSet.Field.newBuilder() - .addVarint(2).build()) - .addField(3, - UnknownFieldSet.Field.newBuilder() - .addVarint(4).build()) - .build()) - .build(); + TestEmptyMessage.newBuilder() + .setUnknownFields( + UnknownFieldSet.newBuilder() + .addField(2, UnknownFieldSet.Field.newBuilder().addVarint(2).build()) + .addField(3, UnknownFieldSet.Field.newBuilder().addVarint(4).build()) + .build()) + .build(); TestEmptyMessage destination = - TestEmptyMessage.newBuilder() - .setUnknownFields( - UnknownFieldSet.newBuilder() - .addField(1, - UnknownFieldSet.Field.newBuilder() - .addVarint(1).build()) - .addField(3, - UnknownFieldSet.Field.newBuilder() - .addVarint(3).build()) - .build()) - .mergeFrom(source) - .build(); - - assertEquals( - "1: 1\n" + - "2: 2\n" + - "3: 3\n" + - "3: 4\n", - destination.toString()); + TestEmptyMessage.newBuilder() + .setUnknownFields( + UnknownFieldSet.newBuilder() + .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(1).build()) + .addField(3, UnknownFieldSet.Field.newBuilder().addVarint(3).build()) + .build()) + .mergeFrom(source) + .build(); + + assertEquals("1: 1\n2: 2\n3: 3\n3: 4\n", destination.toString()); } public void testClear() throws Exception { - UnknownFieldSet fields = - UnknownFieldSet.newBuilder().mergeFrom(unknownFields).clear().build(); + UnknownFieldSet fields = UnknownFieldSet.newBuilder().mergeFrom(unknownFields).clear().build(); assertTrue(fields.asMap().isEmpty()); } public void testClearMessage() throws Exception { TestEmptyMessage message = - TestEmptyMessage.newBuilder().mergeFrom(emptyMessage).clear().build(); + TestEmptyMessage.newBuilder().mergeFrom(emptyMessage).clear().build(); assertEquals(0, message.getSerializedSize()); } - + public void testClearField() throws Exception { int fieldNumber = unknownFields.asMap().keySet().iterator().next(); UnknownFieldSet fields = @@ -218,10 +194,9 @@ public class UnknownFieldSetTest extends TestCase { // Test mixing known and unknown fields when parsing. UnknownFieldSet fields = - UnknownFieldSet.newBuilder(unknownFields) - .addField(123456, - UnknownFieldSet.Field.newBuilder().addVarint(654321).build()) - .build(); + UnknownFieldSet.newBuilder(unknownFields) + .addField(123456, UnknownFieldSet.Field.newBuilder().addVarint(654321).build()) + .build(); ByteString data = fields.toByteString(); TestAllTypes destination = TestAllTypes.parseFrom(data); @@ -229,8 +204,7 @@ public class UnknownFieldSetTest extends TestCase { TestUtil.assertAllFieldsSet(destination); assertEquals(1, destination.getUnknownFields().asMap().size()); - UnknownFieldSet.Field field = - destination.getUnknownFields().getField(123456); + UnknownFieldSet.Field field = destination.getUnknownFields().getField(123456); assertEquals(1, field.getVarintList().size()); assertEquals(654321, (long) field.getVarintList().get(0)); } @@ -253,10 +227,9 @@ public class UnknownFieldSetTest extends TestCase { // they are declared as extension numbers. TestEmptyMessageWithExtensions message = - TestEmptyMessageWithExtensions.parseFrom(allFieldsData); + TestEmptyMessageWithExtensions.parseFrom(allFieldsData); - assertEquals(unknownFields.asMap().size(), - message.getUnknownFields().asMap().size()); + assertEquals(unknownFields.asMap().size(), message.getUnknownFields().asMap().size()); assertEquals(allFieldsData, message.toByteString()); } @@ -265,134 +238,99 @@ public class UnknownFieldSetTest extends TestCase { // when parsing extensions. ByteString bizarroData = getBizarroData(); - TestAllExtensions allExtensionsMessage = - TestAllExtensions.parseFrom(bizarroData); + TestAllExtensions allExtensionsMessage = TestAllExtensions.parseFrom(bizarroData); TestEmptyMessage emptyMessage = TestEmptyMessage.parseFrom(bizarroData); // All fields should have been interpreted as unknown, so the debug strings // should be the same. - assertEquals(emptyMessage.toString(), - allExtensionsMessage.toString()); + assertEquals(emptyMessage.toString(), allExtensionsMessage.toString()); } public void testParseUnknownEnumValue() throws Exception { Descriptors.FieldDescriptor singularField = - TestAllTypes.getDescriptor().findFieldByName("optional_nested_enum"); + TestAllTypes.getDescriptor().findFieldByName("optional_nested_enum"); Descriptors.FieldDescriptor repeatedField = - TestAllTypes.getDescriptor().findFieldByName("repeated_nested_enum"); + TestAllTypes.getDescriptor().findFieldByName("repeated_nested_enum"); assertNotNull(singularField); assertNotNull(repeatedField); ByteString data = - UnknownFieldSet.newBuilder() - .addField(singularField.getNumber(), - UnknownFieldSet.Field.newBuilder() - .addVarint(TestAllTypes.NestedEnum.BAR.getNumber()) - .addVarint(5) // not valid - .build()) - .addField(repeatedField.getNumber(), - UnknownFieldSet.Field.newBuilder() - .addVarint(TestAllTypes.NestedEnum.FOO.getNumber()) - .addVarint(4) // not valid - .addVarint(TestAllTypes.NestedEnum.BAZ.getNumber()) - .addVarint(6) // not valid - .build()) - .build() - .toByteString(); + UnknownFieldSet.newBuilder() + .addField( + singularField.getNumber(), + UnknownFieldSet.Field.newBuilder() + .addVarint(TestAllTypes.NestedEnum.BAR.getNumber()) + .addVarint(5) // not valid + .build()) + .addField( + repeatedField.getNumber(), + UnknownFieldSet.Field.newBuilder() + .addVarint(TestAllTypes.NestedEnum.FOO.getNumber()) + .addVarint(4) // not valid + .addVarint(TestAllTypes.NestedEnum.BAZ.getNumber()) + .addVarint(6) // not valid + .build()) + .build() + .toByteString(); { TestAllTypes message = TestAllTypes.parseFrom(data); - assertEquals(TestAllTypes.NestedEnum.BAR, - message.getOptionalNestedEnum()); + assertEquals(TestAllTypes.NestedEnum.BAR, message.getOptionalNestedEnum()); assertEquals( - Arrays.asList(TestAllTypes.NestedEnum.FOO, TestAllTypes.NestedEnum.BAZ), - message.getRepeatedNestedEnumList()); - assertEquals(Arrays.asList(5L), - message.getUnknownFields() - .getField(singularField.getNumber()) - .getVarintList()); - assertEquals(Arrays.asList(4L, 6L), - message.getUnknownFields() - .getField(repeatedField.getNumber()) - .getVarintList()); + Arrays.asList(TestAllTypes.NestedEnum.FOO, TestAllTypes.NestedEnum.BAZ), + message.getRepeatedNestedEnumList()); + assertEquals( + Arrays.asList(5L), + message.getUnknownFields().getField(singularField.getNumber()).getVarintList()); + assertEquals( + Arrays.asList(4L, 6L), + message.getUnknownFields().getField(repeatedField.getNumber()).getVarintList()); } { TestAllExtensions message = - TestAllExtensions.parseFrom(data, TestUtil.getExtensionRegistry()); - assertEquals(TestAllTypes.NestedEnum.BAR, - message.getExtension(UnittestProto.optionalNestedEnumExtension)); + TestAllExtensions.parseFrom(data, TestUtil.getExtensionRegistry()); + assertEquals( + TestAllTypes.NestedEnum.BAR, + message.getExtension(UnittestProto.optionalNestedEnumExtension)); + assertEquals( + Arrays.asList(TestAllTypes.NestedEnum.FOO, TestAllTypes.NestedEnum.BAZ), + message.getExtension(UnittestProto.repeatedNestedEnumExtension)); assertEquals( - Arrays.asList(TestAllTypes.NestedEnum.FOO, TestAllTypes.NestedEnum.BAZ), - message.getExtension(UnittestProto.repeatedNestedEnumExtension)); - assertEquals(Arrays.asList(5L), - message.getUnknownFields() - .getField(singularField.getNumber()) - .getVarintList()); - assertEquals(Arrays.asList(4L, 6L), - message.getUnknownFields() - .getField(repeatedField.getNumber()) - .getVarintList()); + Arrays.asList(5L), + message.getUnknownFields().getField(singularField.getNumber()).getVarintList()); + assertEquals( + Arrays.asList(4L, 6L), + message.getUnknownFields().getField(repeatedField.getNumber()).getVarintList()); } } public void testLargeVarint() throws Exception { ByteString data = - UnknownFieldSet.newBuilder() - .addField(1, - UnknownFieldSet.Field.newBuilder() - .addVarint(0x7FFFFFFFFFFFFFFFL) - .build()) - .build() - .toByteString(); + UnknownFieldSet.newBuilder() + .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(0x7FFFFFFFFFFFFFFFL).build()) + .build() + .toByteString(); UnknownFieldSet parsed = UnknownFieldSet.parseFrom(data); UnknownFieldSet.Field field = parsed.getField(1); assertEquals(1, field.getVarintList().size()); - assertEquals(0x7FFFFFFFFFFFFFFFL, (long)field.getVarintList().get(0)); + assertEquals(0x7FFFFFFFFFFFFFFFL, (long) field.getVarintList().get(0)); } public void testEqualsAndHashCode() { - UnknownFieldSet.Field fixed32Field = - UnknownFieldSet.Field.newBuilder() - .addFixed32(1) - .build(); - UnknownFieldSet.Field fixed64Field = - UnknownFieldSet.Field.newBuilder() - .addFixed64(1) - .build(); - UnknownFieldSet.Field varIntField = - UnknownFieldSet.Field.newBuilder() - .addVarint(1) - .build(); + UnknownFieldSet.Field fixed32Field = UnknownFieldSet.Field.newBuilder().addFixed32(1).build(); + UnknownFieldSet.Field fixed64Field = UnknownFieldSet.Field.newBuilder().addFixed64(1).build(); + UnknownFieldSet.Field varIntField = UnknownFieldSet.Field.newBuilder().addVarint(1).build(); UnknownFieldSet.Field lengthDelimitedField = - UnknownFieldSet.Field.newBuilder() - .addLengthDelimited(ByteString.EMPTY) - .build(); + UnknownFieldSet.Field.newBuilder().addLengthDelimited(ByteString.EMPTY).build(); UnknownFieldSet.Field groupField = - UnknownFieldSet.Field.newBuilder() - .addGroup(unknownFields) - .build(); + UnknownFieldSet.Field.newBuilder().addGroup(unknownFields).build(); - UnknownFieldSet a = - UnknownFieldSet.newBuilder() - .addField(1, fixed32Field) - .build(); - UnknownFieldSet b = - UnknownFieldSet.newBuilder() - .addField(1, fixed64Field) - .build(); - UnknownFieldSet c = - UnknownFieldSet.newBuilder() - .addField(1, varIntField) - .build(); - UnknownFieldSet d = - UnknownFieldSet.newBuilder() - .addField(1, lengthDelimitedField) - .build(); - UnknownFieldSet e = - UnknownFieldSet.newBuilder() - .addField(1, groupField) - .build(); + UnknownFieldSet a = UnknownFieldSet.newBuilder().addField(1, fixed32Field).build(); + UnknownFieldSet b = UnknownFieldSet.newBuilder().addField(1, fixed64Field).build(); + UnknownFieldSet c = UnknownFieldSet.newBuilder().addField(1, varIntField).build(); + UnknownFieldSet d = UnknownFieldSet.newBuilder().addField(1, lengthDelimitedField).build(); + UnknownFieldSet e = UnknownFieldSet.newBuilder().addField(1, groupField).build(); checkEqualsIsConsistent(a); checkEqualsIsConsistent(b); @@ -413,12 +351,10 @@ public class UnknownFieldSetTest extends TestCase { } /** - * Asserts that the given field sets are not equal and have different - * hash codes. + * Asserts that the given field sets are not equal and have different hash codes. * - * @warning It's valid for non-equal objects to have the same hash code, so - * this test is stricter than it needs to be. However, this should happen - * relatively rarely. + * @warning It's valid for non-equal objects to have the same hash code, so this test is stricter + * than it needs to be. However, this should happen relatively rarely. */ private void checkNotEqual(UnknownFieldSet s1, UnknownFieldSet s2) { String equalsError = String.format("%s should not be equal to %s", s1, s2); @@ -430,9 +366,7 @@ public class UnknownFieldSetTest extends TestCase { s1.hashCode() == s2.hashCode()); } - /** - * Asserts that the given field sets are equal and have identical hash codes. - */ + /** Asserts that the given field sets are equal and have identical hash codes. */ private void checkEqualsIsConsistent(UnknownFieldSet set) { // Object should be equal to itself. assertEquals(set, set); diff --git a/java/core/src/test/java/com/google/protobuf/WireFormatTest.java b/java/core/src/test/java/com/google/protobuf/WireFormatTest.java index 03c33ecf..45a396ac 100644 --- a/java/core/src/test/java/com/google/protobuf/WireFormatTest.java +++ b/java/core/src/test/java/com/google/protobuf/WireFormatTest.java @@ -54,6 +54,13 @@ import junit.framework.TestCase; * @author kenton@google.com (Kenton Varda) */ public class WireFormatTest extends TestCase { + + private static final int TYPE_ID_1 = + TestMessageSetExtension1.getDescriptor().getExtensions().get(0).getNumber(); + private static final int TYPE_ID_2 = + TestMessageSetExtension2.getDescriptor().getExtensions().get(0).getNumber(); + private static final int UNKNOWN_TYPE_ID = 1550055; + public void testSerialization() throws Exception { TestAllTypes message = TestUtil.getAllSet(); @@ -102,8 +109,7 @@ public class WireFormatTest extends TestCase { assertEquals(rawBytes, rawBytes2); } - public void testSerializationPackedWithoutGetSerializedSize() - throws Exception { + public void testSerializationPackedWithoutGetSerializedSize() throws Exception { // Write directly to an OutputStream, without invoking getSerializedSize() // This used to be a bug where the size of a packed field was incorrect, // since getSerializedSize() was never invoked. @@ -118,8 +124,7 @@ public class WireFormatTest extends TestCase { codedOutput.flush(); - TestPackedTypes message2 = TestPackedTypes.parseFrom( - outputStream.toByteArray()); + TestPackedTypes message2 = TestPackedTypes.parseFrom(outputStream.toByteArray()); TestUtil.assertPackedFieldsSet(message2); } @@ -132,10 +137,9 @@ public class WireFormatTest extends TestCase { TestAllTypes message = TestUtil.getAllSet(); ByteString rawBytes = message.toByteString(); - ExtensionRegistry registry = TestUtil.getExtensionRegistry(); + ExtensionRegistryLite registry = TestUtil.getExtensionRegistry(); - TestAllExtensions message2 = - TestAllExtensions.parseFrom(rawBytes, registry); + TestAllExtensions message2 = TestAllExtensions.parseFrom(rawBytes, registry); TestUtil.assertAllExtensionsSet(message2); } @@ -145,10 +149,9 @@ public class WireFormatTest extends TestCase { TestPackedExtensions message = TestUtil.getPackedExtensionsSet(); ByteString rawBytes = message.toByteString(); - ExtensionRegistry registry = TestUtil.getExtensionRegistry(); + ExtensionRegistryLite registry = TestUtil.getExtensionRegistry(); - TestPackedExtensions message2 = - TestPackedExtensions.parseFrom(rawBytes, registry); + TestPackedExtensions message2 = TestPackedExtensions.parseFrom(rawBytes, registry); TestUtil.assertPackedExtensionsSet(message2); } @@ -192,25 +195,27 @@ public class WireFormatTest extends TestCase { // Tests that fields are written in order even when extension ranges // are interleaved with field numbers. ByteString data = - TestFieldOrderings.newBuilder() - .setMyInt(1) - .setMyString("foo") - .setMyFloat(1.0F) - .setExtension(UnittestProto.myExtensionInt, 23) - .setExtension(UnittestProto.myExtensionString, "bar") - .build().toByteString(); + TestFieldOrderings.newBuilder() + .setMyInt(1) + .setMyString("foo") + .setMyFloat(1.0F) + .setExtension(UnittestProto.myExtensionInt, 23) + .setExtension(UnittestProto.myExtensionString, "bar") + .build() + .toByteString(); assertFieldsInOrder(data); Descriptors.Descriptor descriptor = TestFieldOrderings.getDescriptor(); - ByteString dynamic_data = - DynamicMessage.newBuilder(TestFieldOrderings.getDescriptor()) - .setField(descriptor.findFieldByName("my_int"), 1L) - .setField(descriptor.findFieldByName("my_string"), "foo") - .setField(descriptor.findFieldByName("my_float"), 1.0F) - .setField(UnittestProto.myExtensionInt.getDescriptor(), 23) - .setField(UnittestProto.myExtensionString.getDescriptor(), "bar") - .build().toByteString(); - assertFieldsInOrder(dynamic_data); + ByteString dynamicData = + DynamicMessage.newBuilder(TestFieldOrderings.getDescriptor()) + .setField(descriptor.findFieldByName("my_int"), 1L) + .setField(descriptor.findFieldByName("my_string"), "foo") + .setField(descriptor.findFieldByName("my_float"), 1.0F) + .setField(UnittestProto.myExtensionInt.getDescriptor(), 23) + .setField(UnittestProto.myExtensionString.getDescriptor(), "bar") + .build() + .toByteString(); + assertFieldsInOrder(dynamicData); } private ExtensionRegistry getTestFieldOrderingsRegistry() { @@ -224,36 +229,35 @@ public class WireFormatTest extends TestCase { // Make sure we can parse a message that contains multiple extensions // ranges. TestFieldOrderings source = - TestFieldOrderings.newBuilder() - .setMyInt(1) - .setMyString("foo") - .setMyFloat(1.0F) - .setExtension(UnittestProto.myExtensionInt, 23) - .setExtension(UnittestProto.myExtensionString, "bar") - .build(); + TestFieldOrderings.newBuilder() + .setMyInt(1) + .setMyString("foo") + .setMyFloat(1.0F) + .setExtension(UnittestProto.myExtensionInt, 23) + .setExtension(UnittestProto.myExtensionString, "bar") + .build(); TestFieldOrderings dest = - TestFieldOrderings.parseFrom(source.toByteString(), - getTestFieldOrderingsRegistry()); + TestFieldOrderings.parseFrom(source.toByteString(), getTestFieldOrderingsRegistry()); assertEquals(source, dest); } - + private static ExtensionRegistry getTestExtensionInsideTableRegistry() { ExtensionRegistry result = ExtensionRegistry.newInstance(); result.add(UnittestProto.testExtensionInsideTableExtension); return result; } - + public void testExtensionInsideTable() throws Exception { // Make sure the extension within the range of table is parsed correctly in experimental // runtime. TestExtensionInsideTable source = TestExtensionInsideTable.newBuilder() - .setField1(1) - .setExtension(UnittestProto.testExtensionInsideTableExtension, 23) - .build(); + .setField1(1) + .setExtension(UnittestProto.testExtensionInsideTableExtension, 23) + .build(); TestExtensionInsideTable dest = - TestExtensionInsideTable.parseFrom(source.toByteString(), - getTestExtensionInsideTableRegistry()); + TestExtensionInsideTable.parseFrom( + source.toByteString(), getTestExtensionInsideTableRegistry()); assertEquals(source, dest); } @@ -261,25 +265,19 @@ public class WireFormatTest extends TestCase { // Same as above except with DynamicMessage. Descriptors.Descriptor descriptor = TestFieldOrderings.getDescriptor(); DynamicMessage source = - DynamicMessage.newBuilder(TestFieldOrderings.getDescriptor()) - .setField(descriptor.findFieldByName("my_int"), 1L) - .setField(descriptor.findFieldByName("my_string"), "foo") - .setField(descriptor.findFieldByName("my_float"), 1.0F) - .setField(UnittestProto.myExtensionInt.getDescriptor(), 23) - .setField(UnittestProto.myExtensionString.getDescriptor(), "bar") - .build(); + DynamicMessage.newBuilder(TestFieldOrderings.getDescriptor()) + .setField(descriptor.findFieldByName("my_int"), 1L) + .setField(descriptor.findFieldByName("my_string"), "foo") + .setField(descriptor.findFieldByName("my_float"), 1.0F) + .setField(UnittestProto.myExtensionInt.getDescriptor(), 23) + .setField(UnittestProto.myExtensionString.getDescriptor(), "bar") + .build(); DynamicMessage dest = - DynamicMessage.parseFrom(descriptor, source.toByteString(), - getTestFieldOrderingsRegistry()); + DynamicMessage.parseFrom( + descriptor, source.toByteString(), getTestFieldOrderingsRegistry()); assertEquals(source, dest); } - private static final int UNKNOWN_TYPE_ID = 1550055; - private static final int TYPE_ID_1 = - TestMessageSetExtension1.getDescriptor().getExtensions().get(0).getNumber(); - private static final int TYPE_ID_2 = - TestMessageSetExtension2.getDescriptor().getExtensions().get(0).getNumber(); - public void testSerializeMessageSetEagerly() throws Exception { testSerializeMessageSetWithFlag(true); } @@ -288,26 +286,26 @@ public class WireFormatTest extends TestCase { testSerializeMessageSetWithFlag(false); } - private void testSerializeMessageSetWithFlag(boolean eagerParsing) - throws Exception { + private void testSerializeMessageSetWithFlag(boolean eagerParsing) throws Exception { ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing); // Set up a TestMessageSet with two known messages and an unknown one. TestMessageSet messageSet = - TestMessageSet.newBuilder() - .setExtension( - TestMessageSetExtension1.messageSetExtension, - TestMessageSetExtension1.newBuilder().setI(123).build()) - .setExtension( - TestMessageSetExtension2.messageSetExtension, - TestMessageSetExtension2.newBuilder().setStr("foo").build()) - .setUnknownFields( - UnknownFieldSet.newBuilder() - .addField(UNKNOWN_TYPE_ID, - UnknownFieldSet.Field.newBuilder() - .addLengthDelimited(ByteString.copyFromUtf8("bar")) - .build()) - .build()) - .build(); + TestMessageSet.newBuilder() + .setExtension( + TestMessageSetExtension1.messageSetExtension, + TestMessageSetExtension1.newBuilder().setI(123).build()) + .setExtension( + TestMessageSetExtension2.messageSetExtension, + TestMessageSetExtension2.newBuilder().setStr("foo").build()) + .setUnknownFields( + UnknownFieldSet.newBuilder() + .addField( + UNKNOWN_TYPE_ID, + UnknownFieldSet.Field.newBuilder() + .addLengthDelimited(ByteString.copyFromUtf8("bar")) + .build()) + .build()) + .build(); ByteString data = messageSet.toByteString(); @@ -322,13 +320,11 @@ public class WireFormatTest extends TestCase { assertEquals(UNKNOWN_TYPE_ID, raw.getItem(2).getTypeId()); TestMessageSetExtension1 message1 = - TestMessageSetExtension1.parseFrom( - raw.getItem(0).getMessage().toByteArray()); + TestMessageSetExtension1.parseFrom(raw.getItem(0).getMessage()); assertEquals(123, message1.getI()); TestMessageSetExtension2 message2 = - TestMessageSetExtension2.parseFrom( - raw.getItem(1).getMessage().toByteArray()); + TestMessageSetExtension2.parseFrom(raw.getItem(1).getMessage()); assertEquals("foo", message2.getStr()); assertEquals("bar", raw.getItem(2).getMessage().toStringUtf8()); @@ -338,12 +334,11 @@ public class WireFormatTest extends TestCase { testParseMessageSetWithFlag(true); } - public void testParseMessageSetNotEagerly()throws Exception { + public void testParseMessageSetNotEagerly() throws Exception { testParseMessageSetWithFlag(false); } - private void testParseMessageSetWithFlag(boolean eagerParsing) - throws Exception { + private void testParseMessageSetWithFlag(boolean eagerParsing) throws Exception { ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing); ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance(); extensionRegistry.add(TestMessageSetExtension1.messageSetExtension); @@ -351,40 +346,34 @@ public class WireFormatTest extends TestCase { // Set up a RawMessageSet with two known messages and an unknown one. RawMessageSet raw = - RawMessageSet.newBuilder() - .addItem( - RawMessageSet.Item.newBuilder() - .setTypeId(TYPE_ID_1) - .setMessage( - TestMessageSetExtension1.newBuilder() - .setI(123) - .build().toByteString()) - .build()) - .addItem( - RawMessageSet.Item.newBuilder() - .setTypeId(TYPE_ID_2) - .setMessage( - TestMessageSetExtension2.newBuilder() - .setStr("foo") - .build().toByteString()) - .build()) - .addItem( - RawMessageSet.Item.newBuilder() - .setTypeId(UNKNOWN_TYPE_ID) - .setMessage(ByteString.copyFromUtf8("bar")) - .build()) - .build(); + RawMessageSet.newBuilder() + .addItem( + RawMessageSet.Item.newBuilder() + .setTypeId(TYPE_ID_1) + .setMessage( + TestMessageSetExtension1.newBuilder().setI(123).build().toByteString()) + .build()) + .addItem( + RawMessageSet.Item.newBuilder() + .setTypeId(TYPE_ID_2) + .setMessage( + TestMessageSetExtension2.newBuilder().setStr("foo").build().toByteString()) + .build()) + .addItem( + RawMessageSet.Item.newBuilder() + .setTypeId(UNKNOWN_TYPE_ID) + .setMessage(ByteString.copyFromUtf8("bar")) + .build()) + .build(); ByteString data = raw.toByteString(); // Parse as a TestMessageSet and check the contents. - TestMessageSet messageSet = - TestMessageSet.parseFrom(data, extensionRegistry); + TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry); - assertEquals(123, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); - assertEquals("foo", messageSet.getExtension( - TestMessageSetExtension2.messageSetExtension).getStr()); + assertEquals(123, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); + assertEquals( + "foo", messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr()); // Check for unknown field with type LENGTH_DELIMITED, // number UNKNOWN_TYPE_ID, and contents "bar". @@ -405,35 +394,27 @@ public class WireFormatTest extends TestCase { testParseMessageSetExtensionWithFlag(false); } - private void testParseMessageSetExtensionWithFlag(boolean eagerParsing) - throws Exception { + private void testParseMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception { ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing); ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance(); extensionRegistry.add(TestMessageSetExtension1.messageSetExtension); // Set up a RawMessageSet with a known messages. - int TYPE_ID_1 = - TestMessageSetExtension1 - .getDescriptor().getExtensions().get(0).getNumber(); RawMessageSet raw = - RawMessageSet.newBuilder() - .addItem( - RawMessageSet.Item.newBuilder() - .setTypeId(TYPE_ID_1) - .setMessage( - TestMessageSetExtension1.newBuilder() - .setI(123) - .build().toByteString()) - .build()) - .build(); + RawMessageSet.newBuilder() + .addItem( + RawMessageSet.Item.newBuilder() + .setTypeId(TYPE_ID_1) + .setMessage( + TestMessageSetExtension1.newBuilder().setI(123).build().toByteString()) + .build()) + .build(); ByteString data = raw.toByteString(); // Parse as a TestMessageSet and check the contents. - TestMessageSet messageSet = - TestMessageSet.parseFrom(data, extensionRegistry); - assertEquals(123, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); + TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry); + assertEquals(123, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); } public void testMergeLazyMessageSetExtensionEagerly() throws Exception { @@ -444,38 +425,29 @@ public class WireFormatTest extends TestCase { testMergeLazyMessageSetExtensionWithFlag(false); } - private void testMergeLazyMessageSetExtensionWithFlag(boolean eagerParsing) - throws Exception { + private void testMergeLazyMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception { ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing); ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance(); extensionRegistry.add(TestMessageSetExtension1.messageSetExtension); // Set up a RawMessageSet with a known messages. - int TYPE_ID_1 = - TestMessageSetExtension1 - .getDescriptor().getExtensions().get(0).getNumber(); RawMessageSet raw = - RawMessageSet.newBuilder() - .addItem( - RawMessageSet.Item.newBuilder() - .setTypeId(TYPE_ID_1) - .setMessage( - TestMessageSetExtension1.newBuilder() - .setI(123) - .build().toByteString()) - .build()) - .build(); + RawMessageSet.newBuilder() + .addItem( + RawMessageSet.Item.newBuilder() + .setTypeId(TYPE_ID_1) + .setMessage( + TestMessageSetExtension1.newBuilder().setI(123).build().toByteString()) + .build()) + .build(); ByteString data = raw.toByteString(); // Parse as a TestMessageSet and store value into lazy field - TestMessageSet messageSet = - TestMessageSet.parseFrom(data, extensionRegistry); + TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry); // Merge lazy field check the contents. - messageSet = - messageSet.toBuilder().mergeFrom(data, extensionRegistry).build(); - assertEquals(123, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); + messageSet = messageSet.toBuilder().mergeFrom(data, extensionRegistry).build(); + assertEquals(123, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); } public void testMergeMessageSetExtensionEagerly() throws Exception { @@ -486,31 +458,24 @@ public class WireFormatTest extends TestCase { testMergeMessageSetExtensionWithFlag(false); } - private void testMergeMessageSetExtensionWithFlag(boolean eagerParsing) - throws Exception { + private void testMergeMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception { ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing); ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance(); extensionRegistry.add(TestMessageSetExtension1.messageSetExtension); // Set up a RawMessageSet with a known messages. - int TYPE_ID_1 = - TestMessageSetExtension1 - .getDescriptor().getExtensions().get(0).getNumber(); RawMessageSet raw = - RawMessageSet.newBuilder() - .addItem( - RawMessageSet.Item.newBuilder() - .setTypeId(TYPE_ID_1) - .setMessage( - TestMessageSetExtension1.newBuilder() - .setI(123) - .build().toByteString()) - .build()) - .build(); + RawMessageSet.newBuilder() + .addItem( + RawMessageSet.Item.newBuilder() + .setTypeId(TYPE_ID_1) + .setMessage( + TestMessageSetExtension1.newBuilder().setI(123).build().toByteString()) + .build()) + .build(); // Serialize RawMessageSet unnormally (message value before type id) - ByteString.CodedBuilder out = ByteString.newCodedBuilder( - raw.getSerializedSize()); + ByteString.CodedBuilder out = ByteString.newCodedBuilder(raw.getSerializedSize()); CodedOutputStream output = out.getCodedOutput(); List<RawMessageSet.Item> items = raw.getItemList(); for (int i = 0; i < items.size(); i++) { @@ -525,8 +490,7 @@ public class WireFormatTest extends TestCase { // Merge bytes into TestMessageSet and check the contents. TestMessageSet messageSet = TestMessageSet.newBuilder().mergeFrom(data, extensionRegistry).build(); - assertEquals(123, messageSet.getExtension( - TestMessageSetExtension1.messageSetExtension).getI()); + assertEquals(123, messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI()); } // ================================================================ @@ -544,8 +508,8 @@ public class WireFormatTest extends TestCase { } public void testOneofOnlyLastSet() throws Exception { - TestOneofBackwardsCompatible source = TestOneofBackwardsCompatible - .newBuilder().setFooInt(100).setFooString("101").build(); + TestOneofBackwardsCompatible source = + TestOneofBackwardsCompatible.newBuilder().setFooInt(100).setFooString("101").build(); ByteString rawBytes = source.toByteString(); TestOneof2 message = TestOneof2.parseFrom(rawBytes); |