refactor test

Author: JoeWang1127

java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging1x.java

@@ -20,6 +20,7 @@
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.api.gax.grpc.GrpcLoggingInterceptor;
@@ -57,22 +58,11 @@ public class ITLogging1x {
 
   private static final Logger CLASS_LOGGER = LoggerFactory.getLogger(ITLogging1x.class);
 
-  private TestAppender setupTestLogger(Class<?> clazz, Level level) {
-    TestAppender testAppender = new TestAppender();
-    testAppender.start();
-    Logger logger = LoggerFactory.getLogger(clazz);
-    ((ch.qos.logback.classic.Logger) logger).setLevel(level);
-    ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender);
-    return testAppender;
-  }
-
-  private TestMdcAppender setupTestMdcAppender(Class<?> clazz, Level level) {
-    TestMdcAppender appender = new TestMdcAppender();
+  private <T extends AppenderBase<ILoggingEvent>> void setupTestLogger(T appender, Class<?> clazz, Level level) {
     appender.start();
     Logger logger = LoggerFactory.getLogger(clazz);
     ((ch.qos.logback.classic.Logger) logger).setLevel(level);
     ((ch.qos.logback.classic.Logger) logger).addAppender(appender);
-    return appender;
   }
 
   @BeforeAll
@@ -101,7 +91,8 @@ void test() {
 
   @Test
   void testGrpc_receiveContent_logDebug() {
-    TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.DEBUG);
+    TestAppender testAppender = new TestAppender();
+    setupTestLogger(testAppender, GrpcLoggingInterceptor.class, Level.DEBUG);
     assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING);
 
     assertThat(testAppender.events.size()).isEqualTo(2);
@@ -137,7 +128,8 @@ void testGrpc_receiveContent_logDebug() {
 
   @Test
   void testGrpc_receiveContent_logDebug_structured_log() throws IOException {
-    TestMdcAppender testAppender = setupTestMdcAppender(GrpcLoggingInterceptor.class, Level.DEBUG);
+    TestMdcAppender testAppender = new TestMdcAppender();
+    setupTestLogger(testAppender, GrpcLoggingInterceptor.class, Level.DEBUG);
     assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING);
     List<byte[]> byteLists = testAppender.getByteLists();
     assertThat(byteLists.size()).isEqualTo(2);
@@ -153,7 +145,8 @@ void testGrpc_receiveContent_logDebug_structured_log() throws IOException {
 
   @Test
   void testGrpc_receiveContent_logInfo() {
-    TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.INFO);
+    TestAppender testAppender = new TestAppender();
+    setupTestLogger(testAppender, GrpcLoggingInterceptor.class, Level.INFO);
     assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING);
 
     assertThat(testAppender.events.size()).isEqualTo(2);
@@ -181,7 +174,8 @@ void testGrpc_receiveContent_logInfo() {
 
   @Test
   void testGrpc_receiveContent_logInfo_structured_log() throws IOException {
-    TestMdcAppender testAppender = setupTestMdcAppender(GrpcLoggingInterceptor.class, Level.INFO);
+    TestMdcAppender testAppender = new TestMdcAppender();
+    setupTestLogger(testAppender, GrpcLoggingInterceptor.class, Level.INFO);
     assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING);
     List<byte[]> byteLists = testAppender.getByteLists();
     assertThat(byteLists.size()).isEqualTo(2);
@@ -200,7 +194,8 @@ void testGrpc_receiveContent_logInfo_structured_log() throws IOException {
 
   @Test
   void testHttpJson_receiveContent_logDebug() {
-    TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.DEBUG);
+    TestAppender testAppender = new TestAppender();
+    setupTestLogger(testAppender, HttpJsonLoggingInterceptor.class, Level.DEBUG);
     assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING);
     assertThat(testAppender.events.size()).isEqualTo(2);
     // logging event for request
@@ -230,23 +225,26 @@ void testHttpJson_receiveContent_logDebug() {
 
   @Test
   void testHttpJson_receiveContent_logDebug_structured_log() throws IOException {
-    TestMdcAppender testAppender = setupTestMdcAppender(HttpJsonLoggingInterceptor.class, Level.DEBUG);
+    TestMdcAppender testAppender = new TestMdcAppender();
+    setupTestLogger(testAppender, HttpJsonLoggingInterceptor.class, Level.DEBUG);
     assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING);
     List<byte[]> byteLists = testAppender.getByteLists();
     assertThat(byteLists.size()).isEqualTo(2);
     JsonNode request = objectMapper.readTree(byteLists.get(0));
-    assertThat(request.get("message").asText()).isEqualTo("Sending request");
+    assertThat(request.get("request.url").asText()).isEqualTo(ENDPOINT);
     assertThat(request.get("request.payload").get("content").asText()).isEqualTo("echo?");
     JsonNode response = objectMapper.readTree(byteLists.get(1));
-    assertThat(response.get("message").asText()).isEqualTo("Received response");
+    assertThat(response.get("rpcName").asText()).isEqualTo(RPC_NAME);
     assertThat(response.get("response.payload").get("content").asText()).isEqualTo("echo?");
+    assertThat(response.get("response.status").asText()).isEqualTo("200");
 
     testAppender.stop();
   }
 
   @Test
   void testHttpJson_receiveContent_logInfo() {
-    TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.INFO);
+    TestAppender testAppender = new TestAppender();
+    setupTestLogger(testAppender, HttpJsonLoggingInterceptor.class, Level.INFO);
     assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING);
     assertThat(testAppender.events.size()).isEqualTo(2);
     // logging event for request
@@ -270,6 +268,24 @@ void testHttpJson_receiveContent_logInfo() {
     testAppender.stop();
   }
 
+  @Test
+  void testHttpJson_receiveContent_logInfo_structured_log() throws IOException {
+    TestMdcAppender testAppender = new TestMdcAppender();
+    setupTestLogger(testAppender, HttpJsonLoggingInterceptor.class, Level.INFO);
+    assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING);
+    List<byte[]> byteLists = testAppender.getByteLists();
+    assertThat(byteLists.size()).isEqualTo(2);
+    JsonNode request = objectMapper.readTree(byteLists.get(0));
+    assertThat(request.get("rpcName").asText()).isEqualTo(RPC_NAME);
+    assertThat(request.get("rpcName").asText()).isEqualTo(RPC_NAME);
+    JsonNode response = objectMapper.readTree(byteLists.get(1));
+    assertThat(response.get("message").asText()).isEqualTo("Received response");
+    assertThat(response.get("rpcName").asText()).isEqualTo(RPC_NAME);
+    assertThat(response.get("response.status").asText()).isEqualTo("200");
+
+    testAppender.stop();
+  }
+
   private String echoGrpc(String value) {
     EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build());
     return response.getContent();