[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jul 17 11:04:12 2013
New Revision: 4586

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4586&view=rev
Log:
IDP207 Add parser (and test) for NumOfAttributeValuesPolicyRule

Added:
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/NumOfAttributeValuesRuleParser.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/NumOfAttributeValuesRuleParserTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/numberAttrValues.xml   (with props)
Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRule.java
    trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRuleTest.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/basic/AttributeFilterBasicNamespaceHandler.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/policyrule/AbstractStringPolicyRuleParser.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRule.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRule.java?rev=4586&r1=4585&r2=4586&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRule.java (original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRule.java Wed Jul 17 11:04:12 2013
@@ -107,7 +107,7 @@
      * 
      * @return Returns the minimumValues.
      */
-    public int getMinimumValues() {
+    public int getMinimum() {
         return minimumValues;
     }
 
@@ -116,7 +116,7 @@
      * 
      * @param minValues The minimumValues to set.
      */
-    public void setMinimumValues(int minValues) {
+    public void setMinimum(int minValues) {
         minimumValues =  (int) Constraint.isGreaterThanOrEqual(0, minValues, "min value must be >= 0");
     }
 
@@ -125,7 +125,7 @@
      * 
      * @return Returns the maximumValues.
      */
-    public int getMaximumValues() {
+    public int getMaximum() {
         return maximumValues;
     }
 
@@ -134,7 +134,7 @@
      * 
      * @param maxValues The maximumValues to set.
      */
-    public void setMaximumValues(int maxValues) {
+    public void setMaximum(int maxValues) {
         maximumValues = (int) Constraint.isGreaterThan(0, maxValues, "max value must be > 0");
     }
 

Modified: trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRuleTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRuleTest.java?rev=4586&r1=4585&r2=4586&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRuleTest.java (original)
+++ trunk/idp-attribute-filter-impl/src/test/java/net/shibboleth/idp/attribute/filter/impl/policyrule/filtercontext/NumOfAttributeValuesPolicyRuleTest.java Wed Jul 17 11:04:12 2013
@@ -45,14 +45,14 @@
         
         rule.setId("id");
         rule.setAttributeId(attrId);
-        rule.setMaximumValues(testMax);
-        rule.setMinimumValues(testMin);
+        rule.setMaximum(testMax);
+        rule.setMinimum(testMin);
 
         rule.initialize();
         
         Assert.assertEquals(rule.getAttributeId(), attrId);
-        Assert.assertEquals(rule.getMaximumValues(), testMax);
-        Assert.assertEquals(rule.getMinimumValues(), testMin);
+        Assert.assertEquals(rule.getMaximum(), testMax);
+        Assert.assertEquals(rule.getMinimum(), testMin);
     }
     
     @Test(expectedExceptions={ComponentInitializationException.class,}) 
@@ -75,7 +75,7 @@
         NumOfAttributeValuesPolicyRule rule = new NumOfAttributeValuesPolicyRule();
         rule.setId("id");
         rule.setAttributeId(attrId);
-        rule.setMinimumValues(testMax);
+        rule.setMinimum(testMax);
         rule.initialize();
     }
     
@@ -90,14 +90,14 @@
     public void badMin()  {
         NumOfAttributeValuesPolicyRule rule = new NumOfAttributeValuesPolicyRule();
         rule.setId("id");
-        rule.setMinimumValues(-6);

[... 79 lines stripped ...]