Merge "Add serialization golden files, fix tests."

63 files changed, 17 insertions, 56 deletions

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser
new file mode 100644
index 0000000..0a15a61
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/io/IOErrorTest.golden.ser
new file mode 100644
index 0000000..cd0e319
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.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/tests/api/java/io/test_array_integers.ser
new file mode 100644
index 0000000..3c5a5e1
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/io/test_array_strings.ser
new file mode 100644
index 0000000..ee2de1c
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/io/testfile
new file mode 100644
index 0000000..bc6c708
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile
@@ -0,0 +1 @@
+This is a test message with Unicode character. \u4e2d\u56fd is China's name in Chinese
diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser
new file mode 100644
index 0000000..255e965
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/EnumTest.golden.0.ser
new file mode 100644
index 0000000..b9a4d75
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/EnumTest.golden.1.ser
new file mode 100644
index 0000000..6fe88ee
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/EnumTest.golden.2.ser
new file mode 100644
index 0000000..8ef8f0b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/EnumTest.golden.3.ser
new file mode 100644
index 0000000..00ac616
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/EnumTest.harmony.ser
new file mode 100644
index 0000000..8ef8f0b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser
new file mode 100644
index 0000000..a94e8bf
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/IllegalStateExceptionTest.golden.ser
new file mode 100644
index 0000000..14b902b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/SecurityExceptionTest.golden.ser
new file mode 100644
index 0000000..76abfd1
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/StringBufferTest.golden.ser
new file mode 100644
index 0000000..861b4ab
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/StringBuilderTest.golden.ser
new file mode 100644
index 0000000..fb54290
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser
new file mode 100644
index 0000000..9197188
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/HttpRetryExceptionTest.golden.ser
new file mode 100644
index 0000000..40413eb
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/Inet4AddressTest.golden.ser
new file mode 100644
index 0000000..bc70d04
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/Inet6AddressTest.golden.0.ser
new file mode 100644
index 0000000..4607c20
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/Inet6AddressTest.golden.1.ser
new file mode 100644
index 0000000..5d55693
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/InetAddressTest.golden.ser
new file mode 100644
index 0000000..bc70d04
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/InetSocketAddressTest.golden.0.ser
new file mode 100644
index 0000000..94fe222
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/InetSocketAddressTest.golden.1.ser
new file mode 100644
index 0000000..1672d5f
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser
new file mode 100644
index 0000000..a6e7680
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser
new file mode 100644
index 0000000..0b5d815
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
new file mode 100644
index 0000000..a85543d
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/ArrayDequeTest.golden.ser
new file mode 100644
index 0000000..794419a
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/BitSetTest.golden.ser
new file mode 100644
index 0000000..1f38d8d
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedCollection.golden.ser
new file mode 100644
index 0000000..eec840e
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedList.golden.ser
new file mode 100644
index 0000000..e9a4122
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser
new file mode 100644
index 0000000..dfa2d43
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedMap.golden.ser
new file mode 100644
index 0000000..13415f6
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedSet.golden.ser
new file mode 100644
index 0000000..ed1f305
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedSortedMap.golden.ser
new file mode 100644
index 0000000..eca8ffa
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_CheckedSortedSet.golden.ser
new file mode 100644
index 0000000..4520ed4
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_asLifoQueue.golden.ser
new file mode 100644
index 0000000..73134df
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/Collections_newSetFromMap.golden.ser
new file mode 100644
index 0000000..88f97e5
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
new file mode 100644
index 0000000..f26eade
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
diff --git a/luni/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
index 76f7668..76f7668 100644
--- a/luni/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
diff --git a/luni/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
index 66040e5..66040e5 100644
--- a/luni/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
new file mode 100644
index 0000000..ff1afb2
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/FormatterClosedExceptionTest.golden.ser
new file mode 100644
index 0000000..02e8dbc
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/HashMapTest.golden.ser
new file mode 100644
index 0000000..529512a
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser
diff --git a/luni/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
index 5d76a32..5d76a32 100644
--- a/luni/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
diff --git a/luni/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser
index 8f27937..8f27937 100644
--- a/luni/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser
new file mode 100644
index 0000000..23db2c6
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser
new file mode 100644
index 0000000..52c8817
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser
new file mode 100644
index 0000000..b14987f
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
new file mode 100644
index 0000000..e822aec
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser
new file mode 100644
index 0000000..8e1a25b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/InputMismatchExceptionTest.golden.ser
new file mode 100644
index 0000000..5b76933
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/LinkedListTest.golden.ser
new file mode 100644
index 0000000..c94e6dc
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser
new file mode 100644
index 0000000..ea6797d
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser
new file mode 100644
index 0000000..19773a5
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/PriorityQueue.golden.ser
new file mode 100644
index 0000000..d716dda
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
diff --git a/luni/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser b/harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser
index a6b04ff..a6b04ff 100644
--- a/luni/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser
new file mode 100644
index 0000000..d43a064
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.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/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser
new file mode 100644
index 0000000..20a59cc
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/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/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser
new file mode 100644
index 0000000..e4b2278
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser
diff --git a/luni/src/test/java/tests/api/java/util/Collections2Test.java b/luni/src/test/java/tests/api/java/util/Collections2Test.java
index 9946404..5a6c2dc 100644
--- a/luni/src/test/java/tests/api/java/util/Collections2Test.java
+++ b/luni/src/test/java/tests/api/java/util/Collections2Test.java
@@ -17,6 +17,10 @@
 
 package tests.api.java.util;
 
