diff options
Diffstat (limited to 'src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java')
| -rw-r--r-- | src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java | 316 |
1 files changed, 142 insertions, 174 deletions
diff --git a/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java b/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java index ca62ae9..66dbacf 100644 --- a/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java +++ b/src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java @@ -1,9 +1,5 @@ package com.jogamp.common.util; -import static com.jogamp.common.net.URIDumpUtil.showURX; -import static com.jogamp.common.net.URIDumpUtil.showURI; -import static com.jogamp.common.net.URIDumpUtil.showURL; - import java.io.File; import java.io.IOException; import java.net.URI; @@ -16,6 +12,7 @@ import jogamp.common.os.PlatformPropsImpl; import org.junit.Assert; import org.junit.Test; +import com.jogamp.common.net.URIDumpUtil; import com.jogamp.common.os.Platform; import com.jogamp.common.util.IOUtil; import com.jogamp.junit.util.JunitTracer; @@ -26,171 +23,155 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestIOUtilURIHandling extends JunitTracer { - static final String[][] uriHttpSArray = new String[][] { - new String[] {"http://localhost/gluegen/build-x86_64/gluegen-rt.jar", - "http://localhost/gluegen/build-x86_64/gluegen-rt.jar"}, - - new String[] {"http://localhost/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "http://localhost/gluegen/build-x86_64%20lala/gluegen-rt.jar" - // "http://localhost/gluegen/build-x86_64 lala/gluegen-rt.jar" - }, - - new String[] {"http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar" - // "http://localhost/gluegen/build-x86_64 öä lala/gluegen-rt.jar" - }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/", - "jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/" }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/", - "jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/" - // "jar:http://localhost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/" - }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, - - new String[] {"jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:http://localhost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" - // "jar:http://localhost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" - }, - /** Not possible, '#' is fragment in URI - new String[] {"jar:http://localhost/gluegen/%23/gluegen-rt.jar!/", - "jar:http://localhost/gluegen/%23/gluegen-rt.jar!/" - // "jar:http://localhost/gluegen/#/gluegen-rt.jar!/" - }, */ + // Bug 908, issues w/ windows file path char: $ ^ ~ # [ ] + + public static final String[][] uriHttpSArray = new String[][] { + new String[] {"http://localhost/gluegen/build-x86_64/gluegen-rt.jar"}, + + new String[] {"http://localhost/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + + new String[] {"http://localhost/gluegen/build-x86_64%20lala/gluegen-rt.jar"}, + + new String[] {"http://localhost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, + + new String[] {"jar:http://localhost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, + + new String[] {"jar:http://localhost/gluegen/R%23/gluegen-rt.jar!/"}, + + new String[] {"jar:http://localhost/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"}, }; - static final String[][] uriFileSArrayUnix = new String[][] { - new String[] {"file:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/gluegen/build-x86_64/gluegen-rt.jar"}, + public static final String[][] uriFileSArrayUnix = new String[][] { + new String[] {"file:/gluegen/build-x86_64/gluegen-rt.jar"}, + + new String[] {"file:/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + + new String[] {"file:/gluegen/build-x86_64%20lala/gluegen-rt.jar"}, - new String[] {"file:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 lala/gluegen-rt.jar"}, + new String[] {"file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"}, - new String[] {"file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar"}, + new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/"}, - new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/", - "jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/" }, + new String[] {"jar:file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"}, - new String[] {"jar:file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/", - "jar:file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/" }, + new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file://filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file://filehost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file://filehost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/gluegen/R%23/gluegen-rt.jar!/"}, - /** Not possible, '#' is fragment in URI - new String[] {"jar:file:/gluegen/%23/gluegen-rt.jar!/", - "jar:file:/gluegen/#/gluegen-rt.jar!/" }, */ + new String[] {"jar:file:/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"}, }; - static final String[][] uriFileSArrayWindows = new String[][] { - new String[] {"file:/C:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64/gluegen-rt.jar"}, + public static final String[][] uriFileSArrayWindows = new String[][] { + new String[] {"file:/C:/gluegen/build-x86_64/gluegen-rt.jar"}, + new String[] {"file:/C%3A/gluegen/build-x86_64/gluegen-rt.jar"}, + + new String[] {"file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + + new String[] {"file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar"}, - new String[] {"file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 lala/gluegen-rt.jar"}, + new String[] {"file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"}, - new String[] {"file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar"}, + new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/", - "jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/" }, + new String[] {"jar:file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/", - "jar:file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/" }, + new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/C:/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, + new String[] {"jar:file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:///C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file:///C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file://filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"}, - new String[] {"jar:file://filehost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class", - "jar:file://filehost/gluegen/build-x86_64 öä lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class" }, + new String[] {"jar:file:/C:/gluegen/R%23/gluegen-rt.jar!/"}, - /** Not possible, '#' is fragment in URI - new String[] {"jar:file:/C:/gluegen/%23/gluegen-rt.jar!/", - "jar:file:/C:/gluegen/#/gluegen-rt.jar!/" }, */ + new String[] {"jar:file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"}, }; - static final String[][] fileSArrayUnix = new String[][] { + public static final String[][] fileSArrayUnix = new String[][] { new String[] {"/gluegen/build-x86_64/gluegen-rt.jar", "file:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/gluegen/build-x86_64/gluegen-rt.jar", "/gluegen/build-x86_64/gluegen-rt.jar"}, + new String[] {"/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "file:/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "/gluegen/"+'\u0394'+"/gluegen-rt.jar"}, + new String[] {"/gluegen/build-x86_64 lala/gluegen-rt.jar", "file:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 lala/gluegen-rt.jar", "/gluegen/build-x86_64 lala/gluegen-rt.jar"}, new String[] {"/gluegen/build-x86_64 öä lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + "file:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "/gluegen/build-x86_64 öä lala/gluegen-rt.jar"}, - /* No support for '#' fragment in URI path ! - new String[] {"/gluegen/#/gluegen-rt.jar", - "file:/gluegen/%23/gluegen-rt.jar", - "file:/gluegen/#/gluegen-rt.jar", - "/gluegen/#/gluegen-rt.jar" }, */ + new String[] {"/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar", + // "file:/gluegen/A%24/B%5E/C%7E/D%23/E%5B/F%5D/gluegen-rt.jar", // goal w/ new Uri class + "file:/gluegen/A$/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar", // current Java URI/URL decoding + "/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar" }, // goal w/ new Uri class + + new String[] {"/gluegen/$/^/~/#/[/]/gluegen-rt.jar", + // "file:/gluegen/%24/%5E/%7E/%23/%5B/%5D/gluegen-rt.jar", + "file:/gluegen/$/%5E/~/%23/%5B/%5D/gluegen-rt.jar", // current Java URI/URL decoding + "/gluegen/$/^/~/#/[/]/gluegen-rt.jar" }, }; - static final String[][] fileSArrayWindows = new String[][] { + public static final String[][] fileSArrayWindows = new String[][] { new String[] {"C:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64/gluegen-rt.jar", "C:\\gluegen\\build-x86_64\\gluegen-rt.jar"}, + new String[] {"C:/gluegen/"+'\u0394'+"/gluegen-rt.jar", + // "file:/C%3A/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar", + "C:\\gluegen\\"+'\u0394'+"\\gluegen-rt.jar"}, + new String[] {"C:/gluegen/build-x86_64 lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 lala/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64%20lala/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64%20lala/gluegen-rt.jar", "C:\\gluegen\\build-x86_64 lala\\gluegen-rt.jar"}, new String[] {"C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "C:\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar"}, new String[] {"C:\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file:/C:/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + // "file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", + "file:/C:/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "C:\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar"}, new String[] {"\\\\filehost\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar", - "file://filehost/gluegen/build-x86_64%20%c3%b6%c3%a4%20lala/gluegen-rt.jar", - "file://filehost/gluegen/build-x86_64 öä lala/gluegen-rt.jar", + "file:////filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar", "\\\\filehost\\gluegen\\build-x86_64 öä lala\\gluegen-rt.jar"}, - /* No support for '#' fragment in URI path ! - new String[] {"C:/gluegen/#/gluegen-rt.jar", - "file:/C:/gluegen/%23/gluegen-rt.jar", - "file:/C:/gluegen/#/gluegen-rt.jar", - "C:\\gluegen\\#\\gluegen-rt.jar" }, */ + new String[] {"C:/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar", + // "file:/C%3A/gluegen/A%24/B%5E/C%7E/D%23/E%5B/F%5D/gluegen-rt.jar", + "file:/C:/gluegen/A$/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar", + "C:\\gluegen\\A$\\B^\\C~\\D#\\E[\\F]\\gluegen-rt.jar" }, + + new String[] {"C:/gluegen/$/^/~/#/[/]/gluegen-rt.jar", + // "file:/C%3A/gluegen/%24/%5E/%7E/%23/%5B/%5D/gluegen-rt.jar", + "file:/C:/gluegen/$/%5E/~/%23/%5B/%5D/gluegen-rt.jar", // current Java URI/URL decoding + "C:\\gluegen\\$\\^\\~\\#\\[\\]\\gluegen-rt.jar" }, }; @Test public void test00BasicCoding() throws IOException, URISyntaxException { final String string = "Hallo Welt öä"; System.err.println("sp1 "+string); - { - final String sp2 = IOUtil.encodeToURI(string); - final String sp3 = IOUtil.encodeToURI(sp2); - System.err.println("sp2 "+sp2); - System.err.println("sp3 "+sp3); - } final File file = new File(string); System.err.println("file "+file); System.err.println("file.path.dec "+file.getPath()); @@ -217,15 +198,17 @@ public class TestIOUtilURIHandling extends JunitTracer { { // Expected !equals due to double-escaping of space %20 -> %25%20 // Double escaping is due to IOUtil.encodeToURI(s2). + @SuppressWarnings("deprecation") final String s3 = IOUtil.encodeToURI(s2); System.err.println("uri2.encoded: "+s3); final URI uri1 = new URI(IOUtil.FILE_SCHEME, null, s3, null); final boolean equalString= uri0.toString().equals(uri1.toString()); final boolean equalPath = uri0.getPath().equals(uri1.getPath()); final boolean equalASCII= uri0.toASCIIString().equals(uri1.toASCIIString()); - System.err.println("uri2.string: "+uri1.toString()+" - "+(equalString?"EQUAL":"NOT_EQUAL")); - System.err.println("uri2.path : "+uri1.getPath()+" - "+(equalPath?"EQUAL":"NOT_EQUAL")); - System.err.println("uri2.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"EQUAL":"NOT_EQUAL")); + System.err.println("uri2.string: "+uri1.toString()+" - "+(equalString?"ERROR EQUAL":"OK NOT_EQUAL")); + System.err.println("uri2.path : "+uri1.getPath()+" - "+(equalPath?"ERROR EQUAL":"OK NOT_EQUAL")); + System.err.println("uri2.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"ERROR EQUAL":"OK NOT_EQUAL")); + ok = !equalString && !equalPath && !equalASCII && ok; } final URI uri1 = new URI(IOUtil.FILE_SCHEME, null, s2, null); final boolean equalString= uri0.toString().equals(uri1.toString()); @@ -266,23 +249,6 @@ public class TestIOUtilURIHandling extends JunitTracer { System.err.println("uri4.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR")); ok = equalString && equalPath && equalASCII && ok; } - { - final String s2 = "http://lala.org/"+string; - final String s2enc = IOUtil.encodeToURI(s2); - System.err.println("uri5.orig: "+s2); - System.err.println("uri5.enc : "+s2enc); - final URI uri1 = new URI(s2enc); - final String rString = "http://lala.org/Hallo%20Welt%20öä"; - final String rPath = "/"+string; - final String rASCII = "http://lala.org/Hallo%20Welt%20%C3%B6%C3%A4"; - final boolean equalString= rString.equals(uri1.toString()); - final boolean equalPath = rPath.equals(uri1.getPath()); - final boolean equalASCII= rASCII.equals(uri1.toASCIIString()); - System.err.println("uri5.string: "+uri1.toString()+" - "+(equalString?"OK":"ERROR")); - System.err.println("uri5.path : "+uri1.getPath()+" - "+(equalPath?"OK":"ERROR")); - System.err.println("uri5.ascii : "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR")); - ok = equalString && equalPath && equalASCII && ok; - } Assert.assertTrue("One or more errors occured see stderr above", ok); } @@ -320,32 +286,39 @@ public class TestIOUtilURIHandling extends JunitTracer { for(int i=0; i<uriSArray.length; i++) { final String[] uriSPair = uriSArray[i]; final String uriSource = uriSPair[0]; - final String uriExpected= uriSPair[1]; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); - ok = testURI2URL(uriSource, uriExpected) && ok; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); + System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+uriSArray.length); + ok = testURI2URL(uriSource) && ok; + System.err.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE "+testname+": "+(i+1)+"/"+uriSArray.length); } Assert.assertTrue("One or more errors occured see stderr above", ok); } - static boolean testURI2URL(final String uriSource, final String uriExpected) throws IOException, URISyntaxException { - showURX(uriSource); + static boolean testURI2URL(final String uriSource) throws IOException, URISyntaxException { final URI uri0 = new URI(uriSource); - System.err.println("uri.string: "+uri0.toString()); - System.err.println("uri.ascii : "+uri0.toASCIIString()); + URIDumpUtil.showURI(uri0); + + final String expected1 = uriSource.toString(); + final String expected2 = expected1.replaceFirst("///", "/"); + System.err.println("expected__s0: "+uriSource); + System.err.println("expected__d1: "+expected1); + System.err.println("expected__d2: "+expected2); - final URL actualUrl = IOUtil.toURL(uri0); - final String actualUrlS = actualUrl.toExternalForm(); - final boolean equalsA = uriExpected.equals(actualUrlS); - System.err.println("actual : "+actualUrlS); - System.err.println("expected___: "+uriExpected+" - "+(equalsA?"OK":"ERROR")); - final boolean ok = equalsA; + final URL actualURL = uri0.toURL(); + final String actualURLStr = actualURL.toString(); + final boolean equalsURLSrc = uriSource.equals(actualURLStr); + final boolean equalsURLDec1 = expected1.equals(actualURLStr); + final boolean equalsURLDec2 = expected2.equals(actualURLStr); + final boolean equalsURL = equalsURLSrc || equalsURLDec1 || equalsURLDec2; + System.err.println("actual : "+actualURLStr+" - "+(equalsURL?"OK":"ERROR")+ + " - equalSrc "+equalsURLSrc+", equalDec1 "+equalsURLDec1+", equalDec2 "+equalsURLDec2); + + final boolean ok = equalsURL; // now test open .. Throwable t = null; URLConnection con = null; try { - con = actualUrl.openConnection(); + con = actualURL.openConnection(); } catch (final Throwable _t) { t = _t; } @@ -365,40 +338,35 @@ public class TestIOUtilURIHandling extends JunitTracer { final String[] uriSPair = uriSArray[i]; final String uriSource = uriSPair[0]; final String uriEncExpected= uriSPair[1]; - final String uriDecExpected= uriSPair[2]; - final String fileExpected= uriSPair[3]; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); - ok = testFile2URI(uriSource, uriEncExpected, uriDecExpected, fileExpected) && ok; - System.err.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "+testname+": "+(i+1)+"/"+uriSArray.length); + final String fileExpected= uriSPair[2]; + System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+uriSArray.length); + ok = testFile2URI(uriSource, uriEncExpected, fileExpected) && ok; + System.err.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE "+testname+": "+(i+1)+"/"+uriSArray.length); } Assert.assertTrue("One or more errors occured see stderr above", ok); } - static boolean testFile2URI(final String fileSource, final String uriEncExpected, final String uriDecExpected, final String fileExpected) throws IOException, URISyntaxException { + static boolean testFile2URI(final String fileSource, final String uriEncExpected, final String fileExpected) throws IOException, URISyntaxException { + System.err.println("fileSource: "+fileSource); final File file = new File(fileSource); - { - final URI uri0 = file.toURI(); - System.err.println("uri0.string: "+uri0.toString()); - System.err.println("uri0.ascii : "+uri0.toASCIIString()); - } - final URI uri1 = IOUtil.toURISimple(file); - System.err.println("uri1.string: "+uri1.toString()); - System.err.println("uri1.ascii : "+uri1.toASCIIString()); - showURI(uri1); - showURL(uri1.toURL()); - - final URL actualUrl = IOUtil.toURL(uri1); - final String actualUrlS = actualUrl.toExternalForm(); + System.err.println("file: "+file.getAbsolutePath()); + + final URI uri0 = IOUtil.toURISimple(file); + final URI uri1 = file.toURI(); + URIDumpUtil.showURI(uri0); + URIDumpUtil.showURI(uri1); + + final URL actualUrl = uri1.toURL(); final String actualFileS = IOUtil.decodeURIIfFilePath(uri1); final boolean equalsFilePath = fileExpected.equals(actualFileS); - System.err.println("actual_______uri : "+actualUrlS); - System.err.println("actual___file-path: "+actualFileS); - System.err.println("expected_path: "+fileExpected+" - "+(equalsFilePath?"OK":"ERROR")); - final boolean equalsDecUri = uriDecExpected.equals(actualUrlS); - System.err.println("actual_______uri: "+actualUrlS); - System.err.println("expected__encUri: "+uriEncExpected); - System.err.println("expected__decUri: "+uriDecExpected+" - "+(equalsDecUri?"OK":"ERROR")); - final boolean ok = equalsDecUri && equalsFilePath; + System.err.println("expected_path: "+fileExpected); + System.err.println("actual___file-path: "+actualFileS+" - "+(equalsFilePath?"OK":"ERROR")); + final boolean equalsEncUri = uriEncExpected.equals(uri1.toString()); + System.err.println("expected__encUri: "+uriEncExpected); + System.err.println("actual_______Uri: "+uri1.toString()+" - "+(equalsEncUri?"OK":"ERROR")); + final boolean ok = equalsEncUri && equalsFilePath; + + System.err.println("actual_______URL: "+actualUrl.toExternalForm()); // now test open .. Throwable t = null; |