summaryrefslogtreecommitdiffstats
path: root/java/src/test/java/com/google/protobuf
diff options
context:
space:
mode:
authorBrian Duff <bduff@google.com>2015-03-20 23:15:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 23:15:14 +0000
commit6bcc95f7df592ad6ca91527a294503afc27dcf6c (patch)
treec64035000994d02a6560453eaa40880bf89788d4 /java/src/test/java/com/google/protobuf
parentbe3a18d1f871540519ac73efb4f420aef24a5be5 (diff)
parent3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088 (diff)
downloadexternal_protobuf-6bcc95f7df592ad6ca91527a294503afc27dcf6c.zip
external_protobuf-6bcc95f7df592ad6ca91527a294503afc27dcf6c.tar.gz
external_protobuf-6bcc95f7df592ad6ca91527a294503afc27dcf6c.tar.bz2
am 3f1b763a: am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."
* commit '3f1b763ab7bc54eeaff1d1c8ed707746bfe8a088': Add MessageNano.messageNanoEquals().
Diffstat (limited to 'java/src/test/java/com/google/protobuf')
-rw-r--r--java/src/test/java/com/google/protobuf/NanoTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/test/java/com/google/protobuf/NanoTest.java b/java/src/test/java/com/google/protobuf/NanoTest.java
index 6334e4b..6b69aa7 100644
--- a/java/src/test/java/com/google/protobuf/NanoTest.java
+++ b/java/src/test/java/com/google/protobuf/NanoTest.java
@@ -3212,6 +3212,9 @@ public class NanoTest extends TestCase {
TestAllTypesNano a = createMessageForHashCodeEqualsTest();
TestAllTypesNano aEquivalent = createMessageForHashCodeEqualsTest();
+ assertTrue(MessageNano.messageNanoEquals(a, aEquivalent));
+ assertFalse(MessageNano.messageNanoEquals(a, new TestAllTypesNano()));
+
// Null and empty array for repeated fields equality:
TestAllTypesNano b = createMessageForHashCodeEqualsTest();
b.repeatedBool = null;