[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 21:32:40 2014
New Revision: 6511

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6511&view=rev
Log:
Separate override beans for tests.

Added:
    trunk/idp-conf/src/test/resources/test/override-beans.xml   (with props)
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=6511&r1=6510&r2=6511&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 21:32:40 2014
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -29,10 +28,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import net.shibboleth.ext.spring.factory.X509CertificateFactoryBean;
-import net.shibboleth.idp.authn.SubjectCanonicalizationFlowDescriptor;
-import net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate;
-import net.shibboleth.idp.saml.nameid.impl.NameIDCanonicalization;
-import net.shibboleth.idp.saml.nameid.impl.NameIdentifierCanonicalization;
 import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.idp.test.InMemoryDirectory;
 import net.shibboleth.idp.test.PreferFileSystemContextLoader;
@@ -85,15 +80,13 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
 import com.unboundid.ldap.sdk.LDAPException;
 
 /**
  * Abstract flow test.
  */
 @ContextConfiguration(locations = {"/system/conf/global-system.xml", "/system/conf/mvc-beans.xml",
-        "/system/conf/webflow-config.xml", "/test/test-beans.xml"},
+        "/system/conf/webflow-config.xml", "/test/test-beans.xml", "/test/override-beans.xml", },
         initializers = IdPPropertiesApplicationContextInitializer.class, loader = PreferFileSystemContextLoader.class)
 @WebAppConfiguration
 public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests {

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=6511&r1=6510&r2=6511&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 21:32:40 2014
@@ -27,34 +27,4 @@
         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>