Move tests from tests/api to harmony-tests. (Take 2)

This reverts commit d5e281743e55e1daa297fd8043b2d9b6e8e1bed2.

The makefile issue that caused the original build break
has been resolved.

67 files changed, 0 insertions, 0 deletions

diff --git a/harmony-tests/src/test/resources/resources/dex1.bytes b/harmony-tests/src/test/resources/resources/dex1.bytes
new file mode 100644
index 0000000..dfff949
--- /dev/null
+++ b/harmony-tests/src/test/resources/resources/dex1.bytes
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser
index 0a15a61..0a15a61 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser
index cd0e319..cd0e319 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser
new file mode 100644
index 0000000..b93df24
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser
new file mode 100644
index 0000000..a333f4e
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser
new file mode 100644
index 0000000..7f93135
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser
new file mode 100644
index 0000000..c579d14
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser
new file mode 100644
index 0000000..48618eb
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_integers.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser
index 3c5a5e1..3c5a5e1 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_integers.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_strings.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser
index ee2de1c..ee2de1c 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_strings.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile
index bc6c708..bc6c708 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser
index 255e965..255e965 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser
index b9a4d75..b9a4d75 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.0.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser
index 6fe88ee..6fe88ee 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.1.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.2.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser
index 8ef8f0b..8ef8f0b 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.2.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.3.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser
index 00ac616..00ac616 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.3.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.harmony.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser
index 8ef8f0b..8ef8f0b 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.harmony.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser
index a94e8bf..a94e8bf 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalStateExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser
index 14b902b..14b902b 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalStateExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/SecurityExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser
index 76abfd1..76abfd1 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/SecurityExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBufferTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser
index 861b4ab..861b4ab 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBufferTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBuilderTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser
index fb54290..fb54290 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBuilderTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser
index 9197188..9197188 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/HttpRetryExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser
index 40413eb..40413eb 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/HttpRetryExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet4AddressTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser
index bc70d04..bc70d04 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet4AddressTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser
index 4607c20..4607c20 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.0.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser
index 5d55693..5d55693 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.1.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetAddressTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser
index bc70d04..bc70d04 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetAddressTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser
index 94fe222..94fe222 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.0.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser
index 1672d5f..1672d5f 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.1.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser
index a6e7680..a6e7680 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser
index 0b5d815..0b5d815 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
index a85543d..a85543d 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/ArrayDequeTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser
index 794419a..794419a 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/ArrayDequeTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser
index 1f38d8d..1f38d8d 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser
index eec840e..eec840e 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedList.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser
index e9a4122..e9a4122 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedList.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
index dfa2d43..dfa2d43 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedMap.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser
index 13415f6..13415f6 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedMap.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSet.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser
index ed1f305..ed1f305 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSet.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser
index eca8ffa..eca8ffa 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser
index 4520ed4..4520ed4 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_asLifoQueue.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser
index 73134df..73134df 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_asLifoQueue.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_newSetFromMap.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser
index 88f97e5..88f97e5 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_newSetFromMap.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
index f26eade..f26eade 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
index 76f7668..76f7668 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
index 66040e5..66040e5 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
index ff1afb2..ff1afb2 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatterClosedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser
index 02e8dbc..02e8dbc 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatterClosedExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser
index 529512a..529512a 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser
index 5d76a32..5d76a32 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser
index 8f27937..8f27937 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser
index 23db2c6..23db2c6 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser
index 52c8817..52c8817 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser
index b14987f..b14987f 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
index e822aec..e822aec 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser
index 8e1a25b..8e1a25b 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/InputMismatchExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser
index 5b76933..5b76933 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/InputMismatchExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/LinkedListTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser
index c94e6dc..c94e6dc 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/LinkedListTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser
index ea6797d..ea6797d 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser
index 19773a5..19773a5 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser
index d716dda..d716dda 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser
index a6b04ff..a6b04ff 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser
index d43a064..d43a064 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser
new file mode 100644
index 0000000..9947a3a
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser
index 20a59cc..20a59cc 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser
index e4b2278..e4b2278 100644
--- a/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser