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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct 21 05:08:49 2014
New Revision: 6752

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6752&view=rev
Log:
IDP-203 tests for AttributeInMetadataRule parser, plus three bug fixes flushed thereby

Added:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParserTest.java   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/entityAttributeInMetadata.xml   (with props)
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/matcher/requestedInMetadata.xml   (with props)
Modified:
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
    trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/BaseAttributeFilterParserTest.java

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java?rev=6752&r1=6751&r2=6752&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/MatcherFromPolicy.java Tue Oct 21 05:08:49 2014
@@ -59,6 +59,14 @@
         super(theRule);
         rule = theRule;
     }
+    
+    /** Testing support.  Get the embedded PolicyRequirementRule.
+     * @return the embedded matcher.
+     */
+    @Nonnull public PolicyRequirementRule getPolicyRequirementRule() {
+        return rule;
+    }
+
 
     /** {@inheritDoc} */
     @Override

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java?rev=6752&r1=6751&r2=6752&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcher.java Tue Oct 21 05:08:49 2014
@@ -53,6 +53,13 @@
         super(theMatcher);
         matcher = theMatcher;
     }
+    
+    /** Testing support.  Get the embedded matcher.
+     * @return the embedded matcher.
+     */
+    @Nonnull public Matcher getMatcher() {
+        return matcher;
+    }
 
     /** {@inheritDoc} */
     @Override

Modified: trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java?rev=6752&r1=6751&r2=6752&view=diff
==============================================================================
--- trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java (original)
+++ trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filter/PolicyFromMatcherId.java Tue Oct 21 05:08:49 2014
@@ -69,6 +69,13 @@
         return attributeId; 
     }
 
+    /** Testing support.  Get the embedded matcher.
+     * @return the embedded matcher.
+     */
+    @Nonnull public Matcher getMatcher() {
+        return theMatcher;
+    }
+
     /** {@inheritDoc} */
     @Override
     @Nonnull public Tristate matches(@Nonnull AttributeFilterContext context) {

Modified: trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java?rev=6752&r1=6751&r2=6752&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java (original)
+++ trunk/idp-attribute-filter-spring/src/main/java/net/shibboleth/idp/attribute/filter/spring/saml/AttributeInMetadataRuleParser.java Tue Oct 21 05:08:49 2014
@@ -75,12 +75,12 @@
         }
 

[... 56 lines stripped ...]