| Index: third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/TestUtil.java
|
| diff --git a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/TestUtil.java b/third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/TestUtil.java
|
| similarity index 75%
|
| copy from third_party/protobuf/java/core/src/test/java/com/google/protobuf/TestUtil.java
|
| copy to third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/TestUtil.java
|
| index 08b2a76d925e07b7eb52599036a4b344a941f453..a92348303e993937c38962bb9475cb2376f90756 100644
|
| --- a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/TestUtil.java
|
| +++ b/third_party/protobuf/java/compatibility_tests/v2.5.0/tests/src/main/java/com/google/protobuf/test/TestUtil.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,210 +28,118 @@
|
| // (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;
|
| -
|
| -import static com.google.protobuf.UnittestLite.defaultBoolExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultBytesExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultCordExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultDoubleExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultFixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultFixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultFloatExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultForeignEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultImportEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultInt32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultInt64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultNestedEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultSfixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultSfixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultSint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultSint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultStringExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultStringPieceExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultUint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.defaultUint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.oneofBytesExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.oneofNestedMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.oneofStringExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.oneofUint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalBoolExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalBytesExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalCordExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalDoubleExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalFixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalFixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalFloatExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalForeignEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalForeignMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalGroupExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalImportEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalImportMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalInt32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalInt64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalLazyMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalNestedEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalNestedMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalPublicImportMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalSfixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalSfixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalSint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalSint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalStringExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalStringPieceExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalUint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.optionalUint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedBoolExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedDoubleExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedFixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedFixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedFloatExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedInt32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedInt64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedSfixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedSfixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedSint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedSint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedUint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.packedUint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedBoolExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedBytesExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedCordExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedDoubleExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedFixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedFixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedFloatExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedForeignEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedForeignMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedGroupExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedImportEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedImportMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedInt32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedInt64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedLazyMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedNestedEnumExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedNestedMessageExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedSfixed32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedSfixed64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedSint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedSint64ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedStringExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedStringPieceExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedUint32ExtensionLite;
|
| -import static com.google.protobuf.UnittestLite.repeatedUint64ExtensionLite;
|
| -import static protobuf_unittest.UnittestProto.OptionalGroup_extension;
|
| -import static protobuf_unittest.UnittestProto.RepeatedGroup_extension;
|
| -import static protobuf_unittest.UnittestProto.defaultBoolExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultBytesExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultCordExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultDoubleExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultFixed32Extension;
|
| -import static protobuf_unittest.UnittestProto.defaultFixed64Extension;
|
| -import static protobuf_unittest.UnittestProto.defaultFloatExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultForeignEnumExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultImportEnumExtension;
|
| +package com.google.protobuf.test;
|
| +import com.google.protobuf.*;
|
| +
|
| +import protobuf_unittest.UnittestProto;
|
| +
|
| // 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;
|
| -import static protobuf_unittest.UnittestProto.defaultSfixed32Extension;
|
| -import static protobuf_unittest.UnittestProto.defaultSfixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultUint32Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultUint64Extension;
|
| import static protobuf_unittest.UnittestProto.defaultSint32Extension;
|
| import static protobuf_unittest.UnittestProto.defaultSint64Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultFixed32Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultFixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultSfixed32Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultSfixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.defaultFloatExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultDoubleExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultBoolExtension;
|
| import static protobuf_unittest.UnittestProto.defaultStringExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultBytesExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultNestedEnumExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultForeignEnumExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultImportEnumExtension;
|
| import static protobuf_unittest.UnittestProto.defaultStringPieceExtension;
|
| -import static protobuf_unittest.UnittestProto.defaultUint32Extension;
|
| -import static protobuf_unittest.UnittestProto.defaultUint64Extension;
|
| -import static protobuf_unittest.UnittestProto.oneofBytesExtension;
|
| -import static protobuf_unittest.UnittestProto.oneofNestedMessageExtension;
|
| -import static protobuf_unittest.UnittestProto.oneofStringExtension;
|
| -import static protobuf_unittest.UnittestProto.oneofUint32Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalBoolExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalBytesExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalCordExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalDoubleExtension;
|
| +import static protobuf_unittest.UnittestProto.defaultCordExtension;
|
| +
|
| +import static protobuf_unittest.UnittestProto.optionalInt32Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalInt64Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalUint32Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalUint64Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalSint32Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalSint64Extension;
|
| import static protobuf_unittest.UnittestProto.optionalFixed32Extension;
|
| import static protobuf_unittest.UnittestProto.optionalFixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalSfixed32Extension;
|
| +import static protobuf_unittest.UnittestProto.optionalSfixed64Extension;
|
| import static protobuf_unittest.UnittestProto.optionalFloatExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalDoubleExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalBoolExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalStringExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalBytesExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalGroupExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalCordExtension;
|
| import static protobuf_unittest.UnittestProto.optionalForeignEnumExtension;
|
| import static protobuf_unittest.UnittestProto.optionalForeignMessageExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalGroupExtension;
|
| import static protobuf_unittest.UnittestProto.optionalImportEnumExtension;
|
| import static protobuf_unittest.UnittestProto.optionalImportMessageExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalInt32Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalInt64Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalLazyMessageExtension;
|
| import static protobuf_unittest.UnittestProto.optionalNestedEnumExtension;
|
| import static protobuf_unittest.UnittestProto.optionalNestedMessageExtension;
|
| import static protobuf_unittest.UnittestProto.optionalPublicImportMessageExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalSfixed32Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalSfixed64Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalSint32Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalSint64Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalStringExtension;
|
| +import static protobuf_unittest.UnittestProto.optionalLazyMessageExtension;
|
| import static protobuf_unittest.UnittestProto.optionalStringPieceExtension;
|
| -import static protobuf_unittest.UnittestProto.optionalUint32Extension;
|
| -import static protobuf_unittest.UnittestProto.optionalUint64Extension;
|
| -import static protobuf_unittest.UnittestProto.packedBoolExtension;
|
| -import static protobuf_unittest.UnittestProto.packedDoubleExtension;
|
| -import static protobuf_unittest.UnittestProto.packedEnumExtension;
|
| -import static protobuf_unittest.UnittestProto.packedFixed32Extension;
|
| -import static protobuf_unittest.UnittestProto.packedFixed64Extension;
|
| -import static protobuf_unittest.UnittestProto.packedFloatExtension;
|
| -import static protobuf_unittest.UnittestProto.packedInt32Extension;
|
| -import static protobuf_unittest.UnittestProto.packedInt64Extension;
|
| -import static protobuf_unittest.UnittestProto.packedSfixed32Extension;
|
| -import static protobuf_unittest.UnittestProto.packedSfixed64Extension;
|
| -import static protobuf_unittest.UnittestProto.packedSint32Extension;
|
| -import static protobuf_unittest.UnittestProto.packedSint64Extension;
|
| -import static protobuf_unittest.UnittestProto.packedUint32Extension;
|
| -import static protobuf_unittest.UnittestProto.packedUint64Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedBoolExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedBytesExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedCordExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedDoubleExtension;
|
| +
|
| +import static protobuf_unittest.UnittestProto.repeatedInt32Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedInt64Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedUint32Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedUint64Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedSint32Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedSint64Extension;
|
| import static protobuf_unittest.UnittestProto.repeatedFixed32Extension;
|
| import static protobuf_unittest.UnittestProto.repeatedFixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedSfixed32Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedSfixed64Extension;
|
| import static protobuf_unittest.UnittestProto.repeatedFloatExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedForeignEnumExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedForeignMessageExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedDoubleExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedBoolExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedStringExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedBytesExtension;
|
| import static protobuf_unittest.UnittestProto.repeatedGroupExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedImportEnumExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedNestedMessageExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedForeignMessageExtension;
|
| import static protobuf_unittest.UnittestProto.repeatedImportMessageExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedInt32Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedInt64Extension;
|
| import static protobuf_unittest.UnittestProto.repeatedLazyMessageExtension;
|
| import static protobuf_unittest.UnittestProto.repeatedNestedEnumExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedNestedMessageExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedSfixed32Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedSfixed64Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedSint32Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedSint64Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedStringExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedForeignEnumExtension;
|
| +import static protobuf_unittest.UnittestProto.repeatedImportEnumExtension;
|
| import static protobuf_unittest.UnittestProto.repeatedStringPieceExtension;
|
| -import static protobuf_unittest.UnittestProto.repeatedUint32Extension;
|
| -import static protobuf_unittest.UnittestProto.repeatedUint64Extension;
|
| +import static protobuf_unittest.UnittestProto.repeatedCordExtension;
|
| +
|
| +import static protobuf_unittest.UnittestProto.OptionalGroup_extension;
|
| +import static protobuf_unittest.UnittestProto.RepeatedGroup_extension;
|
| +
|
| +import static protobuf_unittest.UnittestProto.packedInt32Extension;
|
| +import static protobuf_unittest.UnittestProto.packedInt64Extension;
|
| +import static protobuf_unittest.UnittestProto.packedUint32Extension;
|
| +import static protobuf_unittest.UnittestProto.packedUint64Extension;
|
| +import static protobuf_unittest.UnittestProto.packedSint32Extension;
|
| +import static protobuf_unittest.UnittestProto.packedSint64Extension;
|
| +import static protobuf_unittest.UnittestProto.packedFixed32Extension;
|
| +import static protobuf_unittest.UnittestProto.packedFixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.packedSfixed32Extension;
|
| +import static protobuf_unittest.UnittestProto.packedSfixed64Extension;
|
| +import static protobuf_unittest.UnittestProto.packedFloatExtension;
|
| +import static protobuf_unittest.UnittestProto.packedDoubleExtension;
|
| +import static protobuf_unittest.UnittestProto.packedBoolExtension;
|
| +import static protobuf_unittest.UnittestProto.packedEnumExtension;
|
| +
|
|
|
| -import com.google.protobuf.UnittestImportLite.ImportEnumLite;
|
| -import com.google.protobuf.UnittestLite.ForeignEnumLite;
|
| -import com.google.protobuf.UnittestLite.TestAllExtensionsLiteOrBuilder;
|
| -import com.google.protobuf.UnittestLite.TestAllTypesLite;
|
| -import com.google.protobuf.UnittestLite.TestPackedExtensionsLite;
|
| -import com.google.protobuf.test.UnittestImport.ImportEnum;
|
| -import com.google.protobuf.test.UnittestImport.ImportMessage;
|
| -import com.google.protobuf.test.UnittestImportPublic.PublicImportMessage;
|
| -import protobuf_unittest.UnittestProto;
|
| -import protobuf_unittest.UnittestProto.ForeignEnum;
|
| -import protobuf_unittest.UnittestProto.ForeignMessage;
|
| import protobuf_unittest.UnittestProto.TestAllExtensions;
|
| import protobuf_unittest.UnittestProto.TestAllExtensionsOrBuilder;
|
| import protobuf_unittest.UnittestProto.TestAllTypes;
|
| import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
|
| -import protobuf_unittest.UnittestProto.TestOneof2;
|
| import protobuf_unittest.UnittestProto.TestPackedExtensions;
|
| import protobuf_unittest.UnittestProto.TestPackedTypes;
|
| import protobuf_unittest.UnittestProto.TestUnpackedTypes;
|
| +import protobuf_unittest.UnittestProto.ForeignMessage;
|
| +import protobuf_unittest.UnittestProto.ForeignEnum;
|
| +import com.google.protobuf.test.UnittestImport.ImportEnum;
|
| +import com.google.protobuf.test.UnittestImport.ImportMessage;
|
| +import com.google.protobuf.test.UnittestImportPublic.PublicImportMessage;
|
|
|
| import junit.framework.Assert;
|
|
|
| @@ -256,7 +164,11 @@ public final class TestUtil {
|
|
|
| /** Helper to convert a String to ByteString. */
|
| static ByteString toBytes(String str) {
|
| - return ByteString.copyFrom(str.getBytes(Internal.UTF_8));
|
| + try {
|
| + return ByteString.copyFrom(str.getBytes("UTF-8"));
|
| + } catch(java.io.UnsupportedEncodingException e) {
|
| + throw new RuntimeException("UTF-8 not supported.", e);
|
| + }
|
| }
|
|
|
| /**
|
| @@ -443,12 +355,6 @@ public final class TestUtil {
|
|
|
| message.setDefaultStringPiece("424");
|
| message.setDefaultCord("425");
|
| -
|
| - message.setOneofUint32(601);
|
| - message.setOneofNestedMessage(
|
| - TestAllTypes.NestedMessage.newBuilder().setBb(602).build());
|
| - message.setOneofString("603");
|
| - message.setOneofBytes(toBytes("604"));
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -698,14 +604,6 @@ public final class TestUtil {
|
|
|
| Assert.assertEquals("424", message.getDefaultStringPiece());
|
| Assert.assertEquals("425", message.getDefaultCord());
|
| -
|
| - Assert.assertEquals(TestAllTypes.OneofFieldCase.ONEOF_BYTES, message.getOneofFieldCase());
|
| - Assert.assertFalse(message.hasOneofUint32());
|
| - Assert.assertFalse(message.hasOneofNestedMessage());
|
| - Assert.assertFalse(message.hasOneofString());
|
| - Assert.assertTrue(message.hasOneofBytes());
|
| -
|
| - Assert.assertEquals(toBytes("604"), message.getOneofBytes());
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -860,11 +758,6 @@ public final class TestUtil {
|
|
|
| Assert.assertEquals("abc", message.getDefaultStringPiece());
|
| Assert.assertEquals("123", message.getDefaultCord());
|
| -
|
| - Assert.assertFalse(message.hasOneofUint32());
|
| - Assert.assertFalse(message.hasOneofNestedMessage());
|
| - Assert.assertFalse(message.hasOneofString());
|
| - Assert.assertFalse(message.hasOneofBytes());
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -1173,19 +1066,6 @@ public final class TestUtil {
|
| private static void assertEqualsExactType(ImportEnum a, ImportEnum b) {
|
| Assert.assertEquals(a, b);
|
| }
|
| - private static void assertEqualsExactType(TestAllTypesLite.NestedEnum a,
|
| - TestAllTypesLite.NestedEnum b) {
|
| - Assert.assertEquals(a, b);
|
| - }
|
| - private static void assertEqualsExactType(ForeignEnumLite a,
|
| - ForeignEnumLite b) {
|
| - Assert.assertEquals(a, 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}.
|
| @@ -1196,15 +1076,16 @@ public final class TestUtil {
|
| return registry.getUnmodifiable();
|
| }
|
|
|
| +
|
| /**
|
| * Register all of {@code TestAllExtensions}'s extensions with the
|
| * given {@link ExtensionRegistry}.
|
| */
|
| public static void registerAllExtensions(ExtensionRegistry registry) {
|
| UnittestProto.registerAllExtensions(registry);
|
| - TestUtilLite.registerAllExtensionsLite(registry);
|
| }
|
|
|
| +
|
| /**
|
| * Set every field of {@code message} to the values expected by
|
| * {@code assertAllExtensionsSet()}.
|
| @@ -1341,12 +1222,6 @@ public final class TestUtil {
|
|
|
| message.setExtension(defaultStringPieceExtension, "424");
|
| message.setExtension(defaultCordExtension, "425");
|
| -
|
| - message.setExtension(oneofUint32Extension, 601);
|
| - message.setExtension(oneofNestedMessageExtension,
|
| - TestAllTypes.NestedMessage.newBuilder().setBb(602).build());
|
| - message.setExtension(oneofStringExtension, "603");
|
| - message.setExtension(oneofBytesExtension, toBytes("604"));
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -1610,10 +1485,6 @@ public final class TestUtil {
|
|
|
| assertEqualsExactType("424", message.getExtension(defaultStringPieceExtension));
|
| assertEqualsExactType("425", message.getExtension(defaultCordExtension));
|
| -
|
| - Assert.assertTrue(message.hasExtension(oneofBytesExtension));
|
| -
|
| - assertEqualsExactType(toBytes("604"), message.getExtension(oneofBytesExtension));
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -1800,11 +1671,6 @@ public final class TestUtil {
|
|
|
| assertEqualsExactType("abc", message.getExtension(defaultStringPieceExtension));
|
| assertEqualsExactType("123", message.getExtension(defaultCordExtension));
|
| -
|
| - Assert.assertFalse(message.hasExtension(oneofUint32Extension));
|
| - Assert.assertFalse(message.hasExtension(oneofNestedMessageExtension));
|
| - Assert.assertFalse(message.hasExtension(oneofStringExtension));
|
| - Assert.assertFalse(message.hasExtension(oneofBytesExtension));
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -1992,631 +1858,6 @@ public final class TestUtil {
|
| 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}.
|
| - */
|
| - 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(optionalForeignMessageExtensionLite));
|
| - Assert.assertTrue(message.hasExtension(optionalImportMessageExtensionLite ));
|
| -
|
| - 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.hasExtension(optionalNestedEnumExtensionLite ));
|
| - Assert.assertTrue(message.hasExtension(optionalForeignEnumExtensionLite));
|
| - 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(toBytes("116"), message.getExtension(optionalBytesExtensionLite));
|
| -
|
| - 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(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("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(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(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(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(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(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(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(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(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(defaultNestedEnumExtensionLite ));
|
| - Assert.assertTrue(message.hasExtension(defaultForeignEnumExtensionLite));
|
| - 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(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("424", message.getExtension(defaultStringPieceExtensionLite));
|
| - assertEqualsExactType("425", message.getExtension(defaultCordExtensionLite));
|
| -
|
| - Assert.assertTrue(message.hasExtension(oneofBytesExtensionLite));
|
| -
|
| - assertEqualsExactType(toBytes("604"), message.getExtension(oneofBytesExtensionLite));
|
| - }
|
| -
|
| - // -------------------------------------------------------------------
|
| -
|
| - /**
|
| - * 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) {
|
| - // 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(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(optionalPublicImportMessageExtensionLite));
|
| - Assert.assertFalse(message.hasExtension(optionalLazyMessageExtensionLite ));
|
| -
|
| - Assert.assertFalse(message.hasExtension(optionalNestedEnumExtensionLite ));
|
| - Assert.assertFalse(message.hasExtension(optionalForeignEnumExtensionLite));
|
| - 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(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(optionalPublicImportMessageExtensionLite).hasE());
|
| - Assert.assertFalse(message.getExtension(optionalLazyMessageExtensionLite ).hasBb());
|
| -
|
| - 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());
|
| -
|
| - // 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("", 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(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(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(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(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(defaultNestedEnumExtensionLite ));
|
| - Assert.assertFalse(message.hasExtension(defaultForeignEnumExtensionLite));
|
| - 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(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("abc", message.getExtension(defaultStringPieceExtensionLite));
|
| - assertEqualsExactType("123", message.getExtension(defaultCordExtensionLite));
|
| -
|
| - Assert.assertFalse(message.hasExtension(oneofUint32ExtensionLite));
|
| - Assert.assertFalse(message.hasExtension(oneofNestedMessageExtensionLite));
|
| - Assert.assertFalse(message.hasExtension(oneofStringExtensionLite));
|
| - Assert.assertFalse(message.hasExtension(oneofBytesExtensionLite));
|
| - }
|
| -
|
| - // -------------------------------------------------------------------
|
| -
|
| - /**
|
| - * 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) {
|
| - // 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(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(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(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(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(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(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(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(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(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));
|
| - }
|
| -
|
| - // ===================================================================
|
| - // oneof
|
| - public static void setOneof(TestOneof2.Builder message) {
|
| - 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.getFooLazyMessage().hasQuxInt());
|
| -
|
| - Assert.assertTrue(message.hasBarString());
|
| - 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 ());
|
| - }
|
| -
|
| - 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; }
|
| - 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; }
|
| - Assert.assertTrue(count <= 1);
|
| -
|
| - switch (message.getFooCase()) {
|
| - case FOO_INT:
|
| - Assert.assertTrue(message.hasFooInt());
|
| - break;
|
| - case FOO_STRING:
|
| - Assert.assertTrue(message.hasFooString());
|
| - break;
|
| - case FOO_CORD:
|
| - Assert.assertTrue(message.hasFooCord());
|
| - break;
|
| - case FOO_BYTES:
|
| - Assert.assertTrue(message.hasFooBytes());
|
| - break;
|
| - case FOO_ENUM:
|
| - Assert.assertTrue(message.hasFooEnum());
|
| - break;
|
| - case FOO_MESSAGE:
|
| - Assert.assertTrue(message.hasFooMessage());
|
| - break;
|
| - case FOOGROUP:
|
| - Assert.assertTrue(message.hasFooGroup());
|
| - break;
|
| - case FOO_LAZY_MESSAGE:
|
| - Assert.assertTrue(message.hasFooLazyMessage());
|
| - break;
|
| - case FOO_NOT_SET:
|
| - break;
|
| - }
|
| - }
|
| -
|
| // =================================================================
|
|
|
| /**
|
| @@ -2783,8 +2024,8 @@ public final class TestUtil {
|
| return parent.newBuilderForField(field);
|
| } else {
|
| ExtensionRegistry.ExtensionInfo extension =
|
| - extensionRegistry.findImmutableExtensionByNumber(
|
| - field.getContainingType(), field.getNumber());
|
| + extensionRegistry.findExtensionByNumber(field.getContainingType(),
|
| + field.getNumber());
|
| Assert.assertNotNull(extension);
|
| Assert.assertNotNull(extension.defaultInstance);
|
| return extension.defaultInstance.newBuilderForType();
|
| @@ -2946,13 +2187,6 @@ public final class TestUtil {
|
|
|
| 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"));
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -3247,24 +2481,6 @@ public final class TestUtil {
|
|
|
| Assert.assertEquals("424", message.getField(f("default_string_piece")));
|
| Assert.assertEquals("425", message.getField(f("default_cord")));
|
| -
|
| - Assert.assertTrue(message.hasField(f("oneof_bytes")));
|
| - Assert.assertEquals(toBytes("604"), message.getField(f("oneof_bytes")));
|
| -
|
| - if (extensionRegistry == null) {
|
| - Assert.assertFalse(message.hasField(f("oneof_uint32")));
|
| - Assert.assertFalse(message.hasField(f("oneof_nested_message")));
|
| - Assert.assertFalse(message.hasField(f("oneof_string")));
|
| - } else {
|
| - Assert.assertTrue(message.hasField(f("oneof_uint32")));
|
| - 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("603", message.getField(f("oneof_string")));
|
| - }
|
| }
|
|
|
| // -------------------------------------------------------------------
|
| @@ -3442,15 +2658,6 @@ public final class TestUtil {
|
|
|
| Assert.assertEquals("abc", message.getField(f("default_string_piece")));
|
| Assert.assertEquals("123", message.getField(f("default_cord")));
|
| -
|
| - Assert.assertFalse(message.hasField(f("oneof_uint32")));
|
| - Assert.assertFalse(message.hasField(f("oneof_nested_message")));
|
| - Assert.assertFalse(message.hasField(f("oneof_string")));
|
| - Assert.assertFalse(message.hasField(f("oneof_bytes")));
|
| -
|
| - Assert.assertEquals(0, message.getField(f("oneof_uint32")));
|
| - Assert.assertEquals("", message.getField(f("oneof_string")));
|
| - Assert.assertEquals(toBytes(""), message.getField(f("oneof_bytes")));
|
| }
|
|
|
|
|
| @@ -3781,7 +2988,7 @@ 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.");
|
| + "C++ source tree: " + new File(".").getAbsolutePath());
|
| }
|
|
|
| /**
|
| @@ -3812,7 +3019,7 @@ public final class TestUtil {
|
| */
|
| public static ByteString getGoldenMessage() {
|
| if (goldenMessage == null) {
|
| - goldenMessage = readBytesFromFile("golden_message_oneof_implemented");
|
| + goldenMessage = readBytesFromFile("golden_message");
|
| }
|
| return goldenMessage;
|
| }
|
| @@ -3835,17 +3042,21 @@ public final class TestUtil {
|
| }
|
| private static ByteString goldenPackedFieldsMessage = null;
|
|
|
| + public static abstract class HackMessage extends GeneratedMessage {
|
| + public interface MyInterface extends BuilderParent {
|
| + }
|
| + }
|
| /**
|
| * Mock implementation of {@link GeneratedMessage.BuilderParent} for testing.
|
| *
|
| * @author jonp@google.com (Jon Perlow)
|
| */
|
| public static class MockBuilderParent
|
| - implements GeneratedMessage.BuilderParent {
|
| + implements HackMessage.MyInterface {
|
|
|
| private int invalidations;
|
|
|
| - @Override
|
| + //@Override (Java 1.6 override semantics, but we must support 1.5)
|
| public void markDirty() {
|
| invalidations++;
|
| }
|
|
|
Chromium Code Reviews
Issue 2495533002:
third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)
