You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2012/07/06 13:21:14 UTC
svn commit: r1358131 - in /river/jtsk/trunk/test:
lib/reference-collections-1.0.1.jar
src/org/apache/river/api/security/ConcurrentPolicyFileTest.java
Author: peter_firmstone
Date: Fri Jul 6 11:21:13 2012
New Revision: 1358131
URL: http://svn.apache.org/viewvc?rev=1358131&view=rev
Log:
Fixed failing junit tests caused by change to ConcurrentPolicyFile.getPermissions(CodeSource) method that now only returns Permissions for privileged CodeSource and delegates up to the super class java.security.Policy if the CodeSource is not privileged.
Added:
river/jtsk/trunk/test/lib/reference-collections-1.0.1.jar (with props)
Modified:
river/jtsk/trunk/test/src/org/apache/river/api/security/ConcurrentPolicyFileTest.java
Added: river/jtsk/trunk/test/lib/reference-collections-1.0.1.jar
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/test/lib/reference-collections-1.0.1.jar?rev=1358131&view=auto
==============================================================================
Binary file - no diff available.
Propchange: river/jtsk/trunk/test/lib/reference-collections-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1358131&r1=1358130&r2=1358131&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 Fri Jul 6 11:21:13 2012
@@ -80,15 +80,16 @@ public class ConcurrentPolicyFileTest ex
TestParser tp = new TestParser(pe);
ConcurrentPolicyFile policy = new ConcurrentPolicyFile(tp, new PermissionComparator());
CodeSource cs = new CodeSource(null, (Certificate[])null);
- assertTrue(policy.getPermissions(cs).implies(sp));
+ ProtectionDomain pd = new ProtectionDomain(cs, null, null, null);
+ assertTrue(policy.getPermissions(pd).implies(sp));
tp.content = new PermissionGrant[0];
policy.refresh();
- assertFalse(policy.getPermissions(cs).implies(sp));
+ assertFalse(policy.getPermissions(pd).implies(sp));
tp.content = null;
policy.refresh();
- assertFalse(policy.getPermissions(cs).implies(sp));
+ assertFalse(policy.getPermissions(pd).implies(sp));
}
/**
@@ -127,14 +128,17 @@ public class ConcurrentPolicyFileTest ex
.build();
PermissionGrant[] peArray = new PermissionGrant[] { pe1, pe2, pe3};
ConcurrentPolicyFile policy = new ConcurrentPolicyFile(new TestParser(peArray), new PermissionComparator());
+
+ ProtectionDomain pd = new ProtectionDomain(cs, null, null, null);
+ ProtectionDomain pd2 = new ProtectionDomain(cs2, null, null, null);
+
+ assertTrue(policy.getPermissions(pd).implies(sp1));
+ assertFalse(policy.getPermissions(pd).implies(sp2));
+ assertFalse(policy.getPermissions(pd).implies(sp3));
- assertTrue(policy.getPermissions(cs).implies(sp1));
- assertFalse(policy.getPermissions(cs).implies(sp2));
- assertFalse(policy.getPermissions(cs).implies(sp3));
-
- assertTrue(policy.getPermissions(cs2).implies(sp1));
- assertTrue(policy.getPermissions(cs2).implies(sp2));
- assertFalse(policy.getPermissions(cs2).implies(sp3));
+ assertTrue(policy.getPermissions(pd2).implies(sp1));
+ assertTrue(policy.getPermissions(pd2).implies(sp2));
+ assertFalse(policy.getPermissions(pd2).implies(sp3));
}
/**