diff options
Diffstat (limited to 'luni')
4 files changed, 10 insertions, 8 deletions
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java index 642c8dd..e4e8046 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/InputStreamReaderTest.java @@ -407,7 +407,7 @@ public class InputStreamReaderTest extends TestCase { public void test_read_specialCharset() throws IOException { reader.close(); in = this.getClass().getClassLoader().getResourceAsStream( - "org/apache/harmony/luni/tests/java/io/testfile-utf8.txt"); + "tests/api/java/io/testfile-utf8.txt"); reader = new InputStreamReader(in, "utf-8"); int c; StringBuffer sb = new StringBuffer(); @@ -420,7 +420,7 @@ public class InputStreamReaderTest extends TestCase { sb.setLength(0); reader.close(); in = this.getClass().getClassLoader().getResourceAsStream( - "org/apache/harmony/luni/tests/java/io/testfile.txt"); + "tests/api/java/io/testfile.txt"); try { reader = new InputStreamReader(in, "gb18030"); } catch (UnsupportedEncodingException e) { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java index c5e5688..1023dcc 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/SystemTest.java @@ -672,8 +672,9 @@ public class SystemTest extends junit.framework.TestCase { } try { - map.remove(null); - fail("Should throw UnsupportedOperationException."); + if (map.remove(null) != null) { + fail("Should no-op or throw UnsupportedOperationException."); + } } catch (UnsupportedOperationException e) { // expected } diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java b/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java index 2457b77..bc2e24e 100644 --- a/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java +++ b/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java @@ -120,13 +120,13 @@ public class ObjectStreamClassTest extends TestCase { public void test_getSerialVersionUID_inner_private_class() { ObjectStreamClass osc1 = ObjectStreamClass.lookup(SyntheticTest.class); assertEquals("SyntheticTest unexpected UID: " - + osc1.getSerialVersionUID(), -7784078941584535183L, osc1 + + osc1.getSerialVersionUID(), 4405770616475181267L, osc1 .getSerialVersionUID()); ObjectStreamClass osc2 = ObjectStreamClass .lookup(SyntheticTest.X.class); assertEquals("SyntheticTest.X unexpected UID: " - + osc2.getSerialVersionUID(), -7703000075736397332L, osc2 + + osc2.getSerialVersionUID(), 676101599466902119L, osc2 .getSerialVersionUID()); } @@ -231,7 +231,7 @@ public class ObjectStreamClassTest extends TestCase { } } - + /** * @tests java.io.ObjectStreamClass#lookupAny(java.lang.Class) * @since 1.6 diff --git a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java index 55d5945..d44be4b 100644 --- a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java +++ b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java @@ -785,7 +785,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"), new Locale("fr", "CA")); minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek(); - assertEquals(1, minimalDaysInFirstWeek); + // Android's locale data says 4 but the RI says 1 + assertTrue(minimalDaysInFirstWeek == 4 || minimalDaysInFirstWeek == 1); } /** |