Author: peter_firmstone Date: Sun Oct 7 06:49:16 2012 New Revision: 1395234
URL: http://svn.apache.org/viewvc?rev=1395234&view=rev Log: Remove unnecessary new classes prior to release Removed: river/jtsk/trunk/test/src/org/apache/river/api/security/CodeSourceGrantTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PermissionGrantTest.java Modified: river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyEntryTest.java Modified: river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java?rev=1395234&r1=1395233&r2=1395234&view=diff ============================================================================== --- river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java (original) +++ river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java Sun Oct 7 06:49:16 2012 @@ -22,6 +22,7 @@ package org.apache.river.api.security; +import java.net.URI; import tests.support.FakePrincipal; import java.net.URL; import java.security.cert.Certificate; @@ -72,9 +73,9 @@ public class ConcurrentPolicyFileTest ex Permission sp = new SecurityPermission("sdf"); PermissionGrantBuilder pgb = PermissionGrantBuilder.newBuilder(); PermissionGrant[] pe = new PermissionGrant[] { - pgb.codeSource(null).principals(null) + pgb.uri(null).principals(null) .permissions(new Permission[] { sp }) - .context(PermissionGrantBuilder.CODESOURCE) + .context(PermissionGrantBuilder.URI) .build() }; TestParser tp = new TestParser(pe); @@ -108,21 +109,22 @@ public class ConcurrentPolicyFileTest ex */ public void testGetPermissions_CodeSource() throws Exception { PermissionGrantBuilder pgb = PermissionGrantBuilder.newBuilder(); - pgb.context(PermissionGrantBuilder.CODESOURCE); + pgb.context(PermissionGrantBuilder.URI); CodeSource cs = new CodeSource(null, (Certificate[])null); CodeSource cs2 = new CodeSource(new URL("http://a.b.c";), (Certificate[])null); + URI uri2 = new URI("http://a.b.c";); Permission sp1 = new SecurityPermission("aaa"); Permission sp2 = new SecurityPermission("bbb"); Permission sp3 = new SecurityPermission("ccc"); - PermissionGrant pe1 = pgb.codeSource(cs) + PermissionGrant pe1 = pgb .permissions(new Permission[] { sp1 }) .build(); - PermissionGrant pe2 = pgb.codeSource(cs2) + PermissionGrant pe2 = pgb.uri(uri2) .principals(new Principal[0]) .permissions(new Permission[] { sp2 }) .build(); - PermissionGrant pe3 = pgb.codeSource(cs) + PermissionGrant pe3 = pgb .principals( new Principal[] {new FakePrincipal("qqq") }) .permissions(new Permission[] { sp3 }) .build(); @@ -147,7 +149,7 @@ public class ConcurrentPolicyFileTest ex */ public void testGetPermissions_ProtectionDomain() throws Exception { PermissionGrantBuilder pgb = PermissionGrantBuilder.newBuilder(); - pgb.context(PermissionGrantBuilder.CODESOURCE); + pgb.context(PermissionGrantBuilder.URI); Permission sp1 = new SecurityPermission("aaa"); Permission sp2 = new SecurityPermission("bbb"); Permission sp3 = new SecurityPermission("ccc"); @@ -158,24 +160,25 @@ public class ConcurrentPolicyFileTest ex CodeSource cs = new CodeSource(null, (Certificate[])null); CodeSource cs2 = new CodeSource(new URL("http://a.b.c";), (Certificate[])null); + URI uri2 = new URI("http://a.b.c";); ProtectionDomain pd1 = new ProtectionDomain(cs, null); ProtectionDomain pd2 = new ProtectionDomain(cs2, pcZ, null, new Principal[] { new FakePrincipal("qqq") }); - PermissionGrant pe1 = pgb.codeSource(cs) + PermissionGrant pe1 = pgb .permissions(new Permission[] { sp1 }) .build(); - PermissionGrant pe2 = pgb.codeSource(cs2) + PermissionGrant pe2 = pgb.uri(uri2) .principals(new Principal[] { new UnresolvedPrincipal( UnresolvedPrincipal.WILDCARD, UnresolvedPrincipal.WILDCARD) }) .permissions(new Permission[] { sp2 }) .build(); - PermissionGrant pe3 = pgb.codeSource(cs) + PermissionGrant pe3 = pgb .principals(new Principal[] { new UnresolvedPrincipal( FakePrincipal.class.getName(), "qqq") }) .permissions(new Permission[] { sp3 }) .build(); - PermissionGrant pe4 = pgb.codeSource(cs2) + PermissionGrant pe4 = pgb.uri(uri2) .principals(new Principal[] { new UnresolvedPrincipal( FakePrincipal.class.getName(), "ttt") }) .permissions(new Permission[] { sp4 }) Modified: river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyEntryTest.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyEntryTest.java?rev=1395234&r1=1395233&r2=1395234&view=diff ============================================================================== --- river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyEntryTest.java (original) +++ river/jtsk/trunk/test/src/org/apache/river/api/security/PolicyEntryTest.java Sun Oct 7 06:49:16 2012 @@ -54,10 +54,10 @@ public class PolicyEntryTest extends Tes // pe = new PolicyEntry(new CodeSource(null, (Certificate[])null), // new ArrayList<Principal>(), new ArrayList<Permission>()); - pe = pgb.codeSource(new CodeSource(null, (Certificate[])null)) + pe = pgb .principals(new Principal[0]) .permissions(new Permission[0]) - .context(PermissionGrantBuilder.CODESOURCE) + .context(PermissionGrantBuilder.URI) .build(); assertTrue(pe.isVoid()); assertTrue(pe.getPermissions().isEmpty()); @@ -65,7 +65,7 @@ public class PolicyEntryTest extends Tes Permission[] perms = new Permission[] { new SecurityPermission("dsfg"), new AllPermission() }; //pe = new PolicyEntry((CodeSource) null, (Collection<Principal>) null, perms); - pe = pgb.codeSource(null) + pe = pgb .principals(null) .permissions(perms) .build();
