Kill SerializationTester; obsoleted by SerializableTester.

Bug: http://b/5397460
Change-Id: Ic20f4363c8937d5feff0dec89e5de7ccf20f1dac

13 files changed, 189 insertions, 106 deletions

diff --git a/luni/src/test/java/libcore/java/net/InetAddressTest.java b/luni/src/test/java/libcore/java/net/InetAddressTest.java
index 36ea464..5f9b0dd 100644
--- a/luni/src/test/java/libcore/java/net/InetAddressTest.java
+++ b/luni/src/test/java/libcore/java/net/InetAddressTest.java
@@ -16,19 +16,13 @@
 
 package libcore.java.net;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.UnknownHostException;
 import java.util.Collections;
-import tests.util.SerializationTester;
+import libcore.java.util.SerializableTester;
 
 public class InetAddressTest extends junit.framework.TestCase {
     private static final byte[] LOOPBACK6_BYTES = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
@@ -138,11 +132,23 @@ public class InetAddressTest extends junit.framework.TestCase {
 
     public void test_isReachable() throws Exception {
         // http://code.google.com/p/android/issues/detail?id=20203
-        InetAddress addr = SerializationTester.getDeserializedObject(InetAddress.getByName("www.google.com"));
-        addr.isReachable(500);
-        for (NetworkInterface nif : Collections.list(NetworkInterface.getNetworkInterfaces())) {
-            addr.isReachable(nif, 20, 500);
-        }
+        String s = "aced0005737200146a6176612e6e65742e496e6574416464726573732d9b57af"
+                + "9fe3ebdb0200034900076164647265737349000666616d696c794c0008686f737"
+                + "44e616d657400124c6a6176612f6c616e672f537472696e673b78704a7d9d6300"
+                + "00000274000e7777772e676f6f676c652e636f6d";
+        InetAddress inetAddress = InetAddress.getByName("www.google.com");
+        new SerializableTester<InetAddress>(inetAddress, s) {
+            @Override protected void verify(InetAddress deserialized) throws Exception {
+                deserialized.isReachable(500);
+                for (NetworkInterface nif
+                        : Collections.list(NetworkInterface.getNetworkInterfaces())) {
+                    deserialized.isReachable(nif, 20, 500);
+                }
+            }
+            @Override protected boolean equals(InetAddress a, InetAddress b) {
+                return a.getHostName().equals(b.getHostName());
+            }
+        }.test();
     }
 
     public void test_isSiteLocalAddress() throws Exception {
diff --git a/luni/src/test/java/libcore/java/text/AttributedCharacterIteratorAttributeTest.java b/luni/src/test/java/libcore/java/text/AttributedCharacterIteratorAttributeTest.java
index cca00f5..5f18199 100644
--- a/luni/src/test/java/libcore/java/text/AttributedCharacterIteratorAttributeTest.java
+++ b/luni/src/test/java/libcore/java/text/AttributedCharacterIteratorAttributeTest.java
@@ -16,18 +16,13 @@
 
 package libcore.java.text;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.text.AttributedCharacterIterator;
 import java.text.DateFormat;
 import java.text.NumberFormat;
 import junit.framework.TestCase;
-import tests.util.SerializationTester;
+import libcore.java.util.SerializableTester;
 
 /**
  * AttributedCharacterIterator.Attribute is used like the base enum type and
@@ -45,14 +40,14 @@ public final class AttributedCharacterIteratorAttributeTest extends TestCase {
     public void testSerializingSubclass() throws IOException, ClassNotFoundException {
         AttributedCharacterIterator.Attribute a = new CustomAttribute();
         try {
-            SerializationTester.getDeserializedObject(a);
+            SerializableTester.reserialize(a);
             fail();
         } catch (InvalidObjectException expected) {
         }
     }
 
     private void assertSameReserialized(Object o) throws ClassNotFoundException, IOException {
-        assertSame(o, SerializationTester.getDeserializedObject(o));
+        assertSame(o, SerializableTester.reserialize(o));
     }
 
     private static class CustomAttribute extends AttributedCharacterIterator.Attribute {
diff --git a/luni/src/test/java/libcore/java/util/OldCollectionsTest.java b/luni/src/test/java/libcore/java/util/OldCollectionsTest.java
index f54fc56..bd58b12 100644
--- a/luni/src/test/java/libcore/java/util/OldCollectionsTest.java
+++ b/luni/src/test/java/libcore/java/util/OldCollectionsTest.java
@@ -17,8 +17,6 @@
 
 package libcore.java.util;
 
-import junit.framework.TestCase;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,12 +36,10 @@ import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Vector;
-
+import junit.framework.TestCase;
 import org.apache.harmony.testframework.serialization.SerializationTest;
 import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
 
-import tests.util.SerializationTester;
-
 public class OldCollectionsTest extends TestCase {
 
     private static final SerializableAssert comparator = new SerializableAssert() {
@@ -603,44 +599,147 @@ public class OldCollectionsTest extends TestCase {
         SerializationTest.verifySelf(Collections.EMPTY_SET, comparator);
     }
 
-    public void test_checkedCollectionSerializationCompatability() throws Exception {
-        Collection<String> c = Collections.emptySet();
-        c = Collections.checkedCollection(c, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser");
-    }
-    public void test_checkedListRandomAccessSerializationCompatability() throws Exception {
-        List<String> c = new ArrayList<String>();
-        assertTrue(c instanceof RandomAccess);
-        c = Collections.checkedList(c, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser");
-    }
-    public void test_checkedListSerializationCompatability() throws Exception {
-        List<String> c = new LinkedList<String>();
-        assertFalse(c instanceof RandomAccess);
-        c = Collections.checkedList(c, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser");
-    }
-    public void test_checkedSetSerializationCompatability() throws Exception {
-        Set<String> c = new HashSet<String>();
-        assertFalse(c instanceof SortedSet);
-        c = Collections.checkedSet(c, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser");
-    }
-    public void test_checkedMapSerializationCompatability() throws Exception {
-        Map<String, String> c = new HashMap<String, String>();
-        assertFalse(c instanceof SortedMap);
-        c = Collections.checkedMap(c, String.class, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser");
-    }
-    public void test_checkedSortedSetSerializationCompatability() throws Exception {
-        SortedSet<String> c = new TreeSet<String>();
-        c = Collections.checkedSortedSet(c, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser");
-    }
-    public void test_checkedSortedMapSerializationCompatability() throws Exception {
-        SortedMap<String, String> c = new TreeMap<String, String>();
-        c = Collections.checkedSortedMap(c, String.class, String.class);
-        SerializationTester.assertCompatibilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser");
+    public void test_checkedCollectionSerializationCompatibility() throws Exception {
+        String s = "aced0005737200276a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b6564436f6c6c656374696f6e15e96dfd18e6cc6f0200034c00016374001"
+                + "64c6a6176612f7574696c2f436f6c6c656374696f6e3b4c000474797065740011"
+                + "4c6a6176612f6c616e672f436c6173733b5b00167a65726f4c656e677468456c6"
+                + "56d656e7441727261797400135b4c6a6176612f6c616e672f4f626a6563743b78"
+                + "707372001e6a6176612e7574696c2e436f6c6c656374696f6e7324456d7074795"
+                + "3657415f5721db403cb280200007870767200106a6176612e6c616e672e537472"
+                + "696e67a0f0a4387a3bb342020000787070";
+        assertSerialized(Collections.checkedCollection(
+                Collections.<String>emptySet(), String.class), s, false);
+    }
+    public void test_checkedListRandomAccessSerializationCompatibility() throws Exception {
+        String s = "aced00057372002d6a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b656452616e646f6d4163636573734c69737416bc0e55a2d7f2f10200007"
+                + "87200216a6176612e7574696c2e436f6c6c656374696f6e7324436865636b6564"
+                + "4c69737400e7ce7692c45f7c0200014c00046c6973747400104c6a6176612f757"
+                + "4696c2f4c6973743b787200276a6176612e7574696c2e436f6c6c656374696f6e"
+                + "7324436865636b6564436f6c6c656374696f6e15e96dfd18e6cc6f0200034c000"
+                + "1637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c0004747970"
+                + "657400114c6a6176612f6c616e672f436c6173733b5b00167a65726f4c656e677"
+                + "468456c656d656e7441727261797400135b4c6a6176612f6c616e672f4f626a65"
+                + "63743b7870737200136a6176612e7574696c2e41727261794c6973747881d21d9"
+                + "9c7619d03000149000473697a6578700000000077040000000a78767200106a61"
+                + "76612e6c616e672e537472696e67a0f0a4387a3bb34202000078707071007e0009";
+        assertSerialized(Collections.checkedList(new ArrayList<String>(), String.class), s, true);
+    }
+    public void test_checkedListSerializationCompatibility() throws Exception {
+        String s = "aced0005737200216a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b65644c69737400e7ce7692c45f7c0200014c00046c6973747400104c6a6"
+                + "176612f7574696c2f4c6973743b787200276a6176612e7574696c2e436f6c6c65"
+                + "6374696f6e7324436865636b6564436f6c6c656374696f6e15e96dfd18e6cc6f0"
+                + "200034c0001637400164c6a6176612f7574696c2f436f6c6c656374696f6e3b4c"
+                + "0004747970657400114c6a6176612f6c616e672f436c6173733b5b00167a65726"
+                + "f4c656e677468456c656d656e7441727261797400135b4c6a6176612f6c616e67"
+                + "2f4f626a6563743b7870737200146a6176612e7574696c2e4c696e6b65644c697"
+                + "3740c29535d4a608822030000787077040000000078767200106a6176612e6c61"
+                + "6e672e537472696e67a0f0a4387a3bb34202000078707071007e0008";
+        assertSerialized(Collections.checkedList(new LinkedList<String>(), String.class), s, true);
+    }
+    public void test_checkedSetSerializationCompatibility() throws Exception {
+        String s = "aced0005737200206a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b656453657441249ba27ad9ffab020000787200276a6176612e7574696c2"
+                + "e436f6c6c656374696f6e7324436865636b6564436f6c6c656374696f6e15e96d"
+                + "fd18e6cc6f0200034c0001637400164c6a6176612f7574696c2f436f6c6c65637"
+                + "4696f6e3b4c0004747970657400114c6a6176612f6c616e672f436c6173733b5b"
+                + "00167a65726f4c656e677468456c656d656e7441727261797400135b4c6a61766"
+                + "12f6c616e672f4f626a6563743b7870737200116a6176612e7574696c2e486173"
+                + "68536574ba44859596b8b7340300007870770c000000103f40000000000000787"
+                + "67200106a6176612e6c616e672e537472696e67a0f0a4387a3bb3420200007870"
+                + "70";
+        assertSerialized(Collections.checkedSet(new HashSet<String>(), String.class), s, true);
+    }
+    public void test_checkedMapSerializationCompatibility() throws Exception {
+        String s = "aced0005737200206a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b65644d61704fb2bcdf0d1863680200054c00076b6579547970657400114"
+                + "c6a6176612f6c616e672f436c6173733b4c00016d74000f4c6a6176612f757469"
+                + "6c2f4d61703b4c000976616c75655479706571007e00015b00127a65726f4c656"
+                + "e6774684b657941727261797400135b4c6a6176612f6c616e672f4f626a656374"
+                + "3b5b00147a65726f4c656e67746856616c7565417272617971007e00037870767"
+                + "200106a6176612e6c616e672e537472696e67a0f0a4387a3bb342020000787073"
+                + "7200116a6176612e7574696c2e486173684d61700507dac1c31660d1030002460"
+                + "00a6c6f6164466163746f724900097468726573686f6c6478703f400000000000"
+                + "0c770800000010000000007871007e00067070";
+        assertSerialized(Collections.checkedMap(
+                new HashMap<String, String>(), String.class, String.class), s);
+    }
+    public void test_checkedSortedSetSerializationCompatibility() throws Exception {
+        String s = "aced0005737200266a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b6564536f72746564536574163406ba7362eb0f0200014c0002737374001"
+                + "54c6a6176612f7574696c2f536f727465645365743b787200206a6176612e7574"
+                + "696c2e436f6c6c656374696f6e7324436865636b656453657441249ba27ad9ffa"
+                + "b020000787200276a6176612e7574696c2e436f6c6c656374696f6e7324436865"
+                + "636b6564436f6c6c656374696f6e15e96dfd18e6cc6f0200034c0001637400164"
+                + "c6a6176612f7574696c2f436f6c6c656374696f6e3b4c0004747970657400114c"
+                + "6a6176612f6c616e672f436c6173733b5b00167a65726f4c656e677468456c656"
+                + "d656e7441727261797400135b4c6a6176612f6c616e672f4f626a6563743b7870"
+                + "737200116a6176612e7574696c2e54726565536574dd98509395ed875b0300007"
+                + "8707077040000000078767200106a6176612e6c616e672e537472696e67a0f0a4"
+                + "387a3bb34202000078707071007e0009";
+        assertSerialized(Collections.checkedSortedSet(new TreeSet<String>(), String.class), s, true);
+    }
+    public void test_checkedSortedMapSerializationCompatibility() throws Exception {
+        String s = "aced0005737200266a6176612e7574696c2e436f6c6c656374696f6e73244368"
+                + "65636b6564536f727465644d617016332c973afe036e0200014c0002736d74001"
+                + "54c6a6176612f7574696c2f536f727465644d61703b787200206a6176612e7574"
+                + "696c2e436f6c6c656374696f6e7324436865636b65644d61704fb2bcdf0d18636"
+                + "80200054c00076b6579547970657400114c6a6176612f6c616e672f436c617373"
+                + "3b4c00016d74000f4c6a6176612f7574696c2f4d61703b4c000976616c7565547"
+                + "9706571007e00035b00127a65726f4c656e6774684b657941727261797400135b"
+                + "4c6a6176612f6c616e672f4f626a6563743b5b00147a65726f4c656e677468566"
+                + "16c7565417272617971007e00057870767200106a6176612e6c616e672e537472"
+                + "696e67a0f0a4387a3bb3420200007870737200116a6176612e7574696c2e54726"
+                + "5654d61700cc1f63e2d256ae60300014c000a636f6d70617261746f727400164c"
+                + "6a6176612f7574696c2f436f6d70617261746f723b78707077040000000078710"
+                + "07e0008707071007e000b";
+        assertSerialized(Collections.checkedSortedMap(
+                new TreeMap<String, String>(), String.class, String.class), s);
+    }
+
+    private void assertSerialized(Collection<?> collection, String s, final boolean definesEquals) {
+        new SerializableTester<Collection<?>>(collection, s) {
+            @SuppressWarnings("unchecked")
+            @Override protected void verify(Collection<?> deserialized) throws Exception {
+                try {
+                    ((Collection) deserialized).add(Boolean.TRUE);
+                    fail();
+                } catch (ClassCastException expected) {
+                }
+            }
+            @Override protected boolean equals(Collection<?> a, Collection<?> b) {
+                boolean equal = definesEquals
+                        ? a.equals(b)
+                        : Arrays.equals(a.toArray(), b.toArray());
+                return equal
+                        && (a instanceof SortedSet == b instanceof SortedSet)
+                        && (a instanceof RandomAccess == b instanceof RandomAccess);
+            }
+        }.test();
+    }
+
+    private void assertSerialized(Map<?, ?> map, String s) {
+        new SerializableTester<Map<?, ?>>(map, s) {
+            @SuppressWarnings("unchecked")
+            @Override protected void verify(Map<?, ?> deserialized) throws Exception {
+                try {
+                    ((Map) deserialized).put(Boolean.TRUE, "a");
+                    fail();
+                } catch (ClassCastException expected) {
+                }
+                try {
+                    ((Map) deserialized).put("a", Boolean.TRUE);
+                    fail();
+                } catch (ClassCastException expected) {
+                }
+            }
+            @Override protected boolean equals(Map<?, ?> a, Map<?, ?> b) {
+                return super.equals(a, b)
+                        && (a instanceof SortedMap == b instanceof SortedMap);
+            }
+        }.test();
     }
 
     public void test_checkedCollectionLjava_util_CollectionLjava_lang_Class() {
diff --git a/luni/src/test/java/libcore/java/util/OldPriorityQueueTest.java b/luni/src/test/java/libcore/java/util/OldPriorityQueueTest.java
index c2e2a03..fa0b142 100644
--- a/luni/src/test/java/libcore/java/util/OldPriorityQueueTest.java
+++ b/luni/src/test/java/libcore/java/util/OldPriorityQueueTest.java
@@ -21,12 +21,8 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.PriorityQueue;
 import junit.framework.TestCase;
-import tests.util.SerializationTester;
 
 public class OldPriorityQueueTest extends TestCase {
-
-    private static final String SERIALIZATION_FILE_NAME = "/serialization/tests/api/java/util/PriorityQueue.golden.ser";
-
     public void test_ConstructorI() {
         PriorityQueue<Object> queue = new PriorityQueue<Object>(100);
         assertNotNull(queue);
@@ -65,43 +61,22 @@ public class OldPriorityQueueTest extends TestCase {
     }
 
     public void test_Serialization() throws Exception {
-        Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
-        List<Integer> list = Arrays.asList(array);
-        PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(list);
-        PriorityQueue<Integer> destIntegerQueue = SerializationTester.getDeserializedObject(srcIntegerQueue);
-        Arrays.sort(array);
-        for (int i = 0; i < array.length; i++) {
-            assertEquals(array[i], destIntegerQueue.poll());
-        }
-        assertEquals(0, destIntegerQueue.size());
-    }
-
-    public void test_Serialization_casting() throws Exception {
-        Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
-        List<Integer> list = Arrays.asList(array);
-        PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(list);
-        Object dodgy = SerializationTester.getDeserializedObject((Object) srcIntegerQueue);
-        PriorityQueue<String> destStringQueue = (PriorityQueue<String>) dodgy;
-        // will not incur class cast exception.
-        Object o = destStringQueue.peek();
-        Arrays.sort(array);
-        Integer I = (Integer) o;
-        assertEquals(array[0], I);
-    }
-
-    public void test_SerializationCompatibility_cast() throws Exception {
-        Integer[] array = { 2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39 };
-        List<Integer> list = Arrays.asList(array);
+        String s = "aced0005737200176a6176612e7574696c2e5072696f72697479517565756594"
+                + "da30b4fb3f82b103000249000473697a654c000a636f6d70617261746f7274001"
+                + "64c6a6176612f7574696c2f436f6d70617261746f723b78700000000b70770400"
+                + "00000c737200116a6176612e6c616e672e496e746567657212e2a0a4f78187380"
+                + "2000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac"
+                + "951d0b94e08b0200007870fffffff47371007e0003000000027371007e0003000"
+                + "000077371007e00030000000a7371007e0003000000097371007e000300000017"
+                + "7371007e0003000000117371007e00030000045e7371007e00030000002d73710"
+                + "07e0003000000107371007e00030000002778";
         PriorityQueue<Integer> srcIntegerQueue = new PriorityQueue<Integer>(
-                list);
-        PriorityQueue<String> destStringQueue = (PriorityQueue<String>) SerializationTester
-                .readObject(srcIntegerQueue, SERIALIZATION_FILE_NAME);
-
-        // will not incur class cast exception.
-        Object o = destStringQueue.peek();
-        Arrays.sort(array);
-        Integer I = (Integer) o;
-        assertEquals(array[0], I);
+                Arrays.asList(2, 45, 7, -12, 9, 23, 17, 1118, 10, 16, 39));
+        new SerializableTester<PriorityQueue<Integer>>(srcIntegerQueue, s) {
+            @Override protected boolean equals(PriorityQueue<Integer> a, PriorityQueue<Integer> b) {
+                return Arrays.equals(a.toArray(), b.toArray());
+            }
+        }.test();
     }
 
     private static class MockComparatorStringByLength implements
diff --git a/luni/src/test/java/libcore/java/util/SerializableTester.java b/luni/src/test/java/libcore/java/util/SerializableTester.java
index 50b6435..4d05fa8 100644
--- a/luni/src/test/java/libcore/java/util/SerializableTester.java
+++ b/luni/src/test/java/libcore/java/util/SerializableTester.java
@@ -21,11 +21,12 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
 import junit.framework.AssertionFailedError;
 
 public class SerializableTester<T> {
-
     private final String golden;
     private final T value;
 
@@ -47,7 +48,7 @@ public class SerializableTester<T> {
      * Verifies that {@code deserialized} is valid. Implementations of this
      * method may mutate {@code deserialized}.
      */
-    protected void verify(T deserialized) {}
+    protected void verify(T deserialized) throws Exception {}
 
     public void test() {
         try {
@@ -107,6 +108,13 @@ public class SerializableTester<T> {
         return result;
     }
 
+    /**
+     * Returns a serialized-and-deserialized copy of {@code object}.
+     */
+    public static Object reserialize(Object object) throws IOException, ClassNotFoundException {
+        return deserialize(serialize(object));
+    }
+
     public static String serializeHex(Object object) throws IOException {
         return hexEncode(serialize(object));
     }
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser
deleted file mode 100644
index eec840e..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser
deleted file mode 100644
index e9a4122..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
deleted file mode 100644
index dfa2d43..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser
deleted file mode 100644
index 13415f6..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser
deleted file mode 100644
index ed1f305..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser
deleted file mode 100644
index eca8ffa..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser
deleted file mode 100644
index 4520ed4..0000000
--- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser
+++ /dev/null
diff --git a/luni/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser b/luni/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
deleted file mode 100644
index d716dda..0000000
--- a/luni/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
+++ /dev/null