svn commit: r943354 - 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 02:03:06 2010
New Revision: 943354

URL: http://svn.apache.org/viewvc?rev=943354&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=943354&r1=943353&r2=943354&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 02:03:06 2010
@@ -61,7 +61,8 @@ public class ConcurrentPolicyFileTest ex
             this.content = content;
         }
 
-        public Collection parse(URL location, Properties system)
+        @Override
+        public Collection<PolicyEntry> parse(URL location, Properties system)
             throws Exception {
             if (content != null) {
                 return Arrays.asList(content);
@@ -106,6 +107,7 @@ public class ConcurrentPolicyFileTest ex
 
     /**
      * Tests proper policy evaluation for CodeSource parameters.
+     * @throws java.lang.Exception 
      */
     public void testGetPermissions_CodeSource() throws Exception {
         CodeSource cs = new CodeSource(null, (Certificate[])null);
@@ -116,7 +118,7 @@ public class ConcurrentPolicyFileTest ex
         Permission sp3 = new SecurityPermission("ccc");
         PolicyEntry pe1 = new PolicyEntry(cs, null, Arrays
             .asList(new Permission[] { sp1 }));
-        PolicyEntry pe2 = new PolicyEntry(cs2, new HashSet(), Arrays
+        PolicyEntry pe2 = new PolicyEntry(cs2, new HashSet<Principal>(), Arrays
             .asList(new Permission[] { sp2 }));
         PolicyEntry pe3 = new PolicyEntry(cs, Arrays
             .asList(new Principal[] { new FakePrincipal("qqq") }), Arrays
@@ -136,6 +138,7 @@ public class ConcurrentPolicyFileTest ex
 
     /**
      * Tests proper policy evaluation for ProtectionDomain parameters.
+     * @throws java.lang.Exception 
      */
     public void testGetPermissions_ProtectionDomain() throws Exception {
         Permission sp1 = new SecurityPermission("aaa");

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=943354&r1=943353&r2=943354&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 02:03:06 2010
@@ -57,20 +57,21 @@ public class PolicyEntryTest extends Tes
         assertTrue(pe.getPermissions().isEmpty());
 
         pe = new PolicyEntry(new CodeSource(null, (Certificate[])null),
-            new ArrayList(), new ArrayList());
+            new ArrayList<Principal>(), new ArrayList<Permission>());
         assertTrue(pe.isVoid());
         assertTrue(pe.getPermissions().isEmpty());
 
-        Collection perms = Arrays.asList(new Permission[] {
+        Collection<Permission> perms = Arrays.asList(new Permission[] {
             new SecurityPermission("dsfg"), new AllPermission() });
         pe = new PolicyEntry((CodeSource) null, (Collection<Principal>) null, perms);
         assertFalse(pe.isVoid());
-        assertEquals(perms, new ArrayList(pe.getPermissions()));
+        assertEquals(perms, new ArrayList<Permission>(pe.getPermissions()));
     }
 
     /**
      * Null CodeSource of PolicyEntry implies any CodeSource; non-null
      * CodeSource should delegate to its own imply() functionality
+     * @throws java.lang.Exception 
      */
     public void testImpliesCodeSource() throws Exception {
         CodeSource cs0  = new CodeSource(null, (Certificate[]) null);