third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteTest.java - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Unified Diff: third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteTest.java

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix compile error Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/protobuf/README.chromium ('K') | « third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java ('k') | third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteTest.java

diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/LiteTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteTest.java

similarity index 63%

rename from third_party/protobuf/java/src/test/java/com/google/protobuf/LiteTest.java

rename to third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteTest.java

index b1f298ff40c5d30710c252c87e0e762a943f0816..88c3e0b2a37c273425b60ab9582fdd9ea8eb9679 100644

--- a/third_party/protobuf/java/src/test/java/com/google/protobuf/LiteTest.java

+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/LiteTest.java

@@ -33,22 +33,31 @@ package com.google.protobuf;

import static java.util.Collections.emptyList;

import static java.util.Collections.singletonList;

+import com.google.protobuf.UnittestImportLite.ImportEnumLite;

+import com.google.protobuf.UnittestImportPublicLite.PublicImportMessageLite;

import com.google.protobuf.UnittestLite;

import com.google.protobuf.UnittestLite.ForeignEnumLite;

import com.google.protobuf.UnittestLite.ForeignMessageLite;

import com.google.protobuf.UnittestLite.TestAllExtensionsLite;

import com.google.protobuf.UnittestLite.TestAllTypesLite;

+import com.google.protobuf.UnittestLite.TestAllTypesLite.NestedEnum;

import com.google.protobuf.UnittestLite.TestAllTypesLite.NestedMessage;

import com.google.protobuf.UnittestLite.TestAllTypesLite.OneofFieldCase;

import com.google.protobuf.UnittestLite.TestAllTypesLite.OptionalGroup;

import com.google.protobuf.UnittestLite.TestAllTypesLite.RepeatedGroup;

import com.google.protobuf.UnittestLite.TestAllTypesLiteOrBuilder;

import com.google.protobuf.UnittestLite.TestNestedExtensionLite;

+import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.Bar;

+import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.BarPrime;

+import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.Foo;

+import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestOneofEquals;

+import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestRecursiveOneof;

import junit.framework.TestCase;

import java.io.ByteArrayInputStream;

import java.io.ByteArrayOutputStream;

+import java.io.NotSerializableException;

import java.io.ObjectInputStream;

import java.io.ObjectOutputStream;

@@ -58,6 +67,7 @@ import java.io.ObjectOutputStream;

* @author kenton@google.com Kenton Varda

