Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-22 12:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply OpenSAML Test Fix to Remaining Test

Browse Source 
There was one test that wasn't converted and now it is.

Issue gh-15395
This commit is contained in:
Josh Cummings 2024-08-30 10:21:19 -06:00
parent 626610a975
commit c9d083717f
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
saml2/saml2-service-provider/src/opensaml4Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java
View File

@ -261,14 +261,13 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests {
TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(), TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(),
descriptor.getEntityID()); descriptor.getEntityID());
String serialized = serialize(descriptor); String serialized = serialize(descriptor);
try (MockWebServer server = new MockWebServer()) { String endpoint = "/" + UUID.randomUUID().toString();
enqueue(server, serialized, 3); dispatcher.addResponse(endpoint, serialized);
AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
.withTrustedMetadataLocation(server.url("/").toString()) .withTrustedMetadataLocation(web.url(endpoint).toString())
.build(); .build();
assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull(); assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
} }
}
@Test @Test
public void withTrustedMetadataLocationWhenCustomResourceLoaderThenUses() { public void withTrustedMetadataLocationWhenCustomResourceLoaderThenUses() {
@ -362,12 +361,6 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests {
} }
} }
private static void enqueue(MockWebServer web, String body, int times) {
for (int i = 0; i < times; i++) {
web.enqueue(new MockResponse().setBody(body).setResponseCode(200));
}
}
private static final class MetadataDispatcher extends Dispatcher { private static final class MetadataDispatcher extends Dispatcher {
private final MockResponse head = new MockResponse(); private final MockResponse head = new MockResponse();

13
saml2/saml2-service-provider/src/opensaml5Test/java/org/springframework/security/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java
View File

@ -261,14 +261,13 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests {
TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(), TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(),
descriptor.getEntityID()); descriptor.getEntityID());
String serialized = serialize(descriptor); String serialized = serialize(descriptor);
try (MockWebServer server = new MockWebServer()) { String endpoint = "/" + UUID.randomUUID().toString();
enqueue(server, serialized, 3); dispatcher.addResponse(endpoint, serialized);
AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository
.withTrustedMetadataLocation(server.url("/").toString()) .withTrustedMetadataLocation(web.url(endpoint).toString())
.build(); .build();
assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull(); assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
} }
}
@Test @Test
public void withTrustedMetadataLocationWhenCustomResourceLoaderThenUses() { public void withTrustedMetadataLocationWhenCustomResourceLoaderThenUses() {
@ -362,12 +361,6 @@ public class OpenSaml5AssertingPartyMetadataRepositoryTests {
} }
} }
private static void enqueue(MockWebServer web, String body, int times) {
for (int i = 0; i < times; i++) {
web.enqueue(new MockResponse().setBody(body).setResponseCode(200));
}
}
private static final class MetadataDispatcher extends Dispatcher { private static final class MetadataDispatcher extends Dispatcher {
private final MockResponse head = new MockResponse(); private final MockResponse head = new MockResponse();