| Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| diff --git a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| index a9b8b6381a490e242177b70e8ef0a4948d4cc105..3eece26a4a72e654685dd3bf02dff56727014c82 100644
|
| --- a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| +++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
|
| @@ -65,9 +65,6 @@ import protobuf_unittest.UnittestProto.TestExtremeDefaultValues;
|
| import protobuf_unittest.UnittestProto.TestOneof2;
|
| import protobuf_unittest.UnittestProto.TestPackedTypes;
|
| import protobuf_unittest.UnittestProto.TestUnpackedTypes;
|
| -
|
| -import junit.framework.TestCase;
|
| -
|
| import java.io.ByteArrayInputStream;
|
| import java.io.ByteArrayOutputStream;
|
| import java.io.ObjectInputStream;
|
| @@ -76,6 +73,7 @@ import java.util.Arrays;
|
| import java.util.Collections;
|
| import java.util.Iterator;
|
| import java.util.List;
|
| +import junit.framework.TestCase;
|
|
|
| /**
|
| * Unit test for generated messages and generated code. See also
|
| @@ -972,7 +970,7 @@ public class GeneratedMessageTest extends TestCase {
|
| TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
|
|
|
| TestAllTypes.Builder builder = (TestAllTypes.Builder)
|
| - ((GeneratedMessage) TestAllTypes.getDefaultInstance()).
|
| + ((AbstractMessage) TestAllTypes.getDefaultInstance()).
|
| newBuilderForType(mockParent);
|
| builder.setOptionalInt32(1);
|
| builder.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR);
|
| @@ -1027,7 +1025,7 @@ public class GeneratedMessageTest extends TestCase {
|
| TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
|
|
|
| TestAllExtensions.Builder builder = (TestAllExtensions.Builder)
|
| - ((GeneratedMessage) TestAllExtensions.getDefaultInstance()).
|
| + ((AbstractMessage) TestAllExtensions.getDefaultInstance()).
|
| newBuilderForType(mockParent);
|
|
|
| builder.addExtension(UnittestProto.repeatedInt32Extension, 1);
|
|
|