[test] Replace AccessLogAppender with LogTracker (#2666)

Remove duplications

Author: violetagg

reactor-netty-http/src/test/java/reactor/netty/http/HttpProtocolsTests.java

@@ -18,7 +18,6 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.read.ListAppender;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -53,6 +52,7 @@
 import reactor.netty.BaseHttpTest;
 import reactor.netty.ByteBufFlux;
 import reactor.netty.Connection;
+import reactor.netty.LogTracker;
 import reactor.netty.NettyPipeline;
 import reactor.netty.http.client.HttpClient;
 import reactor.netty.http.client.HttpClientConfig;
@@ -75,7 +75,6 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
@@ -366,33 +365,24 @@ void testAccessLog(HttpServer server, HttpClient client) throws Exception {
 				      .accessLog(true)
 				      .bindNow();
 
-		AccessLogAppender accessLogAppender = new AccessLogAppender();
-		accessLogAppender.start();
-		Logger accessLogger = (Logger) LoggerFactory.getLogger("reactor.netty.http.server.AccessLog");
-		AtomicReference<String> protocol = new AtomicReference<>();
-		try {
-			accessLogger.addAppender(accessLogAppender);
-
+		HttpProtocol[] serverProtocols = server.configuration().protocols();
+		HttpProtocol[] clientProtocols = client.configuration().protocols();
+		boolean isHttp11 = (serverProtocols.length == 1 && serverProtocols[0] == HttpProtocol.HTTP11) ||
+				(clientProtocols.length == 1 && clientProtocols[0] == HttpProtocol.HTTP11);
+		String expectedLogRecord = "GET / HTTP/" + (isHttp11 ? "1.1" : "2.0") + "\" 200";
+		try (LogTracker logTracker = new LogTracker("reactor.netty.http.server.AccessLog", expectedLogRecord)) {
 			client.port(disposableServer.port())
 			      .get()
 			      .uri("/")
 			      .responseSingle((res, bytes) -> {
-			          protocol.set(res.responseHeaders().get("x-http2-stream-id") != null ? "2.0" : "1.1");
 			          return Mono.just(res.responseHeaders().get(NettyPipeline.AccessLogHandler));
 			      })
 			      .as(StepVerifier::create)
 			      .expectNext("FOUND")
 			      .expectComplete()
 			      .verify(Duration.ofSeconds(5));
 
-			assertThat(accessLogAppender.latch.await(5, TimeUnit.SECONDS)).isTrue();
-
-			assertThat(accessLogAppender.list).hasSize(1);
-			assertThat(accessLogAppender.list.get(0).getFormattedMessage()).contains("GET / HTTP/" + protocol.get() + "\" 200");
-		}
-		finally {
-			accessLogger.detachAppender(accessLogAppender);
-			accessLogAppender.stop();
+			assertThat(logTracker.latch.await(5, TimeUnit.SECONDS)).isTrue();
 		}
 	}
 
@@ -417,12 +407,8 @@ void testAccessLogWithForwardedHeader(HttpServer server, HttpClient client) thro
 				          args.connectionInformation().scheme()))
 				      .bindNow();
 
-		AccessLogAppender accessLogAppender = new AccessLogAppender();
-		accessLogAppender.start();
-		Logger accessLogger = (Logger) LoggerFactory.getLogger("reactor.netty.http.server.AccessLog");
-		try {
-			accessLogger.addAppender(accessLogAppender);
-
+		String expectedLogRecord = "192.0.2.60 203.0.113.43 http";
+		try (LogTracker logTracker = new LogTracker("reactor.netty.http.server.AccessLog", expectedLogRecord)) {
 			client.port(disposableServer.port())
 			      .doOnRequest((req, cnx) -> req.addHeader("Forwarded",
 			              "for=192.0.2.60;proto=http;host=203.0.113.43"))
@@ -434,14 +420,7 @@ void testAccessLogWithForwardedHeader(HttpServer server, HttpClient client) thro
 			      .expectComplete()
 			      .verify(Duration.ofSeconds(5));
 
-			assertThat(accessLogAppender.latch.await(5, TimeUnit.SECONDS)).isTrue();
-
-			assertThat(accessLogAppender.list).hasSize(1);
-			assertThat(accessLogAppender.list.get(0).getFormattedMessage()).isEqualTo("192.0.2.60 203.0.113.43 http");
-		}
-		finally {
-			accessLogger.detachAppender(accessLogAppender);
-			accessLogAppender.stop();
+			assertThat(logTracker.latch.await(5, TimeUnit.SECONDS)).isTrue();
 		}
 	}
 
@@ -761,18 +740,6 @@ else if (clientProtocols.length == 2 && clientProtocols[1] == HttpProtocol.H2C)
 		}
 	}
 
-	static final class AccessLogAppender extends AppenderBase<ILoggingEvent> {
-
-		final CountDownLatch latch = new CountDownLatch(1);
-		final List<ILoggingEvent> list = new ArrayList<>();
-
-		@Override
-		protected void append(ILoggingEvent eventObject) {
-			list.add(eventObject);
-			latch.countDown();
-		}
-	}
-
 	static final class IdleTimeoutTestChannelInboundHandler extends ChannelInboundHandlerAdapter {
 
 		final CountDownLatch latch = new CountDownLatch(1);