[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/test: java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Mar 12 10:54:50 2014
New Revision: 5558

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5558&view=rev
Log:
IDP-277 Move some test files around prior to adding more parsers

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
      - copied, changed from r5556, trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/file.properties
      - copied unchanged from r5547, trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML.properties
Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1AttributeQueryTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2AttributeQueryTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ECPProfileTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML.properties
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/beans.xml

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java?rev=5558&r1=5557&r2=5558&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/BaseSAMLProfileTest.java Wed Mar 12 10:54:50 2014
@@ -36,7 +36,7 @@
 
 public class BaseSAMLProfileTest  extends OpenSAMLInitBaseTestCase {
     
-    private static final String PATH = "/net/shibboleth/idp/profile/spring/relyingparty/saml/";
+    private static final String PATH = "/net/shibboleth/idp/profile/spring/relyingparty/";
     
     protected <T extends AbstractSAMLProfileConfiguration> T getBean(Class<T> claz,  boolean validating, String... files){
         final Resource[] resources = new Resource[files.length];

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java?rev=5558&r1=5557&r2=5558&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java Wed Mar 12 10:54:50 2014
@@ -30,7 +30,7 @@
 
     @Test public void defaults() {
 
-        SingleLogoutProfileConfiguration profile = getBean(SingleLogoutProfileConfiguration.class, true, "logout.xml");
+        SingleLogoutProfileConfiguration profile = getBean(SingleLogoutProfileConfiguration.class, true, "saml/logout.xml");
 
         // defaults for AbstractSAML2ProfileConfiguration
 
@@ -52,7 +52,7 @@
 
     @Test public void values() {
         SingleLogoutProfileConfiguration profile =
-                getBean(SingleLogoutProfileConfiguration.class, false, "beans.xml", "logoutValues.xml");
+                getBean(SingleLogoutProfileConfiguration.class, false, "beans.xml", "saml/logoutValues.xml");
 
         assertTruePredicate(profile.getEncryptAssertionsPredicate());
         assertFalsePredicate(profile.getEncryptNameIDsPredicate());

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java?rev=5558&r1=5557&r2=5558&view=diff

[... 191 lines stripped ...]