diff options
| author | Brian Duff <bduff@google.com> | 2015-01-09 22:31:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-09 22:31:43 +0000 |
| commit | c7c25812eb19d080087b71e08bfe35aff9f21433 (patch) | |
| tree | 55c02e666ed6f56c3ac9c337cd63e3ac2d6d66e8 /java | |
| parent | 25794277fd65aabe917fc6c01b3162e243740634 (diff) | |
| parent | 5537d6fe4af105eb769bacc530e8d5d9e0b027cb (diff) | |
| download | external_protobuf-c7c25812eb19d080087b71e08bfe35aff9f21433.zip external_protobuf-c7c25812eb19d080087b71e08bfe35aff9f21433.tar.gz external_protobuf-c7c25812eb19d080087b71e08bfe35aff9f21433.tar.bz2 | |
Merge "When no clear() is generated, still initialize fields."
Diffstat (limited to 'java')
| -rw-r--r-- | java/pom.xml | 6 | ||||
| -rw-r--r-- | java/src/test/java/com/google/protobuf/NanoTest.java | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/java/pom.xml b/java/pom.xml index a673f2d..6c7191c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -211,6 +211,12 @@ <arg value="--proto_path=src/test/java" /> <arg value="../src/google/protobuf/unittest_reference_types_nano.proto" /> </exec> + <exec executable="../src/protoc"> + <arg value="--javanano_out=optional_field_style=reftypes_compat_mode,generate_equals=true,java_outer_classname=google/protobuf/unittest_reference_types_nano.proto|NanoReferenceTypesCompat:target/generated-test-sources" /> + <arg value="--proto_path=../src" /> + <arg value="--proto_path=src/test/java" /> + <arg value="../src/google/protobuf/unittest_reference_types_nano.proto" /> + </exec> </tasks> <testSourceRoot>target/generated-test-sources</testSourceRoot> <!--testSourceRoot>target/generated-test-sources/opt-space</testSourceRoot--> diff --git a/java/src/test/java/com/google/protobuf/NanoTest.java b/java/src/test/java/com/google/protobuf/NanoTest.java index 8d364c1..4c3b416 100644 --- a/java/src/test/java/com/google/protobuf/NanoTest.java +++ b/java/src/test/java/com/google/protobuf/NanoTest.java @@ -49,6 +49,7 @@ import com.google.protobuf.nano.NanoHasOuterClass.TestAllTypesNanoHas; import com.google.protobuf.nano.NanoOuterClass; import com.google.protobuf.nano.NanoOuterClass.TestAllTypesNano; import com.google.protobuf.nano.NanoReferenceTypes; +import com.google.protobuf.nano.NanoReferenceTypesCompat; import com.google.protobuf.nano.NanoRepeatedPackables; import com.google.protobuf.nano.PackedExtensions; import com.google.protobuf.nano.RepeatedExtensions; @@ -3793,6 +3794,11 @@ public class NanoTest extends TestCase { assertTrue(Arrays.equals(new boolean[] {false, true, false, true}, nonPacked.bools)); } + public void testRepeatedFieldInitializedInReftypesCompatMode() { + NanoReferenceTypesCompat.TestAllTypesNano proto = new NanoReferenceTypesCompat.TestAllTypesNano(); + assertNotNull(proto.repeatedString); + } + private void assertRepeatedPackablesEqual( NanoRepeatedPackables.NonPacked nonPacked, NanoRepeatedPackables.Packed packed) { // Not using MessageNano.equals() -- that belongs to a separate test. |