diff options
7 files changed, 81 insertions, 8 deletions
diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt index 53075ec..e244157 100644 --- a/expectations/brokentests.txt +++ b/expectations/brokentests.txt @@ -850,6 +850,41 @@ ] }, { + names: [ + "org.apache.harmony.luni.tests.java.io.FileTest#test_equalsLjava_lang_Object", + "tests.api.java.io.FileTest#test_equalsLjava_lang_Object" + ], + result: EXEC_FAILED, + substring: "File system is case insensitive" +}, +{ + description: "We don't special case as much for new File(emptyString, emptyString)", + name: "org.apache.harmony.luni.tests.java.io.FileTest#test_getPath", + result: EXEC_FAILED, + substring: "expected:</> but was:<>" +}, +{ + description: "Can't test read-only when running as root!", + names: [ + "org.apache.harmony.luni.tests.java.io.FileTest#test_setReadOnly", + "tests.api.java.io.FileTest#test_setReadOnly" + ], + result: EXEC_FAILED +}, +{ + description: "These tests want to load class files on a dalvikvm", + names: [ + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_defineClass_defaultDomain", + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_getResourceAsStreamLjava_lang_String", + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_getResourceAsStream_withSharpChar", + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_getResourceLjava_lang_String", + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_getSystemClassLoader", + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_getSystemResourceLjava_lang_String", + "org.apache.harmony.luni.tests.java.lang.ClassLoaderTest#test_loadClass_concurrentLoad" + ], + result: EXEC_FAILED +}, +{ description: "Some tests (ExcludedProxyTest) connect to a public webserver to check that the HTTP client works", result: EXEC_FAILED, failure: "connect to the Internet", diff --git a/expectations/gingerbread.txt b/expectations/gingerbread.txt new file mode 100644 index 0000000..8065790 --- /dev/null +++ b/expectations/gingerbread.txt @@ -0,0 +1,31 @@ +[ +{ + description: "absolutePath should have been transient in gingerbread", + names: [ + "org.apache.harmony.luni.tests.java.io.FileTest#test_objectStreamClass_getFields", + "tests.api.java.io.FileTest#test_objectStreamClass_getFields" + ], + result: EXEC_FAILED, + substring: "expected:<1> but was:<2>" +}, +{ + description: "the test resources don't include the required classes.dex", + name: "tests.api.java.io.ObjectStreamClassTest#test_getSerialVersionUID_classloader", + result: EXEC_FAILED, + substring: "Parent ClassLoader may not be null" +}, +{ + description: "Random access file truncation doesn't seek properly in gingerbread", + name: "tests.api.java.io.RandomAccessFileTest#test_setLengthJ", + result: EXEC_FAILED, + substring: "File pointer not moved to the end of the truncated file." +}, +{ + description: "ResourceBundle returned the wrong locale in gingerbread", + names: [ + "tests.api.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_Locale", + "tests.api.java.util.ResourceBundleTest#test_getLocale" + ], + result: EXEC_FAILED +} +]
\ No newline at end of file diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index 5b806ab..24b8e13 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -3,6 +3,11 @@ */ [ { + description: "Scanner needs to configure transparent and anchoring bounds in findWithinHorizon()", + name: "tests.api.java.util.ScannerTest#test_findWithinHorizon_LPatternI", + bug: 3037194 +}, +{ description: "RandomAccessFile missing finalizer", name: "libcore.java.io.RandomAccessFileTest#testRandomAccessFileHasCleanupFinalizer", bug: 3015023 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); } /** |