diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-21 16:33:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-21 16:33:21 +0000 |
| commit | 820b07350c07dd54c4d32e5ad979524707416a67 (patch) | |
| tree | 40171ec82aa814339ccbe707d5ba8f4ce13f2892 | |
| parent | 5f99aecb536c69da78e2b6623846cd5d56b277d7 (diff) | |
| parent | b2dc38f35ead619dd01d53dafee018266301bff5 (diff) | |
| download | libcore-820b07350c07dd54c4d32e5ad979524707416a67.zip libcore-820b07350c07dd54c4d32e5ad979524707416a67.tar.gz libcore-820b07350c07dd54c4d32e5ad979524707416a67.tar.bz2 | |
Merge "Fixed broken EnumTest"
11 files changed, 1 insertions, 1 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java index 558929d..3f2754c 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java @@ -207,7 +207,7 @@ public class EnumTest extends TestCase { public void test_compatibilitySerialization_inClass_Complex_Harmony() throws Exception { // TODO migrate to the new testing framework assertTrue(SerializationTester.assertCompabilityEquals(new MockEnum2(), - "serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.harmony.ser")); + "serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser")); } /** diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser Binary files differindex b9a4d75..4168dd9 100644 --- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/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/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser Binary files differindex 6fe88ee..992d528 100644 --- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/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/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser Binary files differindex 8ef8f0b..8ce26ac 100644 --- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/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/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser Binary files differindex 00ac616..93bc905 100644 --- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/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/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser Binary files differindex 8ef8f0b..8ce26ac 100644 --- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser +++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.0.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.0.ser Binary files differdeleted file mode 100644 index b9a4d75..0000000 --- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.0.ser +++ /dev/null diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.1.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.1.ser Binary files differdeleted file mode 100644 index 6fe88ee..0000000 --- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.1.ser +++ /dev/null diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.2.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.2.ser Binary files differdeleted file mode 100644 index 8ef8f0b..0000000 --- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.2.ser +++ /dev/null diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.3.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.3.ser Binary files differdeleted file mode 100644 index 00ac616..0000000 --- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.golden.3.ser +++ /dev/null diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.harmony.ser b/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.harmony.ser Binary files differdeleted file mode 100644 index 8ef8f0b..0000000 --- a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/lang/EnumTest.harmony.ser +++ /dev/null |