Skip to content

Commit c9d0837

Browse files
committed
Apply OpenSAML Test Fix to Remaining Test
There was one test that wasn't converted and now it is. Issue gh-15395
1 parent 626610a commit c9d0837

File tree

2 files changed

+12
-26
lines changed

2 files changed

+12
-26
lines changed

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

+6-13
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,12 @@ public void withTrustedMetadataLocationWhenNoCredentialsThenSkipsVerifySignature
261261
TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(),
262262
descriptor.getEntityID());
263263
String serialized = serialize(descriptor);
264-
try (MockWebServer server = new MockWebServer()) {
265-
enqueue(server, serialized, 3);
266-
AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
267-
.withTrustedMetadataLocation(server.url("/").toString())
268-
.build();
269-
assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
270-
}
264+
String endpoint = "/" + UUID.randomUUID().toString();
265+
dispatcher.addResponse(endpoint, serialized);
266+
AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
267+
.withTrustedMetadataLocation(web.url(endpoint).toString())
268+
.build();
269+
assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
271270
}
272271

273272
@Test
@@ -362,12 +361,6 @@ private static String serialize(XMLObject object) {
362361
}
363362
}
364363

365-
private static void enqueue(MockWebServer web, String body, int times) {
366-
for (int i = 0; i < times; i++) {
367-
web.enqueue(new MockResponse().setBody(body).setResponseCode(200));
368-
}
369-
}
370-
371364
private static final class MetadataDispatcher extends Dispatcher {
372365

373366
private final MockResponse head = new MockResponse();

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

+6-13
Original file line numberDiff line numberDiff line change
@@ -261,13 +261,12 @@ public void withTrustedMetadataLocationWhenNoCredentialsThenSkipsVerifySignature
261261
TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(),
262262
descriptor.getEntityID());
263263
String serialized = serialize(descriptor);
264-
try (MockWebServer server = new MockWebServer()) {
265-
enqueue(server, serialized, 3);
266-
AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository
267-
.withTrustedMetadataLocation(server.url("/").toString())
268-
.build();
269-
assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
270-
}
264+
String endpoint = "/" + UUID.randomUUID().toString();
265+
dispatcher.addResponse(endpoint, serialized);
266+
AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository
267+
.withTrustedMetadataLocation(web.url(endpoint).toString())
268+
.build();
269+
assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
271270
}
272271

273272
@Test
@@ -362,12 +361,6 @@ private static String serialize(XMLObject object) {
362361
}
363362
}
364363

365-
private static void enqueue(MockWebServer web, String body, int times) {
366-
for (int i = 0; i < times; i++) {
367-
web.enqueue(new MockResponse().setBody(body).setResponseCode(200));
368-
}
369-
}
370-
371364
private static final class MetadataDispatcher extends Dispatcher {
372365

373366
private final MockResponse head = new MockResponse();

0 commit comments

Comments
 (0)