Skip to content

Commit e52c6de

Browse files
committed
Repair Flaky Tests
- Applying changes to OpenSaml4 tests that were already applied to OpenSaml5 tests Issue gh-15395
1 parent 6da485a commit e52c6de

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Collection;
2525
import java.util.List;
2626
import java.util.Set;
27+
import java.util.concurrent.TimeUnit;
2728
import java.util.stream.Collectors;
2829

2930
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
@@ -89,7 +90,7 @@ public void setup() throws Exception {
8990
@Test
9091
public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() throws Exception {
9192
try (MockWebServer server = new MockWebServer()) {
92-
server.setDispatcher(new AlwaysDispatch(new MockResponse().setBody(this.metadata).setResponseCode(200)));
93+
server.setDispatcher(new AlwaysDispatch(this.metadata));
9394
AssertingPartyMetadataRepository parties = OpenSaml4AssertingPartyMetadataRepository
9495
.withTrustedMetadataLocation(server.url("/").toString())
9596
.build();
@@ -106,8 +107,7 @@ public void withMetadataUrlLocationWhenResolvableThenFindByEntityIdReturns() thr
106107
@Test
107108
public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws Exception {
108109
try (MockWebServer server = new MockWebServer()) {
109-
server.setDispatcher(
110-
new AlwaysDispatch(new MockResponse().setBody(this.entitiesDescriptor).setResponseCode(200)));
110+
server.setDispatcher(new AlwaysDispatch(this.entitiesDescriptor));
111111
List<AssertingPartyMetadata> parties = new ArrayList<>();
112112
OpenSaml4AssertingPartyMetadataRepository.withTrustedMetadataLocation(server.url("/").toString())
113113
.build()
@@ -122,7 +122,9 @@ public void withMetadataUrlLocationnWhenResolvableThenIteratorReturns() throws E
122122
@Test
123123
public void withMetadataUrlLocationWhenUnresolvableThenThrowsSaml2Exception() throws Exception {
124124
try (MockWebServer server = new MockWebServer()) {
125-
server.enqueue(new MockResponse().setBody(this.metadata).setResponseCode(200));
125+
server.enqueue(new MockResponse().setBody(this.metadata)
126+
.setResponseCode(200)
127+
.setBodyDelay(1, TimeUnit.MILLISECONDS));
126128
String url = server.url("/").toString();
127129
server.shutdown();
128130
assertThatExceptionOfType(Saml2Exception.class)
@@ -360,7 +362,9 @@ private static final class AlwaysDispatch extends Dispatcher {
360362
private final MockResponse response;
361363

362364
private AlwaysDispatch(String body) {
363-
this.response = new MockResponse().setBody(body).setResponseCode(200);
365+
this.response = new MockResponse().setBody(body)
366+
.setResponseCode(200)
367+
.setBodyDelay(1, TimeUnit.MILLISECONDS);
364368
}
365369

366370
private AlwaysDispatch(MockResponse response) {

0 commit comments

Comments
 (0)