[java-identity-provider COMMIT] in /trunk/idp-attribute-filter-spring/src/test: java/net/shibboleth/idp/attribute/fil...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar 23 06:13:59 2015
New Revision: 7441

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7441&view=rev
Log:
Add test for a conf provided bean

Added:
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateRp.xml   (with props)
Modified:
    trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
    trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml

Modified: trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java?rev=7441&r1=7440&r2=7441&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java (original)
+++ trunk/idp-attribute-filter-spring/src/test/java/net/shibboleth/idp/attribute/filter/spring/policy/PredicateRuleParserTest.java Mon Mar 23 06:13:59 2015
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.idp.attribute.filter.PolicyRequirementRule.Tristate;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.attribute.filter.policyrule.filtercontext.impl.PredicatePolicyRule;
 import net.shibboleth.idp.attribute.filter.spring.BaseAttributeFilterParserTest;
@@ -77,6 +78,32 @@
         Assert.assertEquals(rule.getProfileContextStrategy().getClass(), Func.class);
     }
 
+    private AttributeFilterContext prcFor(String sp) {
+
+        final ProfileRequestContext prc = new ProfileRequestContext();
+        final  RelyingPartyContext rpc = prc.getSubcontext(RelyingPartyContext.class, true);rpc.setRelyingPartyId(sp);
+        return rpc.getSubcontext(AttributeFilterContext.class, true);
+    }
+    
+
+    @Test public void rp() throws Exception {
+
+        GenericApplicationContext ctx = new GenericApplicationContext();
+        SchemaTypeAwareXMLBeanDefinitionReader beanDefinitionReader = new SchemaTypeAwareXMLBeanDefinitionReader(ctx);
+
+        beanDefinitionReader.loadBeanDefinitions(new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
+                + "predicateBeans.xml"), new ClassPathResource(BaseAttributeFilterParserTest.POLICY_RULE_PATH
+                + "predicateRp.xml"));
+
+        ctx.refresh();
+
+        final PredicatePolicyRule rule = ctx.getBean(PredicatePolicyRule.class);
+        Assert.assertEquals(rule.matches(prcFor("https://example.org")), Tristate.FALSE);
+        Assert.assertEquals(rule.matches(prcFor("https://sp.example.org")), Tristate.TRUE);
+        Assert.assertEquals(rule.matches(prcFor("https://sp2.example.org")), Tristate.TRUE);
+
+    }
+
     static class Foo implements Predicate<AttributeFilterContext> {
 
         /** {@inheritDoc} */
@@ -85,7 +112,7 @@
         }
 
     }
-    
+
     static class Func implements Function<AttributeFilterContext, ProfileRequestContext> {
 
         /** {@inheritDoc} */

Modified: trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml?rev=7441&r1=7440&r2=7441&view=diff
==============================================================================
--- trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml (original)
+++ trunk/idp-attribute-filter-spring/src/test/resources/net/shibboleth/idp/attribute/filter/policyrule/predicateBeans.xml Mon Mar 23 06:13:59 2015
@@ -11,4 +11,16 @@
 		
 	<bean id="ctxStrategy"
 	   class="net.shibboleth.idp.attribute.filter.spring.policy.PredicateRuleParserTest.Func" />
+       
+    <bean id="rpPred" parent="shibboleth.Conditions.RelyingPartyId">
+        <constructor-arg>
+            <list>
+                <value>https://sp.example.org</value>
+                <value>https://sp2.example.org</value>
+            </list>
+        </constructor-arg>
+    </bean>
+    
+    <bean id="shibboleth.Conditions.RelyingPartyId" class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate" abstract="true" />
+    
 </beans>