Added a few tests for ARP filtering.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@384 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/ArpEngine.java b/src/edu/internet2/middleware/shibboleth/aa/arp/ArpEngine.java
index 0d7faf7..e531e7a 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/ArpEngine.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/ArpEngine.java
@@ -255,7 +255,7 @@ public class ArpEngine {
                                        continue;
                                }
                                if (attributes[i].denyAnyValue()) {
                                        continue;
                                }
                                if (attributes[i].denyAnyValue()) {

-                                       ((Rule.Attribute) canonicalSpec.get(attributes[i].getName())).setAnyValueDeny(true);
+                                       ((Rule.Attribute) canonicalSpec.get(attributes[i].getName().toString())).setAnyValueDeny(true);

                                        continue;
                                }
                                if (attributes[i].releaseAnyValue()) {
                                        continue;
                                }
                                if (attributes[i].releaseAnyValue()) {

diff --git a/src/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java b/src/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java
index 3ac9802..7e32444 100755 (executable)
--- a/src/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/arp/ArpTests.java
@@ -57,6 +57,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.Principal;
 import java.util.Arrays;
 import java.net.URL;
 import java.security.Principal;
 import java.util.Arrays;

+import java.util.HashSet;

 import java.util.Properties;
 
 import junit.framework.TestCase;
 import java.util.Properties;
 
 import junit.framework.TestCase;

@@ -477,13 +478,11 @@ public class ArpTests extends TestCase {
                                        principal1,
                                        "shar.example.edu",
                                        url1);
                                        principal1,
                                        "shar.example.edu",
                                        url1);

-                       for (int i = 0; releaseAttributes.length > i; i++) {
-                               Object[] values = releaseAttributes[i].getValues();
-                               for (int j = 0; values.length > j; j++) {
-                                       System.err.println(values[j]);
-                               }
-                       }
-                       System.err.println("---");
+                       assertEquals(
+                               "ARP not applied as expected.",
+                               new HashSet(Arrays.asList(releaseAttributes)),
+                               new HashSet(Arrays.asList(new ArpAttribute[] { testAttribute1 })));
+

                        //Test with site and user ARPs
                        inStream = new FileInputStream("test/arp7.xml");
                        parser.parse(new InputSource(inStream));
                        //Test with site and user ARPs
                        inStream = new FileInputStream("test/arp7.xml");
                        parser.parse(new InputSource(inStream));

@@ -497,26 +496,24 @@ public class ArpTests extends TestCase {
                                        principal1,
                                        "shar.example.edu",
                                        url1);
                                        principal1,
                                        "shar.example.edu",
                                        url1);

-                       for (int i = 0; releaseAttributes.length > i; i++) {
-                               Object[] values = releaseAttributes[i].getValues();
-                               for (int j = 0; values.length > j; j++) {
-                                       System.err.println(values[j]);
-                               }
-                       }
-                       System.err.println("---");
+                       assertEquals(
+                               "ARP not applied as expected.",
+                               new HashSet(Arrays.asList(releaseAttributes)),
+                               new HashSet(Arrays.asList(new ArpAttribute[] { testAttribute1, testAttribute2 })));
+
+                       //Test with site and user ARPs

                        releaseAttributes =
                                engine.filterAttributes(
                                        new ArpAttribute[] { testAttribute1, testAttribute2 },
                                        principal1,
                                        "shar1.example.edu",
                                        url1);
                        releaseAttributes =
                                engine.filterAttributes(
                                        new ArpAttribute[] { testAttribute1, testAttribute2 },
                                        principal1,
                                        "shar1.example.edu",
                                        url1);

-                       for (int i = 0; releaseAttributes.length > i; i++) {
-                               Object[] values = releaseAttributes[i].getValues();
-                               for (int j = 0; values.length > j; j++) {
-                                       System.err.println(values[j]);
-                               }
-                       }
-                       System.err.println("---");
+                       assertEquals(
+                               "ARP not applied as expected.",
+                               new HashSet(Arrays.asList(releaseAttributes)),
+                               new HashSet(Arrays.asList(new ArpAttribute[] { testAttribute1 })));
+
+                       //Test with site and user ARPs

                        inStream = new FileInputStream("test/arp6.xml");
                        parser.parse(new InputSource(inStream));
                        Arp arp6 = new Arp();
                        inStream = new FileInputStream("test/arp6.xml");
                        parser.parse(new InputSource(inStream));
                        Arp arp6 = new Arp();

@@ -529,12 +526,10 @@ public class ArpTests extends TestCase {
                                        principal1,
                                        "shar.example.edu",
                                        url1);
                                        principal1,
                                        "shar.example.edu",
                                        url1);

-                       for (int i = 0; releaseAttributes.length > i; i++) {
-                               Object[] values = releaseAttributes[i].getValues();
-                               for (int j = 0; values.length > j; j++) {
-                                       System.err.println(values[j]);
-                               }
-                       }
+                       assertEquals(
+                               "ARP not applied as expected.",
+                               new HashSet(Arrays.asList(releaseAttributes)),
+                               new HashSet());

 
                } catch (Exception e) {
                        e.printStackTrace();
 
                } catch (Exception e) {
                        e.printStackTrace();

@@ -571,13 +566,14 @@ public class ArpTests extends TestCase {
                public void setValues(Object[] values) {
                        this.values = values;
                }
                public void setValues(Object[] values) {
                        this.values = values;
                }

-               
+

                public boolean equals(Object object) {
                        if (!(object instanceof TestAttribute)) {
                                return false;
                        }
                        //finish this
                public boolean equals(Object object) {
                        if (!(object instanceof TestAttribute)) {
                                return false;
                        }
                        //finish this

-                       return super.equals(object);
+                       return (new HashSet(Arrays.asList(values))).equals(
+                               Arrays.asList(((TestAttribute) object).getValues()));

                }
 
        }
                }
 
        }