[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/LDAPAuthent...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Jan  2 15:10:23 2014
New Revision: 5137

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5137&view=rev
Log:
Resurrect DefaultAuthenticationResultSerializerTest after deletion during refactoring (r5066) and move to authn-impl from authn-api.

Added:
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java
      - copied, changed from r5065, trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/DefaultAuthenticationResultSerializerTest.java
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/LDAPAuthenticationResult.json
      - copied unchanged from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/LDAPAuthenticationResult.json
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/complexAuthenticationResult.json
      - copied, changed from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/complexAuthenticationResult.json
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/invalid.json
      - copied unchanged from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/invalid.json
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/noFlowId.json
      - copied unchanged from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noFlowId.json
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/noInstant.json
      - copied unchanged from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noInstant.json
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/simpleAuthenticationResult.json
      - copied unchanged from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/simpleAuthenticationResult.json
    trunk/idp-authn-impl/src/test/resources/data/net/shibboleth/idp/authn/impl/symbolicAuthenticationResult.json
      - copied unchanged from r5136, trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/symbolicAuthenticationResult.json
Modified:
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/LDAPAuthenticationResult.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/complexAuthenticationResult.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/invalid.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noFlowId.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/noInstant.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/simpleAuthenticationResult.json
    trunk/idp-authn-api/src/test/resources/data/net/shibboleth/idp/authn/symbolicAuthenticationResult.json

Copied: trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java (from r5065, trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/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?p2=trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java&p1=trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/DefaultAuthenticationResultSerializerTest.java&r1=5065&r2=5137&rev=5137&view=diff
==============================================================================
--- trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/DefaultAuthenticationResultSerializerTest.java (original)
+++ trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DefaultAuthenticationResultSerializerTest.java Thu Jan  2 15:10:23 2014
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.authn;
+package net.shibboleth.idp.authn.impl;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -26,7 +26,10 @@
 import javax.security.auth.Subject;
 
 import net.shibboleth.idp.authn.AuthenticationResult;
-import net.shibboleth.idp.authn.UsernamePrincipal;
+import net.shibboleth.idp.authn.impl.principal.LdapPrincipalSerializer;
+import net.shibboleth.idp.authn.principal.PrincipalSerializer;
+import net.shibboleth.idp.authn.principal.TestPrincipal;
+import net.shibboleth.idp.authn.principal.UsernamePrincipal;
 
 import org.ldaptive.LdapAttribute;
 import org.ldaptive.LdapEntry;
@@ -39,7 +42,7 @@
 /** {@link DefaultAuthenticationResultSerializer} unit test. */
 public class DefaultAuthenticationResultSerializerTest {
 
-    private static final String DATAPATH = "/data/net/shibboleth/idp/authn/";
+    private static final String DATAPATH = "/data/net/shibboleth/idp/authn/impl/";
     
     private static final String CONTEXT = "_context";
     
@@ -56,6 +59,7 @@
     }
 
     @Test public void testInvalid() throws Exception {
+        serializer.initialize();
         try {

[... 12 lines stripped ...]