[java-identity-provider COMMIT] in /trunk/idp-authn-impl/src/test: java/net/shibboleth/idp/authn/impl/ValidateUsernam...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 22 20:10:44 2013
New Revision: 4792

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4792&view=rev
Log:
Move test data to match other modules.

Added:
    trunk/idp-authn-impl/src/test/resources/data/
    trunk/idp-authn-impl/src/test/resources/data/net/
      - copied from r4789, trunk/idp-authn-impl/src/test/resources/net/
Modified:
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
    trunk/idp-authn-impl/src/test/resources/net/

Modified: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java?rev=4792&r1=4791&r2=4792&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java (original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java Sun Sep 22 20:10:44 2013
@@ -49,6 +49,8 @@
 /** {@link ValidateUsernamePasswordAgainstJAAS} unit test. */
 public class ValidateUsernamePasswordAgainstJAASTest extends InitializeAuthenticationContextTest {
 
+    private static final String DATA_PATH = "src/test/resources/data/net/shibboleth/idp/authn/impl/";
+    
     private ValidateUsernamePasswordAgainstJAAS action;
 
     private InMemoryDirectoryServer directoryServer;
@@ -64,7 +66,7 @@
         config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", 10389));
         config.addAdditionalBindCredentials("cn=Directory Manager", "password");
         directoryServer = new InMemoryDirectoryServer(config);
-        directoryServer.importFromLDIF(true, "src/test/resources/net/shibboleth/idp/authn/impl/loginLDAPTest.ldif");
+        directoryServer.importFromLDIF(true, DATA_PATH + "loginLDAPTest.ldif");
         directoryServer.startListening();
     }
 
@@ -138,7 +140,7 @@
         action.setLoginConfigType("JavaLoginConfig");
         System.out.println(getCurrentDir());
         action.setLoginConfigParameters(new URIParameter(UriSupport.fileURIFromAbsolutePath(getCurrentDir()
-                + "/src/test/resources/net/shibboleth/idp/authn/impl/jaas.config")));
+                + '/' + DATA_PATH + "jaas.config")));
         action.initialize();
 
         doExtract(prc);
@@ -162,7 +164,7 @@
         action.setLoginConfigType("JavaLoginConfig");
         System.out.println(getCurrentDir());
         action.setLoginConfigParameters(new URIParameter(UriSupport.fileURIFromAbsolutePath(getCurrentDir()
-                + "/src/test/resources/net/shibboleth/idp/authn/impl/jaas.config")));
+                + '/' + DATA_PATH + "jaas.config")));
         action.initialize();
 
         doExtract(prc);
@@ -187,7 +189,7 @@
         action.setLoginConfigType("JavaLoginConfig");
         System.out.println(getCurrentDir());
         action.setLoginConfigParameters(new URIParameter(UriSupport.fileURIFromAbsolutePath(getCurrentDir()
-                + "/src/test/resources/net/shibboleth/idp/authn/impl/jaas.config")));
+                + '/' + DATA_PATH + "jaas.config")));
         action.initialize();
 
         doExtract(prc);