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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Mar  4 22:09:40 2016
New Revision: 8131

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8131&view=rev
Log:
IDP-311 -Make test resource path consistent across modules

https://issues.shibboleth.net/jira/browse/IDP-311

Added:
    trunk/idp-authn-impl/src/test/resources/net/
      - copied from r8128, trunk/idp-authn-impl/src/test/resources/data/net/
    trunk/idp-session-impl/src/test/resources/net/
      - copied from r8128, trunk/idp-session-impl/src/test/resources/data/net/
Modified:
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstLDAPTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/X509ResourceCredentialConfigTest.java
    trunk/idp-authn-impl/src/test/resources/data/
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializerTest.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/StorageBackedIdPSessionSerializerTest.java
    trunk/idp-session-impl/src/test/resources/data/

Modified: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java?rev=8131&r1=8130&r2=8131&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java	(original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java	Fri Mar  4 22:09:40 2016
@@ -57,7 +57,7 @@
 /** {@link DefaultAuthenticationResultSerializer} unit test. */
 public class DefaultAuthenticationResultSerializerTest {
 
-    private static final String DATAPATH = "/data/net/shibboleth/idp/authn/impl/";
+    private static final String DATAPATH = "/net/shibboleth/idp/authn/impl/";
     
     private static final String CONTEXT = "_context";
     
@@ -136,8 +136,8 @@
     }
 
     @Test public void testCreds() throws Exception {
-        final ClassPathResource keystoreResource = new ClassPathResource("/data/net/shibboleth/idp/authn/impl/SealerKeyStore.jks");
-        final ClassPathResource versionResource = new ClassPathResource("/data/net/shibboleth/idp/authn/impl/SealerKeyStore.kver");
+        final ClassPathResource keystoreResource = new ClassPathResource("/net/shibboleth/idp/authn/impl/SealerKeyStore.jks");
+        final ClassPathResource versionResource = new ClassPathResource("/net/shibboleth/idp/authn/impl/SealerKeyStore.kver");
 
         final BasicKeystoreKeyStrategy strategy = new BasicKeystoreKeyStrategy();
         strategy.setKeyAlias("secret");

Modified: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java?rev=8131&r1=8130&r2=8131&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java	(original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/KeystoreResourceCredentialConfigTest.java	Fri Mar  4 22:09:40 2016
@@ -35,7 +35,7 @@
  */
 public class KeystoreResourceCredentialConfigTest {
 
-    private static final String DATAPATH = "/data/net/shibboleth/idp/authn/impl/";
+    private static final String DATAPATH = "/net/shibboleth/idp/authn/impl/";
 
     @DataProvider(name = "resources")
     public Object[][] getResources() throws Exception {

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=8131&r1=8130&r2=8131&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	Fri Mar  4 22:09:40 2016
@@ -60,7 +60,7 @@
 /** {@link ValidateUsernamePasswordAgainstJAAS} unit test. */
 public class ValidateUsernamePasswordAgainstJAASTest extends PopulateAuthenticationContextTest {
 

[... 66 lines stripped ...]