commit 9c7ca70621ea691621c8976c3d6bf5c2b03e3ea4
author Yi Kong <yikong@google.com> Fri Dec 11 18:03:13 2015 +0000
committer Yi Kong <yikong@google.com> Tue Dec 15 12:38:53 2015 +0000
tree b972a4d8025150d9dfe5d6dd756d67242a85676d
parent 66857ee4174c608516f1301378123fd04f4e9897

Fix testSerializationCompatibility test

We use different Inet6Address scheme from OpenJDK, "family" field uses
different and partially overlapping values. Deserialization is not
supported. Test modified to expect an InvalidObjectException to be
thrown when deserializing an OpenJDK Inet6Address object.

Bug: 25997167
Change-Id: If86ef44cb17e2da65a78738c9e2889721ea7bb86

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
index 77b8405..785a303 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
@@ -17,6 +17,7 @@
 
 package org.apache.harmony.tests.java.net;
 
+import java.io.InvalidObjectException;
 import java.io.Serializable;
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -911,6 +912,12 @@
                 // null interface name
                 InetAddress.getByAddress(localv6) };
 
-        SerializationTest.verifyGolden(this, addresses, COMPARATOR);
+        try {
+            SerializationTest.verifyGolden(this, addresses, COMPARATOR);
+            fail();
+        } catch (InvalidObjectException expected) {
+            // We use different Inet6Address scheme from OpenJDK,
+            // deserialization is not supported and should throw an exception.
+        }
     }
 }