Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-26 05:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repair Flaky Tests

Browse Source 
- Applying changes to OpenSaml4 tests that were already applied
to OpenSaml5 tests

Issue gh-15395
This commit is contained in:
Josh Cummings 2024-08-09 08:22:05 -06:00
parent 6da485ae20
commit e52c6de39c
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.shibboleth.utilities.java.support.xml.SerializeSupport; import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@ -89,7 +90,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests {
@Test @Test
public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception { public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception {
try (MockWebServer server = new MockWebServer()) { try (MockWebServer server = new MockWebServer()) {
server.setDispatcher(new AlwaysDispatch(new MockResponse().setBody(this.metadata).setResponseCode(200))); server.setDispatcher(new AlwaysDispatch(this.metadata));
AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
.withTrustedMetadataLocation(server.url("/").toString()) .withTrustedMetadataLocation(server.url("/").toString())
.build(); .build();
@ -106,8 +107,7 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests {
@Test @Test
public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception { public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception {
try (MockWebServer server = new MockWebServer()) { try (MockWebServer server = new MockWebServer()) {
server.setDispatcher( server.setDispatcher(new AlwaysDispatch(this.entitiesDescriptor));
new AlwaysDispatch(new MockResponse().setBody(this.entitiesDescriptor).setResponseCode(200)));
List<AssertingPartyMetadata> parties = new ArrayList<>(); List<AssertingPartyMetadata> parties = new ArrayList<>();
OpenSaml4AssertingPartyMetadataRepository.withTrustedMetadataLocation(server.url("/").toString()) OpenSaml4AssertingPartyMetadataRepository.withTrustedMetadataLocation(server.url("/").toString())
.build() .build()
@ -122,7 +122,9 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests {
@Test @Test
public void withMetadataUrlLocationWhenUnresolvableThenThrowsSaml2Exception() throws Exception { public void withMetadataUrlLocationWhenUnresolvableThenThrowsSaml2Exception() throws Exception {
try (MockWebServer server = new MockWebServer()) { try (MockWebServer server = new MockWebServer()) {
server.enqueue(new MockResponse().setBody(this.metadata).setResponseCode(200)); server.enqueue(new MockResponse().setBody(this.metadata)
.setResponseCode(200)
.setBodyDelay(1, TimeUnit.MILLISECONDS));
String url = server.url("/").toString(); String url = server.url("/").toString();
server.shutdown(); server.shutdown();
assertThatExceptionOfType(Saml2Exception.class) assertThatExceptionOfType(Saml2Exception.class)
@ -360,7 +362,9 @@ public class OpenSaml4AssertingPartyMetadataRepositoryTests {
private final MockResponse response; private final MockResponse response;
private AlwaysDispatch(String body) { private AlwaysDispatch(String body) {
this.response = new MockResponse().setBody(body).setResponseCode(200); this.response = new MockResponse().setBody(body)
.setResponseCode(200)
.setBodyDelay(1, TimeUnit.MILLISECONDS);
} }
private AlwaysDispatch(MockResponse response) { private AlwaysDispatch(MockResponse response) {