Index: third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/AbstractMessageTest.java |
diff --git a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java b/third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/AbstractMessageTest.java |
similarity index 92% |
copy from third_party/protobuf/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java |
copy to third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/AbstractMessageTest.java |
index 7dc9fc15041f2002dffcfa96e91a77d2e39f0caf..6789550c49c247cb14258b5d82b98a633f3598c3 100644 |
--- a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java |
+++ b/third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/AbstractMessageTest.java |
@@ -1,6 +1,6 @@ |
// Protocol Buffers - Google's data interchange format |
// Copyright 2008 Google Inc. All rights reserved. |
-// https://developers.google.com/protocol-buffers/ |
+// http://code.google.com/p/protobuf/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -28,7 +28,8 @@ |
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-package com.google.protobuf; |
+package com.google.protobuf.test; |
+import com.google.protobuf.*; |
import com.google.protobuf.Descriptors.FieldDescriptor; |
import protobuf_unittest.UnittestOptimizeFor.TestOptimizedForSize; |
@@ -40,6 +41,7 @@ import protobuf_unittest.UnittestProto.TestPackedTypes; |
import protobuf_unittest.UnittestProto.TestRequired; |
import protobuf_unittest.UnittestProto.TestRequiredForeign; |
import protobuf_unittest.UnittestProto.TestUnpackedTypes; |
+ |
import junit.framework.TestCase; |
import java.util.Map; |
@@ -64,44 +66,35 @@ public class AbstractMessageTest extends TestCase { |
this.wrappedMessage = wrappedMessage; |
} |
- @Override |
public Descriptors.Descriptor getDescriptorForType() { |
return wrappedMessage.getDescriptorForType(); |
} |
- @Override |
public AbstractMessageWrapper 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) { |
+ 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()); |
} |
@@ -113,80 +106,65 @@ public class AbstractMessageTest extends TestCase { |
this.wrappedBuilder = wrappedBuilder; |
} |
- @Override |
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()); |
} |
- @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) { |
+ public Object getRepeatedField( |
+ Descriptors.FieldDescriptor field, int index) { |
return wrappedBuilder.getRepeatedField(field, index); |
} |
- @Override |
- public Builder setRepeatedField(Descriptors.FieldDescriptor field, int index, Object value) { |
+ 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) { |
+ 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; |
@@ -196,7 +174,6 @@ public class AbstractMessageTest extends TestCase { |
return wrappedBuilder.getFieldBuilder(field); |
} |
} |
- @Override |
public Parser<? extends Message> getParserForType() { |
return wrappedMessage.getParserForType(); |
} |
@@ -530,22 +507,4 @@ public class AbstractMessageTest extends TestCase { |
String.format("%s should have a different hash code from %s", m1, m2), |
m1.hashCode() == m2.hashCode()); |
} |
- |
- public void testCheckByteStringIsUtf8OnUtf8() { |
- ByteString byteString = ByteString.copyFromUtf8("some text"); |
- AbstractMessageLite.checkByteStringIsUtf8(byteString); |
- // No exception thrown. |
- } |
- |
- public void testCheckByteStringIsUtf8OnNonUtf8() { |
- ByteString byteString = |
- ByteString.copyFrom(new byte[]{(byte) 0x80}); // A lone continuation byte. |
- try { |
- AbstractMessageLite.checkByteStringIsUtf8(byteString); |
- fail("Expected AbstractMessageLite.checkByteStringIsUtf8 to throw IllegalArgumentException"); |
- } catch (IllegalArgumentException exception) { |
- assertEquals("Byte string is not UTF-8.", exception.getMessage()); |
- } |
- } |
- |
} |