1 files changed, 10 insertions, 11 deletions

diff --git a/src/junit/com/jogamp/common/net/TestURIQueryProps.java b/src/junit/com/jogamp/common/net/TestUriQueryProps.java
index 4f4435a..471cae2 100644
--- a/src/junit/com/jogamp/common/net/TestURIQueryProps.java
+++ b/src/junit/com/jogamp/common/net/TestUriQueryProps.java
@@ -1,9 +1,8 @@
 package com.jogamp.common.net;
 
-import static com.jogamp.common.net.URIDumpUtil.showURI;
+import static com.jogamp.common.net.URIDumpUtil.showUri;
 
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.junit.Assert;
@@ -15,7 +14,7 @@ import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TestURIQueryProps extends JunitTracer {
+public class TestUriQueryProps extends JunitTracer {
 
     @Test
     public void test() throws IOException, URISyntaxException {
@@ -29,22 +28,22 @@ public class TestURIQueryProps extends JunitTracer {
        for(int i=0; i<args.length-1; i+=2) {
            final String uri_s0 = args[i];
            final String uri_s1 = args[i+1];
-           final URI uri0 = new URI(uri_s0);
-           final URI uri1 = new URI(uri_s1);
-           showURI(uri0);
-           showURI(uri1);
-           final URIQueryProps data = URIQueryProps.create(uri1, ';');
+           final Uri uri0 = Uri.cast(uri_s0);
+           final Uri uri1 = Uri.cast(uri_s1);
+           showUri(uri0);
+           showUri(uri1);
+           final UriQueryProps data = UriQueryProps.create(uri1, ';');
            if(null == data) {
                System.err.println("Error: NULL: <"+uri_s1+"> -> "+uri1+" -> NULL");
            } else {
-               final URI uri1T = data.appendQuery(uri0);
-               showURI(uri1T);
+               final Uri uri1T = data.appendQuery(uri0);
+               showUri(uri1T);
                Assert.assertEquals(uri1, uri1T);
            }
        }
     }
     public static void main(final String args[]) throws IOException {
-        final String tstname = TestURIQueryProps.class.getName();
+        final String tstname = TestUriQueryProps.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
 }