From ecf6cace820cc6c606609fc269ed645808962456 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 30 Aug 2024 10:20:27 -0600 Subject: [PATCH] Re-Enable Disabled OpenSAML Tests Issue gh-15395 --- .../OpenSaml4AssertingPartyMetadataRepositoryTests.java | 6 ------ .../OpenSaml5AssertingPartyMetadataRepositoryTests.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java b/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java index eb00d21745..7134cd7291 100644 --- a/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java +++ b/saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java @@ -37,7 +37,6 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport; @@ -106,7 +105,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception { AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository .withTrustedMetadataLocation(web.url("/entity.xml").toString()) @@ -121,7 +119,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception { List parties = new ArrayList<>(); OpenSaml4AssertingPartyMetadataRepository.withTrustedMetadataLocation(web.url("/entities.xml").toString()) @@ -218,7 +215,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -237,7 +233,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMismatchingCredentialsThenSaml2Exception() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -332,7 +327,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); diff --git a/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java b/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java index df0061ead7..586e9b1f64 100644 --- a/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java +++ b/saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java @@ -37,7 +37,6 @@ import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opensaml.core.xml.XMLObject; import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport; @@ -106,7 +105,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception { AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository .withTrustedMetadataLocation(web.url("/entity.xml").toString()) @@ -121,7 +119,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception { List parties = new ArrayList<>(); OpenSaml5AssertingPartyMetadataRepository.withTrustedMetadataLocation(web.url("/entities.xml").toString()) @@ -218,7 +215,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -237,7 +233,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withTrustedMetadataLocationWhenMismatchingCredentialsThenSaml2Exception() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration); @@ -332,7 +327,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests { } @Test - @Disabled("See gh-15395") public void withMetadataLocationWhenMatchingCredentialsThenVerifiesSignature() throws IOException { RelyingPartyRegistration registration = TestRelyingPartyRegistrations.full().build(); EntityDescriptor descriptor = TestOpenSamlObjects.entityDescriptor(registration);