| Revision | 87b08d11215c389f9787ea36b8ff761c9280589f (tree) |
|---|---|
| Time | 2009-11-24 02:18:40 |
| Author | Jean-Baptiste Queru <jbq@goog...> |
| Commiter | Jean-Baptiste Queru |
merge from donut
libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassLoaderTest.java (diff) libcore/luni/src/test/java/tests/api/java/io/FileTest.java (diff)| @@ -45,6 +45,7 @@ import java.util.NoSuchElementException; | ||
| 45 | 45 | @TestTargetClass(ClassLoader.class) |
| 46 | 46 | public class ClassLoaderTest extends TestCase { |
| 47 | 47 | |
| 48 | + private static final String SYSTEM_RESOURCE_PATH = "META-INF/MANIFEST.MF"; | |
| 48 | 49 | public static volatile int flag; |
| 49 | 50 | |
| 50 | 51 | @TestTargetNew( |
| @@ -605,7 +606,7 @@ public class ClassLoaderTest extends TestCase { | ||
| 605 | 606 | // java.lang.ClassLoader.getSystemClassLoader() |
| 606 | 607 | ClassLoader cl = ClassLoader.getSystemClassLoader(); |
| 607 | 608 | |
| 608 | - java.io.InputStream is = cl.getResourceAsStream("classes.dex"); | |
| 609 | + java.io.InputStream is = cl.getResourceAsStream(SYSTEM_RESOURCE_PATH); | |
| 609 | 610 | assertNotNull("Failed to find resource from system classpath", is); |
| 610 | 611 | try { |
| 611 | 612 | is.close(); |
| @@ -674,8 +675,8 @@ public class ClassLoaderTest extends TestCase { | ||
| 674 | 675 | //assertNotNull("Failed to find resource: " + classResource, |
| 675 | 676 | // ClassLoader.getSystemResource(classResource)); |
| 676 | 677 | |
| 677 | - URL url = getClass().getClassLoader().getSystemResource("classes.dex"); | |
| 678 | - assertNotNull("Failed to find resource: classes.dex", url); | |
| 678 | + URL url = getClass().getClassLoader().getSystemResource(SYSTEM_RESOURCE_PATH); | |
| 679 | + assertNotNull(String.format("Failed to find resource: %s", SYSTEM_RESOURCE_PATH), url); | |
| 679 | 680 | java.io.InputStream is = url.openStream(); |
| 680 | 681 | |
| 681 | 682 | assertTrue("System resource not found", is.available() > 0); |
| @@ -701,8 +702,8 @@ public class ClassLoaderTest extends TestCase { | ||
| 701 | 702 | // ClassLoader.getSystemResourceAsStream(classResource)); |
| 702 | 703 | |
| 703 | 704 | java.io.InputStream is = getClass().getClassLoader() |
| 704 | - .getSystemResourceAsStream("classes.dex"); | |
| 705 | - assertNotNull("Failed to find resource: classes.dex", is); | |
| 705 | + .getSystemResourceAsStream(SYSTEM_RESOURCE_PATH); | |
| 706 | + assertNotNull(String.format("Failed to find resource: %s", SYSTEM_RESOURCE_PATH), is); | |
| 706 | 707 | |
| 707 | 708 | assertTrue("System resource not found", is.available() > 0); |
| 708 | 709 |
| @@ -720,7 +721,7 @@ public class ClassLoaderTest extends TestCase { | ||
| 720 | 721 | + "that is sure to exist.") |
| 721 | 722 | public void test_getSystemResources() { |
| 722 | 723 | |
| 723 | - String textResource = "classes.dex"; | |
| 724 | + String textResource = SYSTEM_RESOURCE_PATH; | |
| 724 | 725 | |
| 725 | 726 | try { |
| 726 | 727 | Enumeration<URL> urls = ClassLoader.getSystemResources(textResource); |
| @@ -692,7 +692,6 @@ public class FileTest extends junit.framework.TestCase { | ||
| 692 | 692 | method = "delete", |
| 693 | 693 | args = {} |
| 694 | 694 | ) |
| 695 | - @KnownFailure("Non empty directories are deleted on Android.") | |
| 696 | 695 | public void test_delete() { |
| 697 | 696 | // Test for method boolean java.io.File.delete() |
| 698 | 697 | try { |
Android-x86
Fork