[java-identity-provider COMMIT] in /trunk/idp-conf/src/test: java/net/shibboleth/idp/test/flows/AbstractFlowTest.java...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep  8 20:37:32 2014
New Revision: 6510

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6510&view=rev
Log:
Override c14n beans to avoid need to modify after init.

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
    trunk/idp-conf/src/test/resources/test/test-beans.xml

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=6510&r1=6509&r2=6510&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java Mon Sep  8 20:37:32 2014
@@ -353,24 +353,4 @@
         map.put("jdoe", ipRanges);
     }
 
-    /**
-     * Configure Direct NameID c14n by overriding the activation condition attached to the Direct c14n descriptors.
-     */
-    @BeforeMethod public void overrideDirectNamePredicates() {
-
-        Predicate<ProfileRequestContext> condition =
-                Predicates.and(new NameIdentifierCanonicalization.ActivationCondition(), new RelyingPartyIdPredicate(
-                        Collections.singletonList(SP_ENTITY_ID)));
-
-        SubjectCanonicalizationFlowDescriptor c14n =
-                applicationContext.getBean(SAML1_TRANSFORM_C14N_BEAN_NAME, SubjectCanonicalizationFlowDescriptor.class);
-        c14n.setActivationCondition(condition);
-
-        condition =
-                Predicates.and(new NameIDCanonicalization.ActivationCondition(), new RelyingPartyIdPredicate(
-                        Collections.singletonList(SP_ENTITY_ID)));
-
-        c14n = applicationContext.getBean(SAML2_TRANSFORM_C14N_BEAN_NAME, SubjectCanonicalizationFlowDescriptor.class);
-        c14n.setActivationCondition(condition);
-    }
 }

Modified: trunk/idp-conf/src/test/resources/test/test-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/test/test-beans.xml?rev=6510&r1=6509&r2=6510&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/test/test-beans.xml (original)
+++ trunk/idp-conf/src/test/resources/test/test-beans.xml Mon Sep  8 20:37:32 2014
@@ -27,4 +27,34 @@
         c:entityCertificate-ref="test.idp.X509Certificate"
         p:entityId="${idp.entityID}" />
 
+    <!-- Override beans from system/conf/subject-c14n-system.xml. -->
+
+    <bean id="c14n/SAML2Transform" parent="shibboleth.AbstractSAML2C14NFlowBean"
+            p:formats-ref="shibboleth.NameTransformFormats">
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="and">
+                <constructor-arg>
+                    <list>
+                        <bean class="net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization.ActivationCondition" />
+                        <bean parent="shibboleth.Conditions.RelyingPartyId" c:candidates="#{{'https://sp.example.org'}}"  />
+                    </list>
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+               
+    <bean id="c14n/SAML1Transform" parent="shibboleth.AbstractSAML1C14NFlowBean"
+            p:formats-ref="shibboleth.NameTransformFormats"> 
+        <property name="activationCondition">
+            <bean class="com.google.common.base.Predicates" factory-method="and">
+                <constructor-arg>
+                    <list>
+                        <bean class="net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization.ActivationCondition" />
+                        <bean parent="shibboleth.Conditions.RelyingPartyId" c:candidates="#{{'https://sp.example.org'}}"  />
+                    </list>
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+
 </beans>