Apply OpenSAML Test Fix to Remaining Test

There was one test that wasn't converted and now it is. Issue spring-projectsgh-15395
nomoreFt · Aug 30, 2024 · c9d0837 · c9d0837
1 parent 626610a
commit c9d0837
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/...y/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java b/...y/saml2/provider/service/registration/OpenSaml4AssertingPartyMetadataRepositoryTests.java
@@ -261,13 +261,12 @@ public void withTrustedMetadataLocationWhenNoCredentialsThenSkipsVerifySignature
 		TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(),
 				descriptor.getEntityID());
 		String serialized = serialize(descriptor);
-		try (MockWebServer server = new MockWebServer()) {
-			enqueue(server, serialized, 3);
-			AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
-				.withTrustedMetadataLocation(server.url("/").toString())
-				.build();
-			assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
-		}
+		String endpoint = "/" + UUID.randomUUID().toString();
+		dispatcher.addResponse(endpoint, serialized);
+		AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
+			.withTrustedMetadataLocation(web.url(endpoint).toString())
+			.build();
+		assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
 	}
 
 	@Test
@@ -362,12 +361,6 @@ private static String serialize(XMLObject object) {
 		}
 	}
 
-	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 final MockResponse head = new MockResponse();

diff --git a/...y/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java b/...y/saml2/provider/service/registration/OpenSaml5AssertingPartyMetadataRepositoryTests.java
@@ -261,13 +261,12 @@ public void withTrustedMetadataLocationWhenNoCredentialsThenSkipsVerifySignature
 		TestOpenSamlObjects.signed(descriptor, TestSaml2X509Credentials.assertingPartySigningCredential(),
 				descriptor.getEntityID());
 		String serialized = serialize(descriptor);
-		try (MockWebServer server = new MockWebServer()) {
-			enqueue(server, serialized, 3);
-			AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository
-				.withTrustedMetadataLocation(server.url("/").toString())
-				.build();
-			assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
-		}
+		String endpoint = "/" + UUID.randomUUID().toString();
+		dispatcher.addResponse(endpoint, serialized);
+		AssertingPartyMetadataRepository parties = OpenSaml5AssertingPartyMetadataRepository
+			.withTrustedMetadataLocation(web.url(endpoint).toString())
+			.build();
+		assertThat(parties.findByEntityId(registration.getAssertingPartyDetails().getEntityId())).isNotNull();
 	}
 
 	@Test
@@ -362,12 +361,6 @@ private static String serialize(XMLObject object) {
 		}
 	}
 
-	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 final MockResponse head = new MockResponse();