+import junit.framework.TestCase;
+import org.apache.harmony.testframework.serialization.SerializationTest;
+import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
+import tests.util.SerializationTester;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,12 +40,6 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Vector;
 
-import org.apache.harmony.testframework.serialization.SerializationTest;
-import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
-
-import junit.framework.TestCase;
-import tests.util.SerializationTester;
-
 public class Collections2Test extends TestCase {
 
     private static final SerializableAssert comparator = new SerializableAssert() {
@@ -416,47 +414,47 @@ public class Collections2Test extends TestCase {
     public void test_checkedCollectionSerializationCompatability() throws Exception {
         Collection<String> c = Collections.emptySet();
         c = Collections.checkedCollection(c, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedCollection.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/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.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedListRandomAccess.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/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.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedList.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/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.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedSet.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/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.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedMap.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/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.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedSortedSet.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/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.assertCompabilityEquals(c, "serialization/java/util/Collections_CheckedSortedMap.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser");
     }
 
     public void test_emptyList() {
diff --git a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
index 8d0c3a4..4f0b90b 100644
--- a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
+++ b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
@@ -22,6 +22,7 @@
 
 package org.apache.harmony.testframework.serialization;
 
+import junit.framework.TestCase;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -38,7 +39,6 @@ import java.security.PermissionCollection;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import junit.framework.TestCase;
 
 /**
  * Framework for serialization testing. Subclasses only need to override
@@ -98,7 +98,6 @@ public abstract class SerializationTest extends TestCase {
      */
 
     public void testGolden() throws Throwable {
-
         verifyGolden(this, getData());
     }
 
@@ -427,7 +426,9 @@ public abstract class SerializationTest extends TestCase {
         path.append(test.getClass().getName().replace('.', File.separatorChar));
         path.append(toAppend);
 
-        InputStream in = SerializationTest.class.getResourceAsStream(path.toString());
+        String pathString = path.toString();
+
+        InputStream in = SerializationTest.class.getResourceAsStream(pathString);
         assertNotNull("Failed to load serialization resource file: " + path, in);
         return getObjectFromStream(in);
     }
diff --git a/support/src/test/java/tests/util/SerializationTester.java b/support/src/test/java/tests/util/SerializationTester.java
index 93bff70..22635e1 100644
--- a/support/src/test/java/tests/util/SerializationTester.java
+++ b/support/src/test/java/tests/util/SerializationTester.java
@@ -32,32 +32,10 @@ import java.net.URL;
  * This class simplifies the serialization test.
  */
 public class SerializationTester {
-
-    /*
-      * --------------------------------------------------------------------
-      * Class variables
-      * --------------------------------------------------------------------
-      */
-
-    // the last deserialized object
-    private static Object lastOutput = null;
-
-    /*
-      * -------------------------------------------------------------------
-      * Constructors
-      * -------------------------------------------------------------------
-      */
-
     private SerializationTester() {
 
     }
 
-    /*
-      * -------------------------------------------------------------------
-      * Methods
-      * -------------------------------------------------------------------
-      */
-
     /**
      * Serialize an object and then deserialize it.
      *
@@ -74,7 +52,6 @@ public class SerializationTester {
         ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
         ObjectInputStream ois = new ObjectInputStream(bis);
         Object outputObject = ois.readObject();
-        lastOutput = outputObject;
         ois.close();
         return outputObject;
     }
@@ -142,8 +119,7 @@ public class SerializationTester {
             throws Exception {
         InputStream input = null;
         ObjectInputStream oinput = null;
-        URL url = SerializationTester.class.getClassLoader().getResource(
-                fileName);
+        URL url = SerializationTester.class.getClassLoader().getResource(fileName);
         if (null == url) {
             // serialization file does not exist, create one in the current dir
             writeObject(obj, new File(fileName).getName());
@@ -213,19 +189,4 @@ public class SerializationTester {
             }
         }
     }
-
-    /**
-     * Gets the last deserialized object.
-     *
-     * @return the last deserialized object
-     */
-    public static Object getLastOutput() {
-        return lastOutput;
-    }
-
-    /*
-      * For test purpose.
-      */
-    public static void main(String[] args) {
-    }
 }