diff options
| author | Max Cai <maxtroy@google.com> | 2014-07-15 15:15:28 +0100 |
|---|---|---|
| committer | Max Cai <maxtroy@google.com> | 2014-07-15 15:38:04 +0100 |
| commit | 11f883e185a2ea6fd6d0b19520e9f0f004e90e5c (patch) | |
| tree | 75205c505646c352b6cd21a73869d8f1d0dc3572 /java/src/test/java/com/google/protobuf/NanoTest.java | |
| parent | daf638399bd42122306786e8062f392ddace4363 (diff) | |
| download | external_protobuf-11f883e185a2ea6fd6d0b19520e9f0f004e90e5c.zip external_protobuf-11f883e185a2ea6fd6d0b19520e9f0f004e90e5c.tar.gz external_protobuf-11f883e185a2ea6fd6d0b19520e9f0f004e90e5c.tar.bz2 | |
Fix access around unknownFieldData.
Instead of publishing its class I chose to encapsulate the troublesome
references in equals()/hashCode() in the generated code into superclass
methods in ExtendableMessageNano.
Changed a couple of java packages in the test suite to catch this issue
easier in the future.
Change-Id: I43f88411f63bb6f3ffc8d63361f2f77bebf6220a
Diffstat (limited to 'java/src/test/java/com/google/protobuf/NanoTest.java')
| -rw-r--r-- | java/src/test/java/com/google/protobuf/NanoTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/test/java/com/google/protobuf/NanoTest.java b/java/src/test/java/com/google/protobuf/NanoTest.java index 93c9dc4..e831c52 100644 --- a/java/src/test/java/com/google/protobuf/NanoTest.java +++ b/java/src/test/java/com/google/protobuf/NanoTest.java @@ -35,9 +35,6 @@ import com.google.protobuf.nano.EnumClassNanoMultiple; import com.google.protobuf.nano.EnumClassNanos; import com.google.protobuf.nano.EnumValidity; import com.google.protobuf.nano.EnumValidityAccessors; -import com.google.protobuf.nano.Extensions; -import com.google.protobuf.nano.Extensions.AnotherMessage; -import com.google.protobuf.nano.Extensions.MessageWithGroup; import com.google.protobuf.nano.FileScopeEnumMultiple; import com.google.protobuf.nano.FileScopeEnumRefNano; import com.google.protobuf.nano.InternalNano; @@ -57,11 +54,14 @@ import com.google.protobuf.nano.PackedExtensions; import com.google.protobuf.nano.RepeatedExtensions; import com.google.protobuf.nano.SingularExtensions; import com.google.protobuf.nano.TestRepeatedMergeNano; -import com.google.protobuf.nano.UnittestImportNano; import com.google.protobuf.nano.UnittestMultipleNano; import com.google.protobuf.nano.UnittestRecursiveNano.RecursiveMessageNano; import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano; import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano; +import com.google.protobuf.nano.testext.Extensions; +import com.google.protobuf.nano.testext.Extensions.AnotherMessage; +import com.google.protobuf.nano.testext.Extensions.MessageWithGroup; +import com.google.protobuf.nano.testimport.UnittestImportNano; import junit.framework.TestCase; |