[java-idp-testbed COMMIT] in /trunk/src/test/java/idp: saml1/SAML1UnsolicitedFlowTest.java saml2/SAML2RedirectSSOFlow...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar 27 16:58:25 2014
New Revision: 172

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=172&view=rev
Log:
Fix constants in tests.

Modified:
    trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
    trunk/src/test/java/idp/saml2/SAML2UnsolicitedFlowTest.java

Modified: trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java?rev=172&r1=171&r2=172&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/SAML1UnsolicitedFlowTest.java Thu Mar 27 16:58:25 2014
@@ -22,6 +22,7 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.idp.saml.impl.profile.BaseIdPInitiatedSSORequestMessageDecoder;
+import net.shibboleth.idp.saml.xml.SAMLConstants;
 
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -120,7 +121,7 @@
         Assert.assertNotNull(authnStmt.getSubject().getNameIdentifier());
         //Assert.assertEquals(authnStmt.getSubject().getNameIdentifier().getFormat(), NameIdentifier.EMAIL);
         //Assert.assertEquals(authnStmt.getSubject().getNameIdentifier().getNameIdentifier(), "jdoe at shibboleth.net");
-        Assert.assertEquals(authnStmt.getSubject().getNameIdentifier().getFormat(), "urn:mace:shibboleth:1.0:nameIdentifier");
+        Assert.assertEquals(authnStmt.getSubject().getNameIdentifier().getFormat(), SAMLConstants.SAML1_NAMEID_TRANSIENT);
         Assert.assertEquals(authnStmt.getSubject().getNameIdentifier().getNameQualifier(), "https://idp.example.org");
 
         // TODO is this correct ?
@@ -142,7 +143,7 @@
         Assert.assertNotNull(attrStmt.getSubject().getNameIdentifier());
         //Assert.assertEquals(attrStmt.getSubject().getNameIdentifier().getFormat(), NameIdentifier.EMAIL);
         //Assert.assertEquals(attrStmt.getSubject().getNameIdentifier().getNameIdentifier(), "jdoe at shibboleth.net");
-        Assert.assertEquals(attrStmt.getSubject().getNameIdentifier().getFormat(), "urn:mace:shibboleth:1.0:nameIdentifier");
+        Assert.assertEquals(attrStmt.getSubject().getNameIdentifier().getFormat(), SAMLConstants.SAML1_NAMEID_TRANSIENT);
         Assert.assertEquals(attrStmt.getSubject().getNameIdentifier().getNameQualifier(), "https://idp.example.org");
 
         // TODO is this correct ?
@@ -159,14 +160,14 @@
         // TODO attribute ordering ?
         Attribute epaAttr = attrStmt.getAttributes().get(0);
         Assert.assertEquals(epaAttr.getAttributeName(), "urn:mace:dir:attribute-def:eduPersonAffiliation");
-        Assert.assertEquals(epaAttr.getAttributeNamespace(), "urn:mace:shibboleth:1.0:attributeNamespace:uri");
+        Assert.assertEquals(epaAttr.getAttributeNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
         Assert.assertEquals(epaAttr.getAttributeValues().size(), 1);
         Assert.assertTrue(epaAttr.getAttributeValues().get(0) instanceof XSString);
         Assert.assertEquals(((XSString) epaAttr.getAttributeValues().get(0)).getValue(), "member");
 
         Attribute mailAttr = attrStmt.getAttributes().get(1);
         Assert.assertEquals(mailAttr.getAttributeName(), "urn:mace:dir:attribute-def:mail");
-        Assert.assertEquals(mailAttr.getAttributeNamespace(), "urn:mace:shibboleth:1.0:attributeNamespace:uri");
+        Assert.assertEquals(mailAttr.getAttributeNamespace(), SAMLConstants.SAML1_ATTR_NAMESPACE_URI);
         Assert.assertEquals(mailAttr.getAttributeValues().size(), 1);
         Assert.assertTrue(mailAttr.getAttributeValues().get(0) instanceof XSString);
         Assert.assertEquals(((XSString) mailAttr.getAttributeValues().get(0)).getValue(), "jdoe at shibboleth.net");

Modified: trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java?rev=172&r1=171&r2=172&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/SAML2RedirectSSOFlowTest.java Thu Mar 27 16:58:25 2014
@@ -47,9 +47,11 @@
 import org.opensaml.saml.saml2.core.AttributeStatement;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.core.Issuer;
+import org.opensaml.saml.saml2.core.NameID;
 import org.opensaml.saml.saml2.core.NameIDPolicy;
 import org.opensaml.saml.saml2.core.Response;
 import org.opensaml.saml.saml2.core.StatusCode;
+import org.opensaml.saml.saml2.core.Subject;
 import org.opensaml.saml.saml2.metadata.SingleSignOnService;
 import org.opensaml.security.credential.Credential;
 import org.opensaml.xmlsec.SignatureSigningParameters;
@@ -150,7 +152,7 @@
         // TODO attribute ordering ?

[... 59 lines stripped ...]