Skip to content

Commit 723ac4b

Browse files
committed
Fix broken test
Signed-off-by: raccoonback <[email protected]>
1 parent dead58f commit 723ac4b

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientOperationsTest.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,8 @@ private static void checkRequest(HttpClientRequest request, HttpClientResponse r
576576
@ParameterizedTest
577577
@MethodSource("httpCompatibleProtocols")
578578
void testConstructorWithProvidedAuthentication(HttpProtocol[] serverProtocols, HttpProtocol[] clientProtocols,
579-
SslProvider.@Nullable ProtocolSslContextSpec serverCtx, SslProvider.@Nullable ProtocolSslContextSpec clientCtx) throws Exception {
580-
ConnectionProvider provider = ConnectionProvider.create("testConstructorWithProvidedReplacement_4", 1);
579+
SslProvider.@Nullable ProtocolSslContextSpec serverCtx, SslProvider.@Nullable ProtocolSslContextSpec clientCtx) {
580+
ConnectionProvider provider = ConnectionProvider.create("testConstructorWithProvidedAuthentication", 1);
581581
try {
582582
HttpServer server = serverCtx == null ?
583583
createServer().protocol(serverProtocols) :
@@ -589,7 +589,7 @@ void testConstructorWithProvidedAuthentication(HttpProtocol[] serverProtocols, H
589589
if (authHeader == null || !authHeader.equals("Bearer test-token")) {
590590
return res.status(HttpResponseStatus.UNAUTHORIZED).send();
591591
}
592-
return res.sendString(Mono.just("testConstructorWithProvidedReplacement_4"));
592+
return res.sendString(Mono.just("testConstructorWithProvidedAuthentication"));
593593
}))
594594
.bindNow();
595595

@@ -605,7 +605,7 @@ void testConstructorWithProvidedAuthentication(HttpProtocol[] serverProtocols, H
605605
AtomicReference<@Nullable ConnectionObserver> responseListener = new AtomicReference<>();
606606
String result = httpAuthentication(client, request, response, requestChannel, responseChannel,
607607
requestListener, responseListener);
608-
assertThat(result).isNotNull().isEqualTo("testConstructorWithProvidedReplacement_4");
608+
assertThat(result).isNotNull().isEqualTo("testConstructorWithProvidedAuthentication");
609609
assertThat(requestListener.get()).isSameAs(responseListener.get());
610610
checkRequest(request.get(), response.get(), requestChannel.get(), responseChannel.get(), false, false);
611611
}
@@ -624,18 +624,14 @@ private static String httpAuthentication(HttpClient originalClient, AtomicRefere
624624
return Mono.empty();
625625
});
626626
return client.doAfterRequest((req, conn) -> {
627-
if (request.get() == null) {
628-
requestChannel.set(conn.channel());
629-
requestListener.set(((HttpClientOperations) req).listener());
630-
request.set(req);
631-
}
627+
requestChannel.set(conn.channel());
628+
requestListener.set(((HttpClientOperations) req).listener());
629+
request.set(req);
632630
})
633-
.doAfterResponseSuccess((res, conn) -> {
634-
if (response.get() == null) {
635-
responseChannel.set(conn.channel());
636-
responseListener.set(((HttpClientOperations) res).listener());
637-
response.set(res);
638-
}
631+
.doOnResponse((res, conn) -> {
632+
responseChannel.set(conn.channel());
633+
responseListener.set(((HttpClientOperations) res).listener());
634+
response.set(res);
639635
})
640636
.get()
641637
.uri("/protected")

0 commit comments

Comments
 (0)