| Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| similarity index 98%
|
| rename from third_party/protobuf/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| rename to third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| index 70812b953f57ff7335eb7c6e183eda8b414e8b44..a9b8b6381a490e242177b70e8ef0a4948d4cc105 100644
|
| --- a/third_party/protobuf/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| +++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| @@ -620,6 +620,21 @@ public class GeneratedMessageTest extends TestCase {
|
| TestUtil.assertExtensionsClear(TestAllExtensions.newBuilder().build());
|
| }
|
|
|
| + public void testUnsetRepeatedExtensionGetField() {
|
| + TestAllExtensions message = TestAllExtensions.getDefaultInstance();
|
| + Object value;
|
| +
|
| + value = message.getField(UnittestProto.repeatedStringExtension.getDescriptor());
|
| + assertTrue(value instanceof List);
|
| + assertTrue(((List<?>) value).isEmpty());
|
| + assertIsUnmodifiable((List<?>) value);
|
| +
|
| + value = message.getField(UnittestProto.repeatedNestedMessageExtension.getDescriptor());
|
| + assertTrue(value instanceof List);
|
| + assertTrue(((List<?>) value).isEmpty());
|
| + assertIsUnmodifiable((List<?>) value);
|
| + }
|
| +
|
| public void testExtensionReflectionGetters() throws Exception {
|
| TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
|
| TestUtil.setAllExtensions(builder);
|
| @@ -708,7 +723,7 @@ public class GeneratedMessageTest extends TestCase {
|
|
|
| public void testLiteExtensionMessageOrBuilder() throws Exception {
|
| TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.newBuilder();
|
| - TestUtil.setAllExtensions(builder);
|
| + TestUtilLite.setAllExtensions(builder);
|
| TestUtil.assertAllExtensionsSet(builder);
|
|
|
| TestAllExtensionsLite message = builder.build();
|
| @@ -717,8 +732,8 @@ public class GeneratedMessageTest extends TestCase {
|
|
|
| public void testLiteExtensionRepeatedSetters() throws Exception {
|
| TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.newBuilder();
|
| - TestUtil.setAllExtensions(builder);
|
| - TestUtil.modifyRepeatedExtensions(builder);
|
| + TestUtilLite.setAllExtensions(builder);
|
| + TestUtilLite.modifyRepeatedExtensions(builder);
|
| TestUtil.assertRepeatedExtensionsModified(builder);
|
|
|
| TestAllExtensionsLite message = builder.build();
|
| @@ -745,7 +760,7 @@ public class GeneratedMessageTest extends TestCase {
|
| }
|
|
|
| public void testLiteExtensionCopy() throws Exception {
|
| - TestAllExtensionsLite original = TestUtil.getAllLiteExtensionsSet();
|
| + TestAllExtensionsLite original = TestUtilLite.getAllLiteExtensionsSet();
|
| TestAllExtensionsLite copy =
|
| TestAllExtensionsLite.newBuilder(original).build();
|
| TestUtil.assertAllExtensionsSet(copy);
|
|
|