[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/system/conf/mvc-beans.xml test/java/net/shibbo...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 14 18:26:30 2014
New Revision: 6527

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6527&view=rev
Log:
IDP-474 - Fix tests, unmap MVC resource paths.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSimpleSignSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2RedirectSSOFlowTest.java
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2UnsolicitedSSOFlowTest.java

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=6527&r1=6526&r2=6527&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml Sun Sep 14 18:26:30 2014
@@ -20,8 +20,10 @@
 
     <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" p:order="2" />
 
+    <!--
     <mvc:resources mapping="/css/**" location="/css/" />
     <mvc:resources mapping="/images/**" location="/images/" />
+    -->
 
     <!-- HandlerAdapters: These aren't ordered. Add the WebFlow one, then the standard Spring MVC default ones. 
          Have to enumerate them all explicitly b/c we're overriding the built-in defaults. -->

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java?rev=6527&r1=6526&r2=6527&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1AttributeQueryFlowTest.java Sun Sep 14 18:26:30 2014
@@ -45,7 +45,7 @@
 public class SAML1AttributeQueryFlowTest extends AbstractSAML1FlowTest {
 
     /** Flow id. */
-    @Nonnull public final static String FLOW_ID = "profile/SAML1/SOAP/AttributeQuery";
+    @Nonnull public final static String FLOW_ID = "SAML1/SOAP/AttributeQuery";
 
     /** SAML 1 Response validator. */
     @Nullable private SAML1TestResponseValidator validator;

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java?rev=6527&r1=6526&r2=6527&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml1/SAML1UnsolicitedSSOFlowTest.java Sun Sep 14 18:26:30 2014
@@ -32,7 +32,7 @@
 public class SAML1UnsolicitedSSOFlowTest extends AbstractSAML1FlowTest {
 
     /** The flow id. */
-    @Nonnull public final static String FLOW_ID = "profile/Shibboleth/SSO";
+    @Nonnull public final static String FLOW_ID = "Shibboleth/SSO";
 
     /**
      * Test the SAML1 unsolicited SSO flow.

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java?rev=6527&r1=6526&r2=6527&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2AttributeQueryFlowTest.java Sun Sep 14 18:26:30 2014
@@ -45,7 +45,7 @@
 public class SAML2AttributeQueryFlowTest extends AbstractSAML2FlowTest {
 
     /** Flow id. */
-    @Nonnull public final static String FLOW_ID = "profile/SAML2/SOAP/AttributeQuery";
+    @Nonnull public final static String FLOW_ID = "SAML2/SOAP/AttributeQuery";
 
     /** SAML 2 Response validator. */
     @Nullable private SAML2TestResponseValidator validator;

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2POSTSSOFlowTest.java

[... 86 lines stripped ...]