[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/test: java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: putmanb
Date: Sat Jun 21 01:24:28 2014
New Revision: 6136

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6136&view=rev
Log:
Re-enable test that was failing, unrelated to OSJ-68/OSJ-71 (bad PEM cert format).

Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java?rev=6136&r1=6135&r2=6136&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParserTest.java Sat Jun 21 01:24:28 2014
@@ -45,8 +45,7 @@
         Assert.assertEquals(Sets.newHashSet(result).size(), 1);
     }
 
-    // OSJ-71
-    @Test(enabled=false) public void wrongSig() throws IOException, ResolverException {
+    @Test public void wrongSig() throws IOException, ResolverException {
         MetadataResolver resolver =
                 getBean(MetadataResolver.class, true, "filter/switch-metadata.xml", "filter/other.xml", "beans.xml");
 

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml?rev=6136&r1=6135&r2=6136&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/other.xml Sat Jun 21 01:24:28 2014
@@ -6,7 +6,7 @@
 >
 <security:Credential 
     id="IdPCredential" xsi:type="security:X509Inline">
-    <security:Certificate>-----BEGIN CERTIFICATE-----
+    <security:Certificate>
 MIIDtTCCAp2gAwIBAgIJAPmsD+VGldyPMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV
 BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
 aWRnaXRzIFB0eSBMdGQwHhcNMTQwNDExMTMzOTE4WhcNMjQwNDA4MTMzOTE4WjBF
@@ -27,7 +27,6 @@
 8oFt0blzXtQ2vcOVyNyG326uZBZv2Cf6FXFsYQX1L/tLeTBJegefgGkg2dqCTKIU
 1Qy/Kd2P3/S01kQxjDeG7UfXc9qtelJ68kvzK2d3WOJ2qmsdMxjMNfTItP7FO54M
 i8V7gp9HK+EimdSbgu7xktKlrqA2Rsn+dBoPSgOUs/LOGtCS9/biF0w=
------END CERTIFICATE-----
     </security:Certificate>
 </security:Credential>
     </security:TrustEngine>