svn commit: r943353 - in /incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy: se/ConcurrentPolicyFileTest.java util/PolicyEntryTest.java

[pe...@apache.org]

Author: peter_firmstone
Date: Wed May 12 01:59:27 2010
New Revision: 943353

URL: http://svn.apache.org/viewvc?rev=943353&view=rev
Log:
River-323 Significant refactoring and layout changes.

This will break some tests causing a failled Hudson build, however I think it best to get the code out there, so I can get some assistance.

By default the qa tests now utilise the ConcurrentDynamicPolicyProvider and DynamicPolicyProvider uses a pluggable SPI.

Modified:
    incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/se/ConcurrentPolicyFileTest.java
    incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/util/PolicyEntryTest.java

Modified: incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/se/ConcurrentPolicyFileTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/se/ConcurrentPolicyFileTest.java?rev=943353&r1=943352&r2=943353&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/se/ConcurrentPolicyFileTest.java (original)
+++ incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/se/ConcurrentPolicyFileTest.java Wed May 12 01:59:27 2010
@@ -75,8 +75,11 @@ public class ConcurrentPolicyFileTest ex
      */
     public void testRefresh() {
         Permission sp = new SecurityPermission("sdf");
-        PolicyEntry[] pe = new PolicyEntry[] { new PolicyEntry(null, null,
-            Arrays.asList(new Permission[] { sp })) };
+        PolicyEntry[] pe = new PolicyEntry[] { 
+            new PolicyEntry((CodeSource)null,
+                (Collection<Principal>)null,
+            Arrays.asList(new Permission[] { sp })) 
+        };
         TestParser tp = new TestParser(pe);
         ConcurrentPolicyFile policy = new ConcurrentPolicyFile(tp);
         CodeSource cs = new CodeSource(null, (Certificate[])null);

Modified: incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/util/PolicyEntryTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/util/PolicyEntryTest.java?rev=943353&r1=943352&r2=943353&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/util/PolicyEntryTest.java (original)
+++ incubator/river/jtsk/trunk/test/src/org/apache/river/imp/security/policy/util/PolicyEntryTest.java Wed May 12 01:59:27 2010
@@ -50,7 +50,9 @@ public class PolicyEntryTest extends Tes
      * Tests constructor and accessors of PolicyEntry 
      */
     public void testCtor() {
-        PolicyEntry pe = new PolicyEntry(null, null, null);
+        PolicyEntry pe =
+            new PolicyEntry((CodeSource) null, (Collection<Principal>) null,
+                (Collection<Permission>)null);
         assertTrue(pe.isVoid());
         assertTrue(pe.getPermissions().isEmpty());
 
@@ -61,7 +63,7 @@ public class PolicyEntryTest extends Tes
 
         Collection perms = Arrays.asList(new Permission[] {
             new SecurityPermission("dsfg"), new AllPermission() });
-        pe = new PolicyEntry(null, null, perms);
+        pe = new PolicyEntry((CodeSource) null, (Collection<Principal>) null, perms);
         assertFalse(pe.isVoid());
         assertEquals(perms, new ArrayList(pe.getPermissions()));
     }
@@ -88,7 +90,9 @@ public class PolicyEntryTest extends Tes
         CodeSource cs32 = new CodeSource(new URL("file://-"), (Certificate[]) null);
         CodeSource cs33 = new CodeSource(new URL("file:///-"), (Certificate[]) null);
 
-        PolicyEntry pe0  = new PolicyEntry(null, null, null);
+        PolicyEntry pe0  = 
+                new PolicyEntry((CodeSource) null, (Collection<Principal>) null,
+                (Collection<Permission>)null);
 
         PolicyEntry pe10 = new PolicyEntry(cs10, null, null);
         PolicyEntry pe11 = new PolicyEntry(cs11, null, null);
@@ -293,7 +297,9 @@ public class PolicyEntryTest extends Tes
      * otherwise tested set must contain all Principals of PolicyEntry.
      */
     public void testImpliesPrincipals() {
-        PolicyEntry pe = new PolicyEntry(null, null, null);
+        PolicyEntry pe =
+            new PolicyEntry((CodeSource) null, (Collection<Principal>) null,
+                (Collection<Permission>)null);
         Principal[] pp1 = new Principal[] {};
         Principal[] pp2 = new Principal[] { new UnresolvedPrincipal("a.b.c",
             "XXX") };
@@ -305,10 +311,12 @@ public class PolicyEntryTest extends Tes
         assertTrue(pe.impliesPrincipals(null));
         assertTrue(pe.impliesPrincipals(pp1));
 
-        pe = new PolicyEntry(null, new HashSet(), null);
+        pe = new PolicyEntry((CodeSource)null, new HashSet<Principal>(),
+                (Collection<Permission>) null);
         assertTrue(pe.impliesPrincipals(pp3));
 
-        pe = new PolicyEntry(null, Arrays.asList(pp2), null);
+        pe = new PolicyEntry((CodeSource) null, Arrays.asList(pp2),
+                (Collection<Permission>) null);
         assertFalse(pe.impliesPrincipals(null));
         assertFalse(pe.impliesPrincipals(pp1));
         assertTrue(pe.impliesPrincipals(pp3));