[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: Sat Mar  8 12:51:51 2014
New Revision: 5549

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5549&view=rev
Log:
IDP-277 Fix tests

Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml

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=5549&r1=5548&r2=5549&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java Sat Mar  8 12:51:51 2014
@@ -35,7 +35,7 @@
         // defaults for AbstractSAMLProfileConfiguration
         assertConditionalPredicate(profile.getSignRequestsPredicate());
         assertFalsePredicate(profile.getSignAssertionsPredicate());
-        assertFalsePredicate(profile.getSignResponsesPredicate());
+        assertConditionalPredicate(profile.getSignResponsesPredicate());
         Assert.assertEquals(profile.getAssertionLifetime(), 5 * 60 * 1000);
         Assert.assertTrue(profile.getAdditionalAudiencesForAssertion().isEmpty());
         Assert.assertTrue(profile.includeConditionsNotBefore());
@@ -44,7 +44,7 @@
 
     @Test public void values() {
         ArtifactResolutionProfileConfiguration profile =
-                getBean(ArtifactResolutionProfileConfiguration.class, true, "beans.xml", "saml1artifactValues.xml");
+                getBean(ArtifactResolutionProfileConfiguration.class, false, "beans.xml", "saml1artifactValues.xml");
 
         assertFalsePredicate(profile.getSignRequestsPredicate());
         assertFalsePredicate(profile.getSignAssertionsPredicate());
@@ -54,12 +54,12 @@
 
         final Set<String> audiences = profile.getAdditionalAudiencesForAssertion();
         Assert.assertEquals(audiences.size(), 1);
-        Assert.assertEquals(audiences.iterator().next(), "NibbleAHappyWarthog");
+        Assert.assertEquals(audiences.iterator().next(), "NibbleAHappyWarthogNibbleAHappyWarthog");
 
         Assert.assertFalse(profile.includeConditionsNotBefore());
 
         final SAMLArtifactConfiguration artifact = profile.getArtifactConfiguration();
-        Assert.assertEquals(artifact.getArtifactResolutionServiceURL(), "https://idp.example.org/Artifact1");
+        Assert.assertEquals(artifact.getArtifactResolutionServiceURL(), "https://idp.example.org/Artifact/SAML1");
         Assert.assertEquals(artifact.getArtifactType().intValue(), 12340);
         Assert.assertEquals(artifact.getArtifactResolutionServiceIndex().intValue(), 43210);
 

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml?rev=5549&r1=5548&r2=5549&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml1artifactValues.xml Sat Mar  8 12:51:51 2014
@@ -5,9 +5,7 @@
 
 	xsi:type="saml:SAML1ArtifactResolutionProfile"
 
-    securityPolicyRef="wobble"
-
-    encryptNameIds="always"	 encryptAssertions="${prop.confitional}" attributeAuthority="wibble"
+    securityPolicyRef="wobble" attributeAuthority="wibble"
     
     assertionLifetime="${prop.tenMins}" includeConditionsNotBefore="${prop.false}" outboundArtifactType="${prop.artifactType}0" 
     signingCredentialRef="credref" signAssertions="${prop.never}" signRequests="never" signResponses="conditional"