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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Jun 25 11:19:45 2014
New Revision: 6170

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6170&view=rev
Log:
Start to code up end to end tests for AttributeInMetadata and EntityAttributeInMetadata tests

Added:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java
      - copied, changed from r6167, trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForResolver.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java   (with props)
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/SpoofSAMLMessage.java   (with props)
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/TestAfterFilter.java   (with props)
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/package-info.java   (with props)
    trunk/idp-conf/src/test/resources/mapping/
    trunk/idp-conf/src/test/resources/mapping/configs/
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-filter.xml   (with props)
    trunk/idp-conf/src/test/resources/mapping/configs/attribute-resolver.xml   (with props)
    trunk/idp-conf/src/test/resources/mapping/configs/override.xml   (with props)
    trunk/idp-conf/src/test/resources/mapping/test-webflow-config.xml   (with props)
    trunk/idp-conf/src/test/resources/mapping/webflows/
    trunk/idp-conf/src/test/resources/mapping/webflows/beans.xml   (with props)
    trunk/idp-conf/src/test/resources/mapping/webflows/resolveAndFilter-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForResolver.java
    trunk/idp-conf/src/test/resources/c14n/webflows/beans.xml

Copied: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java (from r6167, trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForResolver.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java?p2=trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java&p1=trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForResolver.java&r1=6167&r2=6170&rev=6170&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/c14n/actions/SetupForResolver.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/SetupForResolver.java Wed Jun 25 11:19:45 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.test.flows.c14n.actions;
+package net.shibboleth.idp.test.flows;
 
 import javax.annotation.Nonnull;
 
@@ -23,13 +23,9 @@
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
-import net.shibboleth.idp.test.flows.AbstractFlowTest;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
-/**
- *
- */
 public class SetupForResolver extends AbstractProfileAction {
     
     @Override

Modified: trunk/idp-conf/src/test/resources/c14n/webflows/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/c14n/webflows/beans.xml?rev=6170&r1=6169&r2=6170&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/c14n/webflows/beans.xml (original)
+++ trunk/idp-conf/src/test/resources/c14n/webflows/beans.xml Wed Jun 25 11:19:45 2014
@@ -14,7 +14,7 @@
 		class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext"
 		scope="prototype" p:profileId="test_flow" />
 		
-		<bean id="PopulateResolution" class = "net.shibboleth.idp.test.flows.c14n.actions.SetupForResolver"  scope="prototype" />
+		<bean id="PopulateResolution" class = "net.shibboleth.idp.test.flows.SetupForResolver"  scope="prototype" />
         <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" c:resolverService-ref="shibboleth.AttributeResolverService" scope="prototype" />
         <bean id="PopulateSAML2C14N" class = "net.shibboleth.idp.test.flows.c14n.actions.SetupForSAML2C14N"  scope="prototype" p:attributeName="transientId" />
         <bean id="PopulateSAML2C14NCrypto" class = "net.shibboleth.idp.test.flows.c14n.actions.SetupForSAML2C14N"  scope="prototype" p:attributeName="cryptoTransientId" />