river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1463106 [4/4] - in /river/jtsk/skunk/qa_refactor/trunk: ./ qa/ qa/jtreg/net/jini/loader/pref/PreferredClassProvider/registryRetainCodebase/ qa/jtreg/net/jini/loader/pref/PreferredResources/correctInterpretation/ qa/src/com/sun/jini/test/im...
Date Mon, 01 Apr 2013 07:47:45 GMT
Modified: river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/security/URIGrantTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/security/URIGrantTest.java?rev=1463106&r1=1463105&r2=1463106&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/security/URIGrantTest.java
(original)
+++ river/jtsk/skunk/qa_refactor/trunk/test/src/org/apache/river/api/security/URIGrantTest.java
Mon Apr  1 07:47:44 2013
@@ -28,6 +28,7 @@ import java.security.Permission;
 import java.security.Principal;
 import java.net.URI;
 import junit.framework.Assert;
+import org.apache.river.api.net.Uri;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -55,9 +56,9 @@ public class URIGrantTest {
     
     @Before
     public void setUp() throws URISyntaxException, MalformedURLException {
-        URI [] u = new URI[2];
-        u[0] = new URI("file:/foo/*");
-        u[1] = new URI("file:/C:/FOO/*");
+        String [] u = new String[2];
+        u[0] = "file:/foo/*";
+        u[1] = "file:/C:/FOO/*";
         instance = new URIGrant(u, new Certificate[0], new Principal[0], new Permission[0]);
         pd = new ProtectionDomain( new CodeSource(new URL("file:/foo/bar"), (Certificate
[]) null), null);
     }
@@ -69,16 +70,16 @@ public class URIGrantTest {
     @Test
     public void testImplies() throws URISyntaxException {
         System.out.println("Test implies");
-        URI grant = new URI("file:///foo/*");
-        URI otherGrant = new URI("file:/foo/*");
-        URI implied = new URI("file:/foo/bar");
-        URI alsoImplied = new URI("file:///foo/bar");
+        Uri grant = Uri.parseAndCreate("file:///foo/*");
+        Uri otherGrant = Uri.parseAndCreate("file:/foo/*");
+        Uri implied = Uri.parseAndCreate("file:/foo/bar");
+        Uri alsoImplied = Uri.parseAndCreate("file:///foo/bar");
         Assert.assertTrue(instance.implies(grant, implied));
         Assert.assertTrue(instance.implies(grant,alsoImplied));
         Assert.assertTrue(instance.implies(otherGrant, implied));
         Assert.assertTrue(instance.implies(otherGrant, alsoImplied));
-        grant = new URI("file:/C:/USERS/PETER/DOCUMENTS/NETBEANSPROJECTS/PETERCONCURRENTPOLICY/QA/-");
-        implied = new URI("file:/C:/USERS/PETER/DOCUMENTS/NETBEANSPROJECTS/PETERCONCURRENTPOLICY/QA/LIB/JINIHARNESS.JAR");
+        grant = Uri.parseAndCreate("file:/C:/USERS/PETER/DOCUMENTS/NETBEANSPROJECTS/PETERCONCURRENTPOLICY/QA/-");
+        implied = Uri.parseAndCreate("file:/C:/USERS/PETER/DOCUMENTS/NETBEANSPROJECTS/PETERCONCURRENTPOLICY/QA/LIB/JINIHARNESS.JAR");
         System.out.println(grant);
         System.out.println(implied);
         boolean result = instance.implies(grant, implied);



Mime
View raw message