summaryrefslogtreecommitdiffstats
path: root/src/junit/com/jogamp/common/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/junit/com/jogamp/common/net')
-rw-r--r--src/junit/com/jogamp/common/net/AssetURLConnectionBase.java6
-rw-r--r--src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java9
-rw-r--r--src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java7
-rw-r--r--src/junit/com/jogamp/common/net/TestUri01.java309
-rw-r--r--src/junit/com/jogamp/common/net/TestUri02Composing.java96
-rw-r--r--src/junit/com/jogamp/common/net/TestUri03Resolving.java430
-rw-r--r--src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java (renamed from src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java)30
-rw-r--r--src/junit/com/jogamp/common/net/URIDumpUtil.java53
8 files changed, 913 insertions, 27 deletions
diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java b/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java
index e16003f..40acec9 100644
--- a/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java
+++ b/src/junit/com/jogamp/common/net/AssetURLConnectionBase.java
@@ -23,15 +23,15 @@ public abstract class AssetURLConnectionBase extends JunitTracer {
/** In gluegen.test.jar */
protected static final String test_asset_test1_url = "asset:gluegen-test/info.txt";
protected static final String test_asset_test1_entry = "gluegen-test/info.txt";
- protected static final String test_asset_test2_rel = "data/AssetURLConnectionTest.txt";
+ protected static final Uri.Encoded test_asset_test2_rel = Uri.Encoded.cast("data/AssetURLConnectionTest.txt");
protected static final String test_asset_test2a_url = "asset:com/jogamp/common/net/data/AssetURLConnectionTest.txt";
protected static final String test_asset_test2b_url = "asset:/com/jogamp/common/net/data/AssetURLConnectionTest.txt";
protected static final String test_asset_test2_entry = "com/jogamp/common/net/data/AssetURLConnectionTest.txt";
- protected static final String test_asset_test3_rel = "RelativeData.txt";
+ protected static final Uri.Encoded test_asset_test3_rel = Uri.Encoded.cast("RelativeData.txt");
protected static final String test_asset_test3a_url = "asset:com/jogamp/common/net/data/RelativeData.txt";
protected static final String test_asset_test3b_url = "asset:/com/jogamp/common/net/data/RelativeData.txt";
protected static final String test_asset_test3_entry = "com/jogamp/common/net/data/RelativeData.txt";
- protected static final String test_asset_test4_rel = "../data2/RelativeData2.txt";
+ protected static final Uri.Encoded test_asset_test4_rel = Uri.Encoded.cast("../data2/RelativeData2.txt");
protected static final String test_asset_test4a_url = "asset:com/jogamp/common/net/data2/RelativeData2.txt";
protected static final String test_asset_test4b_url = "asset:/com/jogamp/common/net/data2/RelativeData2.txt";
protected static final String test_asset_test4_entry = "com/jogamp/common/net/data2/RelativeData2.txt";
diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java b/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java
index 7648990..cb6200d 100644
--- a/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java
+++ b/src/junit/com/jogamp/common/net/AssetURLConnectionRegisteredTest.java
@@ -1,7 +1,6 @@
package com.jogamp.common.net;
import java.io.IOException;
-import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
@@ -48,12 +47,12 @@ public class AssetURLConnectionRegisteredTest extends AssetURLConnectionBase {
Assert.assertEquals(test_asset_test2a_url, urlConn0.getURL().toExternalForm());
testAssetConnection(urlConn0, test_asset_test2_entry);
- final URI uri1 = IOUtil.getRelativeOf(urlConn0.getURL().toURI(), test_asset_test3_rel);
+ final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel);
Assert.assertNotNull(uri1);
Assert.assertEquals(test_asset_test3a_url, uri1.toString());
testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry);
- final URI uri2 = IOUtil.getRelativeOf(urlConn0.getURL().toURI(), test_asset_test4_rel);
+ final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel);
Assert.assertNotNull(uri2);
Assert.assertEquals(test_asset_test4a_url, uri2.toString());
testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry);
@@ -66,12 +65,12 @@ public class AssetURLConnectionRegisteredTest extends AssetURLConnectionBase {
Assert.assertEquals(test_asset_test2b_url, urlConn0.getURL().toExternalForm());
testAssetConnection(urlConn0, test_asset_test2_entry);
- final URI uri1 = IOUtil.getRelativeOf(urlConn0.getURL().toURI(), test_asset_test3_rel);
+ final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel);
Assert.assertNotNull(uri1);
Assert.assertEquals(test_asset_test3b_url, uri1.toString());
testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry);
- final URI uri2 = IOUtil.getRelativeOf(urlConn0.getURL().toURI(), test_asset_test4_rel);
+ final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel);
Assert.assertNotNull(uri2);
Assert.assertEquals(test_asset_test4b_url, uri2.toString());
testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry);
diff --git a/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java b/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java
index 5fbde49..5167abb 100644
--- a/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java
+++ b/src/junit/com/jogamp/common/net/AssetURLConnectionUnregisteredTest.java
@@ -1,7 +1,6 @@
package com.jogamp.common.net;
import java.io.IOException;
-import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
@@ -39,14 +38,14 @@ public class AssetURLConnectionUnregisteredTest extends AssetURLConnectionBase {
@Test
public void assetUnregisteredIOUtilGetResourceRel0_RT() throws IOException, URISyntaxException {
- final URLConnection urlConn0 = IOUtil.getResource(this.getClass(), test_asset_test2_rel);
+ final URLConnection urlConn0 = IOUtil.getResource(this.getClass(), test_asset_test2_rel.get());
testAssetConnection(urlConn0, test_asset_test2_entry);
- final URI uri1 = IOUtil.getRelativeOf(urlConn0.getURL().toURI(), test_asset_test3_rel);
+ final Uri uri1 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test3_rel);
Assert.assertNotNull(uri1); // JARFile URL ..
testAssetConnection(uri1.toURL().openConnection(), test_asset_test3_entry);
- final URI uri2 = IOUtil.getRelativeOf(urlConn0.getURL().toURI(), test_asset_test4_rel);
+ final Uri uri2 = Uri.valueOf(urlConn0.getURL()).getRelativeOf(test_asset_test4_rel);
Assert.assertNotNull(uri2);
testAssetConnection(uri2.toURL().openConnection(), test_asset_test4_entry);
}
diff --git a/src/junit/com/jogamp/common/net/TestUri01.java b/src/junit/com/jogamp/common/net/TestUri01.java
new file mode 100644
index 0000000..bcc7d27
--- /dev/null
+++ b/src/junit/com/jogamp/common/net/TestUri01.java
@@ -0,0 +1,309 @@
+package com.jogamp.common.net;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.common.net.URIDumpUtil;
+import com.jogamp.common.util.IOUtil;
+import com.jogamp.junit.util.JunitTracer;
+
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestUri01 extends JunitTracer {
+
+ @Test
+ public void test00BasicCoding() throws IOException, URISyntaxException {
+ final String string = "Hallo Welt öä";
+ System.err.println("sp1 "+string);
+ final File file = new File(string);
+ System.err.println("file "+file);
+ System.err.println("file.path.dec "+file.getPath());
+ System.err.println("file.path.abs "+file.getAbsolutePath());
+ System.err.println("file.path.can "+file.getCanonicalPath());
+ final Uri uri0 = Uri.valueOf(file);
+ URIDumpUtil.showUri(uri0);
+ URIDumpUtil.showReencodedURIOfUri(uri0);
+
+ boolean ok = true;
+ {
+ final String s2 = IOUtil.slashify(file.getAbsolutePath(), true /* startWithSlash */, file.isDirectory() /* endWithSlash */);
+ System.err.println("uri2.slashify: "+s2);
+ final Uri uri1 = Uri.create(Uri.FILE_SCHEME, null, s2, null);
+ final boolean equalEncoded= uri0.getEncoded().equals(uri1.getEncoded());
+ final boolean equalPath = uri0.path.decode().equals(uri1.path.decode());
+ final boolean equalASCII= uri0.toASCIIString().equals(uri1.toASCIIString().get());
+ System.err.println("uri2.enc : "+uri1.getEncoded()+" - "+(equalEncoded?"OK":"ERROR"));
+ System.err.println("uri2.pathD : "+uri1.path.decode()+" - "+(equalPath?"OK":"ERROR"));
+ System.err.println("uri2.asciiE: "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR"));
+ ok = equalEncoded && equalPath && equalASCII && ok;
+ }
+ {
+ final String s2 = "/"+string;
+ System.err.println("uri3.orig: "+s2);
+ final Uri uri1 = Uri.create(Uri.FILE_SCHEME, s2, null);
+ final String rString = "file:/Hallo%20Welt%20öä";
+ final String rPath = s2;
+ final String rASCII = "file:/Hallo%20Welt%20%C3%B6%C3%A4";
+ final boolean equalEncoded = rString.equals(uri1.toString());
+ final boolean equalPath = rPath.equals(uri1.path.decode());
+ final boolean equalASCII= rASCII.equals(uri1.toASCIIString().get());
+ System.err.println("uri3.enc : "+uri1.toString()+" - "+(equalEncoded?"OK":"ERROR"));
+ System.err.println("uri3.pathD : "+uri1.path.decode()+" - "+(equalPath?"OK":"ERROR"));
+ System.err.println("uri3.asciiE: "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR"));
+ ok = equalEncoded && equalPath && equalASCII && ok;
+ }
+ {
+ final String s2 = "//lala.org/"+string;
+ System.err.println("uri4.orig: "+s2);
+ final Uri uri1 = Uri.create(Uri.HTTP_SCHEME, s2, null);
+ 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.path.decode());
+ final boolean equalASCII= rASCII.equals(uri1.toASCIIString().get());
+ System.err.println("uri4.enc : "+uri1.toString()+" - "+(equalString?"OK":"ERROR"));
+ System.err.println("uri4.pathD : "+uri1.path.decode()+" - "+(equalPath?"OK":"ERROR"));
+ System.err.println("uri4.asciiE: "+uri1.toASCIIString()+" - "+(equalASCII?"OK":"ERROR"));
+ ok = equalString && equalPath && equalASCII && ok;
+ }
+ Assert.assertTrue("One or more errors occured see stderr above", ok);
+ }
+
+ @Test
+ public void test02URIEscapeSpecialChars() throws IOException, URISyntaxException {
+ {
+ final String vanilla = "XXX ! # $ & ' ( ) * + , / : ; = ? @ [ ]";
+ final Uri.Encoded escaped = Uri.Encoded.cast("XXX%20!%20%23%20%24%20%26%20%27%20%28%20%29%20%2A%20%2B%20%2C%20/%20%3A%20%3B%20%3D%20%3F%20%40%20%5B%20%5D");
+ System.err.println("vanilla "+vanilla);
+ final Uri.Encoded esc1 = new Uri.Encoded(vanilla, Uri.PATH_LEGAL);
+ System.err.println("esc1 "+esc1);
+ Assert.assertEquals(escaped, esc1);
+
+ final String invEsc1 = esc1.decode();
+ System.err.println("inv(esc1) "+invEsc1);
+ Assert.assertEquals(vanilla, invEsc1);
+ }
+ {
+ final String vanilla = "/XXX R!# R$&'()*+,/:;=?z@y[x]";
+ final Uri.Encoded escaped = Uri.Encoded.cast("/XXX%20R!%23%20R%24%26%27%28%29%2A%2B%2C/%3A%3B%3D%3Fz%40y%5Bx%5D");
+ System.err.println("vanilla "+vanilla);
+ final Uri.Encoded esc1 = new Uri.Encoded(vanilla, Uri.PATH_LEGAL);
+ System.err.println("esc1 "+esc1);
+ Assert.assertEquals(escaped, esc1);
+
+ final String invEsc1 = esc1.decode();
+ System.err.println("inv(esc1) "+invEsc1);
+ Assert.assertEquals(vanilla, invEsc1);
+ }
+ {
+ // Bug 908: $ ^ ~ # [ ]
+ final String vanilla = "/XXX $ ^ ~ # [ ]";
+ showDump0x(vanilla);
+ }
+ {
+ // Windows invalid File characters: * ? " < > |
+ final String vanilla = "/XXX ! & ' ( ) + , / ; = @ [ ]";
+ showDump0x(vanilla);
+ }
+ }
+ @Test
+ public void test03URIEscapeCommonChars() throws IOException, URISyntaxException {
+ {
+ final String vanilla = "/XXX \"%-.<>\\^_`{|}~";
+ final Uri.Encoded escaped = Uri.Encoded.cast("/XXX%20%22%25-.%3C%3E%5C%5E_%60%7B%7C%7D~");
+ System.err.println("vanilla "+vanilla);
+ final Uri.Encoded esc1 = new Uri.Encoded(vanilla, Uri.PATH_LEGAL);
+ System.err.println("esc1 "+esc1);
+ Assert.assertEquals(escaped, esc1);
+
+ final String invEsc1 = esc1.decode();
+ System.err.println("inv(esc1) "+invEsc1);
+ Assert.assertEquals(vanilla, invEsc1);
+ showDump0x(vanilla);
+ }
+ }
+ private static void showDump0x(final String string) throws IOException, URISyntaxException {
+ final File file = new File(string);
+ System.err.println("file "+file);
+ System.err.println("file.path.dec "+file.getPath());
+ System.err.println("file.path.abs "+file.getAbsolutePath());
+ System.err.println("file.path.can "+file.getCanonicalPath());
+
+ System.err.println("File-path -> Uri:");
+ final Uri uri0 = Uri.valueOfFilepath(string);
+ URIDumpUtil.showUri(uri0);
+
+ System.err.println("Uri -> File:");
+ final Uri uri2 = Uri.valueOf(file);
+ URIDumpUtil.showUri(uri2);
+
+ System.err.println("Uri -> URI:");
+ final URI uri3 = uri2.toURI();
+ URIDumpUtil.showURI(uri3);
+
+ System.err.println("URI -> Uri (keep encoding):");
+ final Uri uri4 = Uri.valueOf(uri3);
+ URIDumpUtil.showUri(uri4);
+
+ System.err.println("URI -> Uri (re-encode):");
+ final Uri uri5 = Uri.valueOf(uri3);
+ URIDumpUtil.showUri(uri5);
+ }
+
+ @Test
+ public void test04EqualsAndHashCode() throws IOException, URISyntaxException {
+ {
+ final Uri uri0 = Uri.cast("http://localhost/test01.html#tag01");
+ final Uri uri1 = Uri.create("http", null, "localhost", -1, "/test01.html", null, "tag01");
+ final Uri uri2 = Uri.create("http", "localhost", "/test01.html", "tag01");
+
+ Assert.assertEquals(uri0, uri1);
+ Assert.assertEquals(uri0.hashCode(), uri1.hashCode());
+
+ Assert.assertEquals(uri0, uri2);
+ Assert.assertEquals(uri0.hashCode(), uri2.hashCode());
+
+ Assert.assertEquals(uri1, uri2);
+ Assert.assertEquals(uri1.hashCode(), uri2.hashCode());
+
+ final Uri uriA = Uri.create("http", null, "localhost", -1, "/test02.html", null, "tag01");
+ final Uri uriB = Uri.create("http", null, "localhost", -1, "/test01.html", null, "tag02");
+ final Uri uriC = Uri.create("http", null, "lalalhost", -1, "/test01.html", null, "tag01");
+ final Uri uriD = Uri.create("sftp", null, "localhost", -1, "/test01.html", null, "tag01");
+
+ Assert.assertNotEquals(uri1, uriA);
+ Assert.assertNotEquals(uri1, uriB);
+ Assert.assertNotEquals(uri1, uriC);
+ Assert.assertNotEquals(uri1, uriD);
+ }
+ { // 3 [scheme:][//[user-info@]host[:port]]path[?query][#fragment]
+ final Uri uri0 = Uri.cast("http://user@localhost:80/test01.html?test=01&test=02#tag01");
+ final Uri uri1 = Uri.create("http", "user", "localhost", 80, "/test01.html", "test=01&test=02", "tag01");
+
+ Assert.assertEquals(uri0, uri1);
+ Assert.assertEquals(uri0.hashCode(), uri1.hashCode());
+
+ final Uri uriA = Uri.cast("http://user@localhost:80/test01.html?test=01&test=02#tag02");
+ final Uri uriB = Uri.cast("http://user@localhost:80/test01.html?test=01&test=03#tag01");
+ final Uri uriC = Uri.cast("http://user@localhost:80/test04.html?test=01&test=02#tag01");
+ final Uri uriD = Uri.cast("http://user@localhost:88/test01.html?test=01&test=02#tag01");
+ final Uri uriE = Uri.cast("http://user@lalalhost:80/test01.html?test=01&test=02#tag01");
+ final Uri uriF = Uri.cast("http://test@localhost:80/test01.html?test=01&test=02#tag01");
+ final Uri uriG = Uri.cast("sftp://user@localhost:80/test01.html?test=01&test=02#tag01");
+
+ Assert.assertNotEquals(uri1, uriA);
+ Assert.assertNotEquals(uri1, uriB);
+ Assert.assertNotEquals(uri1, uriC);
+ Assert.assertNotEquals(uri1, uriD);
+ Assert.assertNotEquals(uri1, uriE);
+ Assert.assertNotEquals(uri1, uriF);
+ Assert.assertNotEquals(uri1, uriG);
+ }
+ }
+
+ @Test
+ public void test05Contained() throws IOException, URISyntaxException {
+ {
+ final Uri input = Uri.cast("http://localhost/test01.html#tag01");
+ final Uri contained = input.getContainedUri();
+ Assert.assertNull(contained);
+ }
+ {
+ final Uri input = Uri.cast("jar:http://localhost/test01.jar!/com/jogamp/Lala.class#tag01");
+ final Uri expected = Uri.cast("http://localhost/test01.jar#tag01");
+ final Uri contained = input.getContainedUri();
+ Assert.assertEquals(expected, contained);
+ Assert.assertEquals(expected.hashCode(), contained.hashCode());
+ }
+ {
+ final Uri input = Uri.cast("jar:file://localhost/test01.jar!/");
+ final Uri expected = Uri.cast("file://localhost/test01.jar");
+ final Uri contained = input.getContainedUri();
+ Assert.assertEquals(expected, contained);
+ Assert.assertEquals(expected.hashCode(), contained.hashCode());
+ }
+ {
+ final Uri input = Uri.cast("sftp:http://localhost/test01.jar?lala=01#tag01");
+ final Uri expected = Uri.cast("http://localhost/test01.jar?lala=01#tag01");
+ final Uri contained = input.getContainedUri();
+ Assert.assertEquals(expected, contained);
+ Assert.assertEquals(expected.hashCode(), contained.hashCode());
+ }
+ }
+
+ @Test
+ public void test06ParentAndDir() throws IOException, URISyntaxException {
+ {
+ final Uri input = Uri.cast("http://localhost/");
+ final Uri parent = input.getParent();
+ Assert.assertNull(parent);
+ }
+ {
+ final Uri input = Uri.cast("jar:http://localhost/test01.jar!/com/Lala.class");
+ final Uri expParen1 = Uri.cast("jar:http://localhost/test01.jar!/com/");
+ final Uri expFolde1 = expParen1;
+ final Uri expParen2 = Uri.cast("jar:http://localhost/test01.jar!/");
+ final Uri expFolde2 = expParen1; // is folder already
+ final Uri expParen3 = Uri.cast("jar:http://localhost/");
+ final Uri expFolde3 = expParen2; // is folder already
+ Assert.assertNotEquals(input, expParen1);
+ Assert.assertNotEquals(expParen1, expParen2);
+ Assert.assertNotEquals(expParen1, expParen3);
+
+ final Uri parent1 = input.getParent();
+ final Uri folder1 = input.getDirectory();
+ final Uri parent2 = parent1.getParent();
+ final Uri folder2 = parent1.getDirectory();
+ final Uri parent3 = parent2.getParent();
+ final Uri folder3 = parent2.getDirectory();
+
+ Assert.assertEquals(expParen1, parent1);
+ Assert.assertEquals(expParen1.hashCode(), parent1.hashCode());
+ Assert.assertEquals(expFolde1, folder1);
+
+ Assert.assertEquals(expParen2, parent2);
+ Assert.assertEquals(expParen2.hashCode(), parent2.hashCode());
+ Assert.assertEquals(expFolde2, folder2);
+
+ Assert.assertEquals(expParen3, parent3);
+ Assert.assertEquals(expParen3.hashCode(), parent3.hashCode());
+ Assert.assertEquals(expFolde3, folder3);
+
+ }
+ {
+ final Uri input = Uri.cast("http://localhost/dir/test01.jar?lala=01#frag01");
+ final Uri expParen1 = Uri.cast("http://localhost/dir/");
+ final Uri expFolde1 = expParen1;
+ final Uri expParen2 = Uri.cast("http://localhost/");
+ final Uri expFolde2 = expParen1; // is folder already
+ Assert.assertNotEquals(input, expParen1);
+ Assert.assertNotEquals(expParen1, expParen2);
+
+ final Uri parent1 = input.getParent();
+ final Uri folder1 = input.getDirectory();
+ final Uri parent2 = parent1.getParent();
+ final Uri folder2 = parent1.getDirectory();
+
+ Assert.assertEquals(expParen1, parent1);
+ Assert.assertEquals(expParen1.hashCode(), parent1.hashCode());
+ Assert.assertEquals(expFolde1, folder1);
+
+ Assert.assertEquals(expParen2, parent2);
+ Assert.assertEquals(expParen2.hashCode(), parent2.hashCode());
+ Assert.assertEquals(expFolde2, folder2);
+ }
+ }
+
+ public static void main(final String args[]) throws IOException {
+ final String tstname = TestUri01.class.getName();
+ org.junit.runner.JUnitCore.main(tstname);
+ }
+}
diff --git a/src/junit/com/jogamp/common/net/TestUri02Composing.java b/src/junit/com/jogamp/common/net/TestUri02Composing.java
new file mode 100644
index 0000000..33d17b8
--- /dev/null
+++ b/src/junit/com/jogamp/common/net/TestUri02Composing.java
@@ -0,0 +1,96 @@
+package com.jogamp.common.net;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.jogamp.junit.util.JunitTracer;
+
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestUri02Composing extends JunitTracer {
+
+ @BeforeClass
+ public static void assetRegistration() throws Exception {
+ try {
+ System.err.println("******* Asset URL Stream Handler Registration: PRE");
+ Assert.assertTrue("GenericURLStreamHandlerFactory.register() failed", AssetURLContext.registerHandler(AssetURLConnectionRegisteredTest.class.getClassLoader()));
+ Assert.assertNotNull(AssetURLContext.getRegisteredHandler());
+ System.err.println("******* Asset URL Stream Handler Registration: POST");
+ } catch (final Exception e) {
+ setTestSupported(false);
+ throw e;
+ }
+ }
+
+ @Test
+ public void test01URLCompositioning() throws IOException, URISyntaxException {
+ testURNCompositioning("file:///rootDir/file1.txt");
+ testURNCompositioning("file://host/rootDir/file1.txt");
+ testURNCompositioning("jar:file:/web1/file1.jar!/rootDir/file1.txt");
+ testURNCompositioning("asset:gluegen-test/info.txt");
+ testURNCompositioning("asset:/gluegen-test/info.txt");
+ testURNCompositioning("http://domain.com/web1/index.html?lala=23&lili=24#anchor");
+ testURNCompositioning("http://domain.com:1234/web1/index.html?lala=23&lili=24#anchor");
+
+ final Uri file1URI = Uri.cast("asset:jar:file:/web1/file1.jar!/rootDir/file1.txt");
+ testURICompositioning(file1URI);
+ testUriCompositioning(file1URI, Uri.cast("asset:jar:file:/web1/file1.jar!/rootDir/./file1.txt"));
+ testUriCompositioning(file1URI, Uri.cast("asset:jar:file:/web1/file1.jar!/rootDir/dummyParent/../file1.txt"));
+
+ final URL file1URL = new URL("asset:jar:file:/web1/file1.jar!/rootDir/file1.txt");
+ testURLCompositioning(file1URL);
+ testURLCompositioning(file1URL, new URL("asset:jar:file:/web1/file1.jar!/rootDir/./file1.txt"));
+ testURLCompositioning(file1URL, new URL("asset:jar:file:/web1/file1.jar!/rootDir/dummyParent/../file1.txt"));
+ }
+
+ static void testURNCompositioning(final String urn) throws MalformedURLException, URISyntaxException {
+ testURICompositioning( Uri.cast(urn) );
+ testURLCompositioning( new URL(urn) );
+ }
+
+ static void testURICompositioning(final Uri uri) throws MalformedURLException, URISyntaxException {
+ testUriCompositioning(uri, uri);
+ }
+ static void testUriCompositioning(final Uri refURI, final Uri uri1) throws MalformedURLException, URISyntaxException {
+ System.err.println("scheme <"+uri1.scheme+">, ssp <"+uri1.schemeSpecificPart+">, fragment <"+uri1.fragment+">");
+ final Uri uri2 = Uri.compose(uri1.scheme, uri1.schemeSpecificPart, null, uri1.fragment);
+
+ System.err.println("URL-equals: "+refURI.equals(uri2));
+ System.err.println("URL-ref : <"+refURI+">");
+ System.err.println("URL-orig : <"+uri1+">");
+ System.err.println("URL-comp : <"+uri2+">");
+ Assert.assertEquals(refURI, uri2);
+ }
+
+ static void testURLCompositioning(final URL url) throws MalformedURLException, URISyntaxException {
+ testURLCompositioning(url, url);
+ }
+ static void testURLCompositioning(final URL refURL, final URL url1) throws MalformedURLException, URISyntaxException {
+ final Uri uri1 = Uri.valueOf(url1);
+ System.err.println("scheme <"+uri1.scheme+">, ssp <"+uri1.schemeSpecificPart+">, fragment <"+uri1.fragment+">");
+ final Uri uri2 = Uri.compose(uri1.scheme, uri1.schemeSpecificPart, null, uri1.fragment);
+
+ System.err.println("URL-equals(1): "+refURL.toURI().equals(uri2));
+ System.err.println("URL-equals(2): "+refURL.equals(uri2.toURL()));
+ System.err.println("URL-same : "+refURL.sameFile(uri2.toURL()));
+ System.err.println("URL-ref : <"+refURL+">");
+ System.err.println("URL-orig : <"+url1+">");
+ System.err.println("URL-comp : <"+uri2+">");
+ Assert.assertEquals(Uri.valueOf(refURL), uri2);
+ Assert.assertEquals(refURL, uri2.toURL());
+ Assert.assertTrue(refURL.sameFile(uri2.toURL()));
+ }
+
+ public static void main(final String args[]) throws IOException {
+ final String tstname = TestUri02Composing.class.getName();
+ org.junit.runner.JUnitCore.main(tstname);
+ }
+}
diff --git a/src/junit/com/jogamp/common/net/TestUri03Resolving.java b/src/junit/com/jogamp/common/net/TestUri03Resolving.java
new file mode 100644
index 0000000..54e2976
--- /dev/null
+++ b/src/junit/com/jogamp/common/net/TestUri03Resolving.java
@@ -0,0 +1,430 @@
+package com.jogamp.common.net;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import jogamp.common.os.PlatformPropsImpl;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.common.net.Uri;
+import com.jogamp.common.os.Platform;
+import com.jogamp.junit.util.JunitTracer;
+
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestUri03Resolving extends JunitTracer {
+
+ // Bug 908, issues w/ windows file path char: $ ^ ~ # [ ]
+
+ private 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/A%24/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:http://localhost/gluegen/%24/%5E/~/%23/%5B/%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:http://localhost/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"},
+ };
+
+ private 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%20öä%20lala/gluegen-rt.jar"},
+
+ new String[] {"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/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://filehost/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"},
+
+ new String[] {"jar:file:/gluegen/R%23/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/gluegen/A%24/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/gluegen/%24/%5E/~/%23/%5B/%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"},
+ };
+
+ private static final String[][] uriFileSArrayWindows = new String[][] {
+ new String[] {"file:/C%3A/gluegen/build-x86_64/gluegen-rt.jar"},
+
+ new String[] {"file:/C%3A/gluegen/"+'\u0394'+"/gluegen-rt.jar"},
+
+ new String[] {"file:/C%3A/gluegen/build-x86_64%20lala/gluegen-rt.jar"},
+
+ new String[] {"file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar"},
+
+ new String[] {"jar:file:/C%3A/gluegen/build-x86_64/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C%3A/gluegen/build-x86_64%20öä%20lala/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C%3A/gluegen/build-x86_64/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%3A/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öä%20lala/gluegen-rt.jar!/com/jogamp/common/os/Platform.class"},
+
+ new String[] {"jar:file:/C%3A/gluegen/R%23/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C%3A/gluegen/A%24/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C%3A/gluegen/%24/%5E/~/%23/%5B/%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C%3A/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"},
+ };
+
+ private static final String[][] urlFileSArrayWindows = new String[][] {
+ new String[] {"file:/C:/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%20öä%20lala/gluegen-rt.jar"},
+
+ new String[] {"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/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öä%20lala/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:/C:/gluegen/R%23/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C:/gluegen/A%24/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C:/gluegen/%24/%5E/~/%23/%5B/%5D/gluegen-rt.jar!/"},
+
+ new String[] {"jar:file:/C:/gluegen/"+'\u0394'+"/gluegen-rt.jar!/"},
+ };
+
+ public static final String[][] fileSArrayUnix = new String[][] {
+ new String[] {"/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",
+ "/gluegen/build-x86_64 lala/gluegen-rt.jar"},
+
+ new String[] {"/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"},
+
+ new String[] {"/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar",
+ "file:/gluegen/A%24/B%5E/C~/D%23/E%5B/F%5D/gluegen-rt.jar",
+ "/gluegen/A$/B^/C~/D#/E[/F]/gluegen-rt.jar" },
+
+ new String[] {"/gluegen/$/^/~/#/[/]/gluegen-rt.jar",
+ "file:/gluegen/%24/%5E/~/%23/%5B/%5D/gluegen-rt.jar",
+ "/gluegen/$/^/~/#/[/]/gluegen-rt.jar" },
+ };
+
+ public static final String[][] fileSArrayWindows = new String[][] {
+ new String[] {"C:/gluegen/build-x86_64/gluegen-rt.jar",
+ "file:/C%3A/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",
+ "C:\\gluegen\\"+'\u0394'+"\\gluegen-rt.jar"},
+
+ new String[] {"C:/gluegen/build-x86_64 lala/gluegen-rt.jar",
+ "file:/C%3A/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%3A/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%3A/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öä%20lala/gluegen-rt.jar",
+ "\\\\filehost\\gluegen\\build-x86_64 öä lala\\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~/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/~/%23/%5B/%5D/gluegen-rt.jar",
+ "C:\\gluegen\\$\\^\\~\\#\\[\\]\\gluegen-rt.jar" },
+ };
+
+ @Test
+ public void test01HttpUri2URL() throws IOException, URISyntaxException {
+ testUri2URL(getSimpleTestName("."), uriHttpSArray);
+ }
+
+ @Test
+ public void test02FileUnixUri2URL() throws IOException, URISyntaxException {
+ testUri2URL(getSimpleTestName("."), uriFileSArrayUnix);
+ }
+
+ @Test
+ public void test03FileWindowsUri2URL() throws IOException, URISyntaxException {
+ testUri2URL(getSimpleTestName("."), uriFileSArrayWindows);
+ }
+
+ @Test
+ public void test11HttpURL2Uri() throws IOException, URISyntaxException {
+ testURL2Uri(getSimpleTestName("."), uriHttpSArray);
+ }
+
+ @Test
+ public void test12FileUnixURL2Uri() throws IOException, URISyntaxException {
+ testURL2Uri(getSimpleTestName("."), uriFileSArrayUnix);
+ }
+
+ @Test
+ public void test13FileWindowsURL2Uri() throws IOException, URISyntaxException {
+ testURL2Uri(getSimpleTestName("."), urlFileSArrayWindows);
+ }
+
+ @Test
+ public void test24FileUnixURI2URL() throws IOException, URISyntaxException {
+ if( Platform.OSType.WINDOWS != PlatformPropsImpl.OS_TYPE ) {
+ testFile2Uri(getSimpleTestName("."), fileSArrayUnix);
+ }
+ }
+
+ @Test
+ public void test25FileWindowsURI2URL() throws IOException, URISyntaxException {
+ if( Platform.OSType.WINDOWS == PlatformPropsImpl.OS_TYPE ) {
+ testFile2Uri(getSimpleTestName("."), fileSArrayWindows);
+ }
+ }
+
+ static void testUri2URL(final String testname, final String[][] uriSArray) throws IOException, URISyntaxException {
+ boolean ok = true;
+ for(int i=0; i<uriSArray.length; i++) {
+ final String[] uriSPair = uriSArray[i];
+ final String uriSource = uriSPair[0];
+ System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+uriSArray.length);
+ ok = testUri2URL(Uri.Encoded.cast(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 Uri.Encoded uriSource) throws IOException, URISyntaxException {
+ System.err.println("uriSource : "+uriSource);
+ final Uri uri0 = new Uri(uriSource);
+ URIDumpUtil.showUri(uri0);
+
+ final URI actualURI = uri0.toURI();
+ URIDumpUtil.showURI(actualURI);
+ final Uri.Encoded actualURIStr = Uri.Encoded.cast(actualURI.toString());
+
+ final URL actualURL = uri0.toURL();
+ URIDumpUtil.showURL(actualURL);
+ final Uri.Encoded actualURLStr = Uri.Encoded.cast(actualURL.toExternalForm());
+
+ System.err.println("expected_URX: "+uriSource);
+
+ final boolean equalsURI = uriSource.equals(actualURIStr);
+ System.err.println("actual URI: "+actualURIStr+" - "+(equalsURI?"OK":"ERROR"));
+ final boolean equalsURL = uriSource.equals(actualURLStr);
+ System.err.println("actual URL: "+actualURLStr+" - "+(equalsURL?"OK":"ERROR"));
+ URIDumpUtil.showReencodedURIOfUri(uri0);
+ URIDumpUtil.showReencodedUriOfURI(actualURI);
+
+ boolean ok = equalsURL && equalsURI;
+
+ // now test open ..
+ Throwable t = null;
+ URLConnection con = null;
+ try {
+ con = actualURL.openConnection();
+ } catch (final Throwable _t) {
+ t = _t;
+ }
+ if( null != t ) {
+ System.err.println("XXX: "+t.getClass().getName()+": "+t.getMessage());
+ t.printStackTrace();
+ } else {
+ System.err.println("XXX: No openConnection() failure");
+ System.err.println("XXX: "+con);
+ }
+
+ if( uri0.scheme.equals(Uri.JAR_SCHEME) ) {
+ // Extended tests on JAR Uri
+ final Uri uriSub0 = uri0.getContainedUri();
+ Assert.assertNotNull(uriSub0);
+ System.err.println("EXT JAR contained:");
+ URIDumpUtil.showUri(uriSub0);
+ final Uri uriSubDir0 = uriSub0.getDirectory();
+ final Uri uriSubParent0 = uriSub0.getParent();
+ System.err.println("EXT JAR contained Dir:");
+ URIDumpUtil.showUri(uriSubDir0);
+ System.err.println("EXT JAR contained Parent:");
+ URIDumpUtil.showUri(uriSubParent0);
+ ok = uriSubDir0.equals(uriSubParent0) && ok;
+ }
+ return ok;
+ }
+
+ static void testURL2Uri(final String testname, final String[][] urlSArray) throws IOException, URISyntaxException {
+ boolean ok = true;
+ for(int i=0; i<urlSArray.length; i++) {
+ final String[] uriSPair = urlSArray[i];
+ final String uriSource = uriSPair[0];
+ System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+urlSArray.length);
+ ok = testURL2Uri(new URL(uriSource)) && ok;
+ System.err.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE "+testname+": "+(i+1)+"/"+urlSArray.length);
+ }
+ Assert.assertTrue("One or more errors occured see stderr above", ok);
+ }
+
+ static boolean testURL2Uri(final URL urlSource) throws IOException, URISyntaxException {
+ System.err.println("URL Source : "+urlSource);
+ URIDumpUtil.showURL(urlSource);
+
+ final URI uriSource = urlSource.toURI();
+ URIDumpUtil.showURI(uriSource);
+
+ final Uri uri0 = Uri.valueOf(urlSource);
+ URIDumpUtil.showUri(uri0);
+
+ final URL uriToURL = uri0.toURL();
+ URIDumpUtil.showURL(uriToURL);
+
+ // now test open ..
+ Throwable t = null;
+ URLConnection con = null;
+ try {
+ con = uriToURL.openConnection();
+ } catch (final Throwable _t) {
+ t = _t;
+ }
+ if( null != t ) {
+ System.err.println("XXX: "+t.getClass().getName()+": "+t.getMessage());
+ t.printStackTrace();
+ } else {
+ System.err.println("XXX: No openConnection() failure");
+ System.err.println("XXX: "+con);
+ }
+
+ boolean ok = true;
+
+ if( uri0.scheme.equals(Uri.JAR_SCHEME) ) {
+ // Extended tests on JAR Uri
+ final Uri uriSub0 = uri0.getContainedUri();
+ Assert.assertNotNull(uriSub0);
+ System.err.println("EXT JAR contained:");
+ URIDumpUtil.showUri(uriSub0);
+ final Uri uriSubDir0 = uriSub0.getDirectory();
+ final Uri uriSubParent0 = uriSub0.getParent();
+ System.err.println("EXT JAR contained Dir:");
+ URIDumpUtil.showUri(uriSubDir0);
+ System.err.println("EXT JAR contained Parent:");
+ URIDumpUtil.showUri(uriSubParent0);
+ ok = uriSubDir0.equals(uriSubParent0) && ok;
+ }
+ return ok;
+ }
+
+ static void testFile2Uri(final String testname, final String[][] uriSArray) throws IOException, URISyntaxException {
+ boolean ok = true;
+ for(int i=0; i<uriSArray.length; i++) {
+ final String[] uriSPair = uriSArray[i];
+ final String uriSource = uriSPair[0];
+ final String uriEncExpected= uriSPair[1];
+ final String fileExpected= uriSPair[2];
+ System.err.println("SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS "+testname+": "+(i+1)+"/"+uriSArray.length);
+ ok = testFile2Uri(uriSource, Uri.Encoded.cast(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 Uri.Encoded uriEncExpected, final String fileExpected) throws IOException, URISyntaxException {
+ System.err.println("fileSource: "+fileSource);
+ final File file = new File(fileSource);
+ System.err.println("file: "+file.getAbsolutePath());
+
+ final Uri uri0 = Uri.valueOf(file);
+ URIDumpUtil.showReencodedURIOfUri(uri0);
+
+ final URL actualUrl = uri0.toURL();
+ final File actualFile = uri0.toFile();
+ final boolean equalsFilePath = fileExpected.equals(actualFile.getPath());
+ System.err.println("expected_path: "+fileExpected);
+ System.err.println("actual___file-path: "+actualFile+" - "+(equalsFilePath?"OK":"ERROR"));
+ final boolean equalsEncUri = uriEncExpected.equals(uri0.getEncoded());
+ System.err.println("expected__encUri: "+uriEncExpected);
+ System.err.println("actual_______Uri: "+uri0.getEncoded()+" - "+(equalsEncUri?"OK":"ERROR"));
+ final boolean ok = equalsEncUri && equalsFilePath;
+
+ System.err.println("actual_______URL: "+actualUrl.toExternalForm());
+
+ // now test open ..
+ Throwable t = null;
+ URLConnection con = null;
+ try {
+ con = actualUrl.openConnection();
+ } catch (final Throwable _t) {
+ t = _t;
+ }
+ if( null != t ) {
+ System.err.println("XXX: "+t.getClass().getName()+": "+t.getMessage());
+ t.printStackTrace();
+ } else {
+ System.err.println("XXX: No openConnection() failure");
+ System.err.println("XXX: "+con);
+ }
+ return ok;
+ }
+
+ public static void main(final String args[]) throws IOException {
+ final String tstname = TestUri03Resolving.class.getName();
+ org.junit.runner.JUnitCore.main(tstname);
+ }
+}
diff --git a/src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java b/src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java
index 904fca5..09748a1 100644
--- a/src/junit/com/jogamp/common/net/TestNetIOURIReservedCharsBug908.java
+++ b/src/junit/com/jogamp/common/net/TestUri99LaunchOnReservedCharPathBug908.java
@@ -42,7 +42,6 @@ import org.junit.runners.MethodSorters;
import com.jogamp.common.os.AndroidVersion;
import com.jogamp.common.os.Platform;
-import com.jogamp.common.util.IOUtil;
import com.jogamp.common.util.JarUtil;
import com.jogamp.common.util.ReflectionUtil;
import com.jogamp.junit.util.JunitTracer;
@@ -71,7 +70,7 @@ import com.jogamp.junit.util.MiscUtils;
* </p>
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestNetIOURIReservedCharsBug908 extends JunitTracer {
+public class TestUri99LaunchOnReservedCharPathBug908 extends JunitTracer {
static class TestClassLoader extends URLClassLoader {
public TestClassLoader(final URL[] urls) {
super(urls);
@@ -84,16 +83,16 @@ public class TestNetIOURIReservedCharsBug908 extends JunitTracer {
@Test
public void test00TempJarCacheSimplePath() throws IOException, IllegalArgumentException, URISyntaxException {
- testTempJarCacheOddJarPathImpl("simpletons/", "simpletons/");
+ testTempJarCacheOddJarPathImpl("simpletons/");
}
@Test
public void test01TempJarCacheOddPath() throws IOException, IllegalArgumentException, URISyntaxException {
// Bug 908, issues w/ windows file path char: $ ^ ~ # [ ]
- testTempJarCacheOddJarPathImpl("A$-B^-C~-D#-E]-F[-öä/",
+ testTempJarCacheOddJarPathImpl("A$-B^-C~-D#-E]-F[-öä/");
// "A$-B%5E-C~-D#-E]-F[-%C3%B6%C3%A4/"); <- Firefox URI encoding! '#' -> [1]
// "A$-B%5E-C~-D%23-E]-F[-%C3%B6%C3%A4/"); <- '[' ']' -> [2]
- "A$-B%5E-C~-D%23-E%5D-F%5B-%C3%B6%C3%A4/");
+ // "A$-B%5E-C~-D%23-E%5D-F%5B-%C3%B6%C3%A4/");
/**
* [1] '#'
java.lang.IllegalArgumentException: URI has a fragment component
@@ -111,34 +110,35 @@ public class TestNetIOURIReservedCharsBug908 extends JunitTracer {
*/
}
- private void testTempJarCacheOddJarPathImpl(final String subPathUTF, final String subPathEncoded) throws IOException, IllegalArgumentException, URISyntaxException {
+ private void testTempJarCacheOddJarPathImpl(final String subPathUTF) throws IOException, IllegalArgumentException, URISyntaxException {
if(AndroidVersion.isAvailable) { System.err.println("n/a on Android"); return; }
+ final Uri.Encoded subPathEncoded = new Uri.Encoded(subPathUTF, Uri.PATH_LEGAL);
final String reservedCharPathUnencoded = "test/build/"+getClass().getSimpleName()+"/"+getTestMethodName()+"/"+subPathUTF;
- final String reservedCharPathEncoded = "test/build/"+getClass().getSimpleName()+"/"+getTestMethodName()+"/"+subPathEncoded;
+ final Uri.Encoded reservedCharPathEncoded = Uri.Encoded.cast("test/build/"+getClass().getSimpleName()+"/"+getTestMethodName()+"/").concat(subPathEncoded);
System.err.println("0 Unencoded: "+reservedCharPathUnencoded);
System.err.println("0 Encoded: "+reservedCharPathEncoded);
// jar:file:/dir1/dir2/gluegen-rt.jar!/
- final URI jarFileURI = JarUtil.getJarFileURI(Platform.class.getName(), getClass().getClassLoader());
+ final Uri jarFileURI = JarUtil.getJarFileUri(Platform.class.getName(), getClass().getClassLoader());
System.err.println("1 jarFileURI: "+jarFileURI.toString());
// gluegen-rt.jar
- final String jarBasename = JarUtil.getJarBasename(jarFileURI);
+ final Uri.Encoded jarBasename = JarUtil.getJarBasename(jarFileURI);
System.err.println("2 jarBasename: "+jarBasename);
// file:/dir1/build/gluegen-rt.jar
- final URI fileURI = JarUtil.getJarSubURI(jarFileURI);
+ final Uri fileURI = jarFileURI.getContainedUri();
System.err.println("3 fileURI: "+fileURI.toString());
// file:/dir1/build/
- final URI fileFolderURI = new URI(IOUtil.getParentOf(fileURI.toString()));
+ final Uri fileFolderURI = fileURI.getParent();
System.err.println("4 fileFolderURI: "+fileFolderURI.toString());
// file:/dir1/build/test/build/A$-B^-C~-D#-E]-F[/
- final URI fileNewFolderURI = new URI(fileFolderURI.toString()+reservedCharPathEncoded);
+ final Uri fileNewFolderURI = fileFolderURI.concat(reservedCharPathEncoded);
System.err.println("5 fileNewFolderURI: "+fileNewFolderURI.toString());
- final File srcFolder = new File(fileFolderURI);
- final File dstFolder = new File(fileNewFolderURI);
+ final File srcFolder = fileFolderURI.toFile();
+ final File dstFolder = fileNewFolderURI.toFile();
System.err.println("6 srcFolder: "+srcFolder.toString());
System.err.println("7 dstFolder: "+dstFolder.toString());
try {
@@ -163,7 +163,7 @@ public class TestNetIOURIReservedCharsBug908 extends JunitTracer {
}
public static void main(final String args[]) throws IOException {
- final String tstname = TestNetIOURIReservedCharsBug908.class.getName();
+ final String tstname = TestUri99LaunchOnReservedCharPathBug908.class.getName();
org.junit.runner.JUnitCore.main(tstname);
}
diff --git a/src/junit/com/jogamp/common/net/URIDumpUtil.java b/src/junit/com/jogamp/common/net/URIDumpUtil.java
index 1a74742..c5ba51f 100644
--- a/src/junit/com/jogamp/common/net/URIDumpUtil.java
+++ b/src/junit/com/jogamp/common/net/URIDumpUtil.java
@@ -42,4 +42,57 @@ public class URIDumpUtil {
System.err.println("2.3.0 query: "+uri.getRawQuery()+" (raw), "+uri.getQuery()+" (dec)");
System.err.println("3.0.0 fragment: "+uri.getRawFragment()+" (raw), "+uri.getFragment()+" (dec)");
}
+
+ public static void showUri(final Uri uri) throws URISyntaxException {
+ showUri("ZZZZZZ Uri "+uri+", isOpaque "+uri.opaque+", isAbs "+uri.absolute+", hasAuth "+uri.hasAuthority, uri);
+ }
+
+ public static void showUri(final String message, final Uri uri) throws URISyntaxException {
+ System.err.println(message);
+
+ System.err.println("0.0.0 string: "+uri.toString());
+ System.err.println("0.0.0 ascii : "+uri.toASCIIString());
+ System.err.println("0.0.0 native-file: "+uri.toFile());
+ System.err.println("0.0.0 contained: "+uri.getContainedUri());
+
+ System.err.println("1.0.0 scheme: "+uri.scheme);
+ System.err.println("2.0.0 scheme-part: "+uri.schemeSpecificPart+" (raw), "+Uri.decode(uri.schemeSpecificPart)+" (dec)");
+ System.err.println("2.1.0 auth: "+uri.authority+" (raw), "+Uri.decode(uri.authority)+" (dec)");
+ System.err.println("2.1.1 user-info: "+uri.userInfo+" (raw), "+Uri.decode(uri.userInfo)+" (dec)");
+ System.err.println("2.1.1 host: "+uri.host);
+ System.err.println("2.1.1 port: "+uri.port);
+ System.err.println("2.2.0 path: "+uri.path+" (raw), "+Uri.decode(uri.path)+" (dec)");
+ System.err.println("2.3.0 query: "+uri.query+" (raw), "+Uri.decode(uri.query)+" (dec)");
+ System.err.println("3.0.0 fragment: "+uri.fragment+" (raw), "+Uri.decode(uri.fragment)+" (dec)");
+ }
+
+ /**
+ * Just showing different encoding of Uri -> URI
+ *
+ * @param uri
+ * @throws URISyntaxException
+ */
+ public static void showReencodedURIOfUri(final Uri uri) throws URISyntaxException {
+ final URI recomposedURI = uri.toURIReencoded();
+ showURI("YYYYYY Recomposed URI "+recomposedURI+", isOpaque "+recomposedURI.isOpaque()+", isAbs "+recomposedURI.isAbsolute(), recomposedURI);
+ final String recomposedURIStr = recomposedURI.toString();
+ final boolean equalsRecompURI = uri.input.equals(recomposedURIStr);
+ System.err.println("source Uri: "+uri.input);
+ System.err.println("recomp URI: "+recomposedURIStr+" - "+(equalsRecompURI?"EQUAL":"UNEQUAL"));
+ }
+
+ /**
+ * Just showing different encoding of URI -> Uri
+ *
+ * @param uri
+ * @throws URISyntaxException
+ */
+ public static void showReencodedUriOfURI(final URI uri) throws URISyntaxException {
+ final Uri recomposedUri = Uri.valueOf(uri);
+ showUri("ZZZZZZ Recomposed Uri "+recomposedUri+", isOpaque "+recomposedUri.opaque+", isAbs "+recomposedUri.absolute+", hasAuth "+recomposedUri.hasAuthority, recomposedUri);
+ final String recomposedUriStr = recomposedUri.toString();
+ final boolean equalsRecompUri = uri.toString().equals(recomposedUriStr);
+ System.err.println("source URI: "+uri.toString());
+ System.err.println("recomp Uri: "+recomposedUriStr+" - "+(equalsRecompUri?"EQUAL":"UNEQUAL"));
+ }
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 11:05:09 +0000