summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-08-18 13:55:33 -0400
committerJesse Wilson <jessewilson@google.com>2011-08-18 13:55:33 -0400
commit51a2a0fe51532ca5f3ce872295e6de253eac07bf (patch)
treeff2f12563eca20d847b8bce660ab90660861270d /luni
parent701cca146e1ac80f3fa58c53223aa7a462078c7c (diff)
downloadlibcore-51a2a0fe51532ca5f3ce872295e6de253eac07bf.zip
libcore-51a2a0fe51532ca5f3ce872295e6de253eac07bf.tar.gz
libcore-51a2a0fe51532ca5f3ce872295e6de253eac07bf.tar.bz2
Permit file:///foo or file:/foo
Change-Id: Ib1d256a1aa6cb74e09f183263bb0f3e40b103e4f
Diffstat (limited to 'luni')
-rw-r--r--luni/src/test/java/libcore/java/net/OldJarURLConnectionTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/luni/src/test/java/libcore/java/net/OldJarURLConnectionTest.java b/luni/src/test/java/libcore/java/net/OldJarURLConnectionTest.java
index 2954552..48e82c0 100644
--- a/luni/src/test/java/libcore/java/net/OldJarURLConnectionTest.java
+++ b/luni/src/test/java/libcore/java/net/OldJarURLConnectionTest.java
@@ -257,9 +257,11 @@ public class OldJarURLConnectionTest extends junit.framework.TestCase {
juc = (JarURLConnection) u.openConnection();
assertTrue("Returned incorrect file URL", juc.getJarFileURL().equals(
fileURL));
- // Regression test for harmony-3053
+
URL url = new URL("jar:file:///bar.jar!/foo.jar!/Bugs/HelloWorld.class");
- assertEquals("file:/bar.jar",((JarURLConnection)url.openConnection()).getJarFileURL().toString());
+ String jarFileUrl = ((JarURLConnection) url.openConnection()).getJarFileURL().toString();
+ // The RI omits the empty authority "//" but the RFC doesn't say this is necessary
+ assertTrue(jarFileUrl.equals("file:///bar.jar") || jarFileUrl.equals("file:/bar.jar"));
}
public void test_getMainAttributes() throws Exception {