public class LiteTest extends TestCase {

+ @Override

public void setUp() throws Exception {

// Test that nested extensions are initialized correctly even if the outer

// class has not been accessed directly. This was once a bug with lite

@@ -128,33 +138,7 @@ public class LiteTest extends TestCase {

assertEquals(7, message2.getExtension(

UnittestLite.optionalNestedMessageExtensionLite).getBb());

}

- public void testSerialize() throws Exception {

- ByteArrayOutputStream baos = new ByteArrayOutputStream();

- TestAllTypesLite expected =

- TestAllTypesLite.newBuilder()

- .setOptionalInt32(123)

- .addRepeatedString("hello")

- .setOptionalNestedMessage(

- TestAllTypesLite.NestedMessage.newBuilder().setBb(7))

- .build();

- ObjectOutputStream out = new ObjectOutputStream(baos);

- try {

- out.writeObject(expected);

- } finally {

- out.close();

- }

- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());

- ObjectInputStream in = new ObjectInputStream(bais);

- TestAllTypesLite actual = (TestAllTypesLite) in.readObject();

- assertEquals(expected.getOptionalInt32(), actual.getOptionalInt32());

- assertEquals(expected.getRepeatedStringCount(),

- actual.getRepeatedStringCount());

- assertEquals(expected.getRepeatedString(0),

- actual.getRepeatedString(0));

- assertEquals(expected.getOptionalNestedMessage().getBb(),

- actual.getOptionalNestedMessage().getBb());

- }

public void testClone() {

TestAllTypesLite.Builder expected = TestAllTypesLite.newBuilder()

@@ -327,11 +311,9 @@ public class LiteTest extends TestCase {

assertEquals(

ForeignMessageLite.getDefaultInstance(),

message.getOptionalForeignMessage());

- // LITE_RUNTIME doesn't implement equals so we compare on a property and

- // ensure the property isn't set on foreignMessage.

- assertEquals(3, builder.getOptionalForeignMessage().getC());

+ assertEquals(foreignMessageBuilder.build(), builder.getOptionalForeignMessage());

messageAfterBuild = builder.build();

- assertEquals(3, messageAfterBuild.getOptionalForeignMessage().getC());

+ assertEquals(foreignMessageBuilder.build(), messageAfterBuild.getOptionalForeignMessage());

assertEquals(

ForeignMessageLite.getDefaultInstance(),

message.getOptionalForeignMessage());

@@ -339,7 +321,7 @@ public class LiteTest extends TestCase {

assertEquals(

ForeignMessageLite.getDefaultInstance(),

builder.getOptionalForeignMessage());

- assertEquals(3, messageAfterBuild.getOptionalForeignMessage().getC());

+ assertEquals(foreignMessageBuilder.build(), messageAfterBuild.getOptionalForeignMessage());

message = builder.build();

OptionalGroup optionalGroup = OptionalGroup.newBuilder()

@@ -364,17 +346,15 @@ public class LiteTest extends TestCase {

builder.setOptionalGroup(optionalGroupBuilder);

assertEquals(

OptionalGroup.getDefaultInstance(), message.getOptionalGroup());

- // LITE_RUNTIME doesn't implement equals so we compare on a property and

- // ensure the property isn't set on optionalGroup.

- assertEquals(3, builder.getOptionalGroup().getA());

+ assertEquals(optionalGroupBuilder.build(), builder.getOptionalGroup());

messageAfterBuild = builder.build();

- assertEquals(3, messageAfterBuild.getOptionalGroup().getA());

+ assertEquals(optionalGroupBuilder.build(), messageAfterBuild.getOptionalGroup());

assertEquals(

OptionalGroup.getDefaultInstance(), message.getOptionalGroup());

builder.clearOptionalGroup();

assertEquals(

OptionalGroup.getDefaultInstance(), builder.getOptionalGroup());

- assertEquals(3, messageAfterBuild.getOptionalGroup().getA());

+ assertEquals(optionalGroupBuilder.build(), messageAfterBuild.getOptionalGroup());

message = builder.build();

builder.setOptionalInt32(1);

@@ -425,17 +405,16 @@ public class LiteTest extends TestCase {

assertEquals(

NestedMessage.getDefaultInstance(),

message.getOptionalLazyMessage());

- // LITE_RUNTIME doesn't implement equals so we compare on a property.

- assertEquals(3, builder.getOptionalLazyMessage().getBb());

+ assertEquals(nestedMessageBuilder.build(), builder.getOptionalLazyMessage());

messageAfterBuild = builder.build();

- assertEquals(3, messageAfterBuild.getOptionalLazyMessage().getBb());

+ assertEquals(nestedMessageBuilder.build(), messageAfterBuild.getOptionalLazyMessage());

assertEquals(

NestedMessage.getDefaultInstance(),

message.getOptionalLazyMessage());

builder.clearOptionalLazyMessage();

assertEquals(

NestedMessage.getDefaultInstance(), builder.getOptionalLazyMessage());

- assertEquals(3, messageAfterBuild.getOptionalLazyMessage().getBb());

+ assertEquals(nestedMessageBuilder.build(), messageAfterBuild.getOptionalLazyMessage());

message = builder.build();

builder.setOptionalSfixed32(1);

@@ -1125,8 +1104,7 @@ public class LiteTest extends TestCase {

assertEquals(0, message.getRepeatedForeignMessageCount());

builder.setRepeatedForeignMessage(

0, ForeignMessageLite.getDefaultInstance());

- // LITE_RUNTIME doesn't implement equals so we compare on a property.

- assertEquals(3, messageAfterBuild.getRepeatedForeignMessage(0).getC());

+ assertEquals(foreignMessageBuilder.build(), messageAfterBuild.getRepeatedForeignMessage(0));

assertEquals(

ForeignMessageLite.getDefaultInstance(),

builder.getRepeatedForeignMessage(0));

@@ -1139,8 +1117,7 @@ public class LiteTest extends TestCase {

builder.setRepeatedForeignMessage(0, foreignMessageBuilder);

assertEquals(

foreignMessage, messageAfterBuild.getRepeatedForeignMessage(0));

- // LITE_RUNTIME doesn't implement equals so we compare on a property.

- assertEquals(3, builder.getRepeatedForeignMessage(0).getC());

+ assertEquals(foreignMessageBuilder.build(), builder.getRepeatedForeignMessage(0));

builder.clearRepeatedForeignMessage();

message = builder.build();

@@ -1173,9 +1150,7 @@ public class LiteTest extends TestCase {

messageAfterBuild = builder.build();

assertEquals(0, message.getRepeatedGroupCount());

builder.setRepeatedGroup(0, RepeatedGroup.getDefaultInstance());

- // LITE_RUNTIME doesn't implement equals so we compare on a property and

- // ensure the property isn't set on repeatedGroup.

- assertEquals(3, messageAfterBuild.getRepeatedGroup(0).getA());

+ assertEquals(repeatedGroupBuilder.build(), messageAfterBuild.getRepeatedGroup(0));

assertEquals(

RepeatedGroup.getDefaultInstance(), builder.getRepeatedGroup(0));

builder.clearRepeatedGroup();

@@ -1185,9 +1160,7 @@ public class LiteTest extends TestCase {

messageAfterBuild = builder.build();

assertEquals(0, message.getRepeatedGroupCount());

builder.setRepeatedGroup(0, RepeatedGroup.getDefaultInstance());

- // LITE_RUNTIME doesn't implement equals so we compare on a property and

- // ensure the property isn't set on repeatedGroup.

- assertEquals(3, messageAfterBuild.getRepeatedGroup(0).getA());

+ assertEquals(repeatedGroupBuilder.build(), messageAfterBuild.getRepeatedGroup(0));

assertEquals(

RepeatedGroup.getDefaultInstance(), builder.getRepeatedGroup(0));

builder.clearRepeatedGroup();

@@ -1235,9 +1208,7 @@ public class LiteTest extends TestCase {

messageAfterBuild = builder.build();

assertEquals(0, message.getRepeatedLazyMessageCount());

builder.setRepeatedLazyMessage(0, NestedMessage.getDefaultInstance());

- // LITE_RUNTIME doesn't implement equals so we compare on a property and

- // ensure the property isn't set on repeatedGroup.

- assertEquals(3, messageAfterBuild.getRepeatedLazyMessage(0).getBb());

+ assertEquals(nestedMessageBuilder.build(), messageAfterBuild.getRepeatedLazyMessage(0));

assertEquals(

NestedMessage.getDefaultInstance(), builder.getRepeatedLazyMessage(0));

builder.clearRepeatedLazyMessage();

@@ -1247,9 +1218,7 @@ public class LiteTest extends TestCase {

messageAfterBuild = builder.build();

assertEquals(0, message.getRepeatedLazyMessageCount());

builder.setRepeatedLazyMessage(0, NestedMessage.getDefaultInstance());

- // LITE_RUNTIME doesn't implement equals so we compare on a property and

- // ensure the property isn't set on repeatedGroup.

- assertEquals(3, messageAfterBuild.getRepeatedLazyMessage(0).getBb());

+ assertEquals(nestedMessageBuilder.build(), messageAfterBuild.getRepeatedLazyMessage(0));

assertEquals(

NestedMessage.getDefaultInstance(), builder.getRepeatedLazyMessage(0));

builder.clearRepeatedLazyMessage();

@@ -1459,4 +1428,802 @@ public class LiteTest extends TestCase {

11, (int) extendableMessage.getExtension(

UnittestLite.optionalFixed32ExtensionLite));

}

+ public void testToStringDefaultInstance() throws Exception {

+ assertToStringEquals("", TestAllTypesLite.getDefaultInstance());

+ }

+ public void testToStringPrimitives() throws Exception {

+ TestAllTypesLite proto = TestAllTypesLite.newBuilder()

+ .setOptionalInt32(1)

+ .setOptionalInt64(9223372036854775807L)

+ .build();

+ assertToStringEquals("optional_int32: 1\noptional_int64: 9223372036854775807", proto);

+ proto = TestAllTypesLite.newBuilder()

+ .setOptionalBool(true)

+ .setOptionalNestedEnum(TestAllTypesLite.NestedEnum.BAZ)

+ .build();

+ assertToStringEquals("optional_bool: true\noptional_nested_enum: BAZ", proto);

+ proto = TestAllTypesLite.newBuilder()

+ .setOptionalFloat(2.72f)

+ .setOptionalDouble(3.14)

+ .build();

+ assertToStringEquals("optional_double: 3.14\noptional_float: 2.72", proto);

+ }

+ public void testToStringStringFields() throws Exception {

+ TestAllTypesLite proto = TestAllTypesLite.newBuilder()

+ .setOptionalString("foo\"bar\nbaz\\")

+ .build();

+ assertToStringEquals("optional_string: \"foo\\\"bar\\nbaz\\\\\"", proto);

+ proto = TestAllTypesLite.newBuilder()

+ .setOptionalString("\u6587")

+ .build();

+ assertToStringEquals("optional_string: \"\\346\\226\\207\"", proto);

+ }

+ public void testToStringNestedMessage() throws Exception {

+ TestAllTypesLite proto = TestAllTypesLite.newBuilder()

+ .setOptionalNestedMessage(TestAllTypesLite.NestedMessage.getDefaultInstance())

+ .build();

+ assertToStringEquals("optional_nested_message {\n}", proto);

+ proto = TestAllTypesLite.newBuilder()

+ .setOptionalNestedMessage(

+ TestAllTypesLite.NestedMessage.newBuilder().setBb(7))

+ .build();

+ assertToStringEquals("optional_nested_message {\n bb: 7\n}", proto);

+ }

+ public void testToStringRepeatedFields() throws Exception {

+ TestAllTypesLite proto = TestAllTypesLite.newBuilder()

+ .addRepeatedInt32(32)

+ .addRepeatedInt64(64)

+ .build();

+ assertToStringEquals("repeated_int32: 32\nrepeated_int32: 32\nrepeated_int64: 64", proto);

+ proto = TestAllTypesLite.newBuilder()

+ .addRepeatedLazyMessage(

+ TestAllTypesLite.NestedMessage.newBuilder().setBb(7))

+ .addRepeatedLazyMessage(

+ TestAllTypesLite.NestedMessage.newBuilder().setBb(8))

+ .build();

+ assertToStringEquals(

+ "repeated_lazy_message {\n bb: 7\n}\nrepeated_lazy_message {\n bb: 8\n}",

+ proto);

+ }

+ public void testToStringForeignFields() throws Exception {

+ TestAllTypesLite proto = TestAllTypesLite.newBuilder()

+ .setOptionalForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR)

+ .setOptionalForeignMessage(

+ ForeignMessageLite.newBuilder()

+ .setC(3))

+ .build();

+ assertToStringEquals(

+ "optional_foreign_enum: FOREIGN_LITE_BAR\noptional_foreign_message {\n c: 3\n}",

+ proto);

+ }

+ public void testToStringExtensions() throws Exception {

+ TestAllExtensionsLite message = TestAllExtensionsLite.newBuilder()

+ .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)

+ .addExtension(UnittestLite.repeatedStringExtensionLite, "spam")

+ .addExtension(UnittestLite.repeatedStringExtensionLite, "eggs")

+ .setExtension(UnittestLite.optionalNestedEnumExtensionLite,

+ TestAllTypesLite.NestedEnum.BAZ)

+ .setExtension(UnittestLite.optionalNestedMessageExtensionLite,

+ TestAllTypesLite.NestedMessage.newBuilder().setBb(7).build())

+ .build();

+ assertToStringEquals(

+ "[1]: 123\n[18] {\n bb: 7\n}\n[21]: 3\n[44]: \"spam\"\n[44]: \"eggs\"",

+ message);

+ }

+ public void testToStringUnknownFields() throws Exception {

+ TestAllExtensionsLite messageWithExtensions = TestAllExtensionsLite.newBuilder()

+ .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)

+ .addExtension(UnittestLite.repeatedStringExtensionLite, "spam")

+ .addExtension(UnittestLite.repeatedStringExtensionLite, "eggs")

+ .setExtension(UnittestLite.optionalNestedEnumExtensionLite,

+ TestAllTypesLite.NestedEnum.BAZ)

+ .setExtension(UnittestLite.optionalNestedMessageExtensionLite,

+ TestAllTypesLite.NestedMessage.newBuilder().setBb(7).build())

+ .build();

+ TestAllExtensionsLite messageWithUnknownFields = TestAllExtensionsLite.parseFrom(

+ messageWithExtensions.toByteArray());

+ assertToStringEquals(

+ "1: 123\n18: \"\\b\\a\"\n21: 3\n44: \"spam\"\n44: \"eggs\"",

+ messageWithUnknownFields);

+ }

+ public void testToStringLazyMessage() throws Exception {

+ TestAllTypesLite message = TestAllTypesLite.newBuilder()

+ .setOptionalLazyMessage(NestedMessage.newBuilder().setBb(1).build())

+ .build();

+ assertToStringEquals("optional_lazy_message {\n bb: 1\n}", message);

+ }

+ public void testToStringGroup() throws Exception {

+ TestAllTypesLite message = TestAllTypesLite.newBuilder()

+ .setOptionalGroup(OptionalGroup.newBuilder().setA(1).build())

+ .build();

+ assertToStringEquals("optional_group {\n a: 1\n}", message);

+ }

+ public void testToStringOneof() throws Exception {

+ TestAllTypesLite message = TestAllTypesLite.newBuilder()

+ .setOneofString("hello")

+ .build();

+ assertToStringEquals("oneof_string: \"hello\"", message);

+ }

+ // Asserts that the toString() representation of the message matches the expected. This verifies

+ // the first line starts with a comment; but, does not factor in said comment as part of the

+ // comparison as it contains unstable addresses.

+ private static void assertToStringEquals(String expected, MessageLite message) {

+ String toString = message.toString();

+ assertEquals('#', toString.charAt(0));

+ if (toString.indexOf("\n") >= 0) {

+ toString = toString.substring(toString.indexOf("\n") + 1);

+ } else {

+ toString = "";

+ }

+ assertEquals(expected, toString);

+ }

+ public void testParseLazy() throws Exception {

+ ByteString bb = TestAllTypesLite.newBuilder()

+ .setOptionalLazyMessage(NestedMessage.newBuilder()

+ .setBb(11)

+ .build())

+ .build().toByteString();

+ ByteString cc = TestAllTypesLite.newBuilder()

+ .setOptionalLazyMessage(NestedMessage.newBuilder()

+ .setCc(22)

+ .build())

+ .build().toByteString();

+ ByteString concat = bb.concat(cc);

+ TestAllTypesLite message = TestAllTypesLite.parseFrom(concat);

+ assertEquals(11, message.getOptionalLazyMessage().getBb());

+ assertEquals(22L, message.getOptionalLazyMessage().getCc());

+ }

+ public void testParseLazy_oneOf() throws Exception {

+ ByteString bb = TestAllTypesLite.newBuilder()

+ .setOneofLazyNestedMessage(NestedMessage.newBuilder()

+ .setBb(11)

+ .build())

+ .build().toByteString();

+ ByteString cc = TestAllTypesLite.newBuilder()

+ .setOneofLazyNestedMessage(NestedMessage.newBuilder()

+ .setCc(22)

+ .build())

+ .build().toByteString();

+ ByteString concat = bb.concat(cc);

+ TestAllTypesLite message = TestAllTypesLite.parseFrom(concat);

+ assertEquals(11, message.getOneofLazyNestedMessage().getBb());

+ assertEquals(22L, message.getOneofLazyNestedMessage().getCc());

+ }

+ public void testMergeFromStream_repeatedField() throws Exception {

+ TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder()

+ .addRepeatedString("hello");

+ builder.mergeFrom(CodedInputStream.newInstance(builder.build().toByteArray()));

+ assertEquals(2, builder.getRepeatedStringCount());

+ }

+ public void testMergeFromStream_invalidBytes() throws Exception {

+ TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder()

+ .setDefaultBool(true);

+ try {

+ builder.mergeFrom(CodedInputStream.newInstance("Invalid bytes".getBytes(Internal.UTF_8)));

+ fail();

+ } catch (InvalidProtocolBufferException expected) {}

+ }

+ public void testMergeFrom_sanity() throws Exception {

+ TestAllTypesLite one = TestUtilLite.getAllLiteSetBuilder().build();

+ byte[] bytes = one.toByteArray();

+ TestAllTypesLite two = TestAllTypesLite.parseFrom(bytes);

+ one = one.toBuilder().mergeFrom(one).build();

+ two = two.toBuilder().mergeFrom(bytes).build();

+ assertEquals(one, two);

+ assertEquals(two, one);

+ assertEquals(one.hashCode(), two.hashCode());

+ }

+ public void testEquals_notEqual() throws Exception {

+ TestAllTypesLite one = TestUtilLite.getAllLiteSetBuilder().build();

+ byte[] bytes = one.toByteArray();

+ TestAllTypesLite two = one.toBuilder().mergeFrom(one).mergeFrom(bytes).build();

+ assertFalse(one.equals(two));

+ assertFalse(two.equals(one));

+ assertFalse(one.equals(TestAllTypesLite.getDefaultInstance()));

+ assertFalse(TestAllTypesLite.getDefaultInstance().equals(one));

+ TestAllTypesLite oneFieldSet = TestAllTypesLite.newBuilder()

+ .setDefaultBool(true)

+ .build();

+ assertFalse(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance()));