update showcase tests

Author: JoeWang1127

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

@@ -21,13 +21,15 @@
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.api.gax.grpc.GrpcLoggingInterceptor;
 import com.google.api.gax.httpjson.HttpJsonLoggingInterceptor;
 import com.google.common.collect.ImmutableMap;
 import com.google.showcase.v1beta1.EchoClient;
 import com.google.showcase.v1beta1.EchoRequest;
 import com.google.showcase.v1beta1.EchoResponse;
 import com.google.showcase.v1beta1.it.util.TestClientInitializer;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -51,6 +53,7 @@ public class ITLogging1x {
   private static final String ENDPOINT = "http://localhost:7469";
   private static final String SENDING_REQUEST_MESSAGE = "Sending request";
   private static final String RECEIVING_RESPONSE_MESSAGE = "Received response";
+  private final ObjectMapper objectMapper = new ObjectMapper();
 
   private static Logger logger = LoggerFactory.getLogger(ITLogging1x.class);
 
@@ -133,16 +136,17 @@ void testGrpc_receiveContent_logDebug() {
   }
 
   @Test
-  void testGrpc_receiveContent_logDebug_structured_log() {
+  void testGrpc_receiveContent_logDebug_structured_log() throws IOException {
     TestMdcAppender testAppender = setupTestMdcAppender(GrpcLoggingInterceptor.class, Level.DEBUG);
     assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING);
-    List<JsonNode> jsonNodes = testAppender.getLoggingEntries();
-    assertThat(jsonNodes.size()).isEqualTo(2);
-    System.out.println(jsonNodes.get(1));
-    assertThat(jsonNodes.get(0).get("message").asText()).isEqualTo("Sending request");
-    assertThat(jsonNodes.get(0).get("request.payload").get("content").asText()).isEqualTo("echo?");
-    assertThat(jsonNodes.get(1).get("message").asText()).isEqualTo("Received response");
-    assertThat(jsonNodes.get(1).get("response.payload").get("content").asText()).isEqualTo("echo?");
+    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.payload").get("content").asText()).isEqualTo("echo?");
+    JsonNode response = objectMapper.readTree(byteLists.get(1));
+    assertThat(response.get("message").asText()).isEqualTo("Received response");
+    assertThat(response.get("response.payload").get("content").asText()).isEqualTo("echo?");
 
     testAppender.stop();
   }

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

@@ -2,10 +2,7 @@
 
 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.logging.SDKLoggingMdcJsonProvider;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -14,16 +11,12 @@
 public class TestMdcAppender extends AppenderBase<ILoggingEvent> {
 
   private final LogstashEncoder encoder;
-
-  private final ObjectMapper objectMapper;
-
-  private final List<JsonNode> jsonNodes;
+  private final List<byte[]> byteLists;
 
   public TestMdcAppender() {
     encoder = new LogstashEncoder();
     encoder.addProvider(new SDKLoggingMdcJsonProvider());
-    objectMapper = new ObjectMapper();
-    jsonNodes = new ArrayList<>();
+    byteLists = new ArrayList<>();
   }
 
   @Override
@@ -40,15 +33,10 @@ public void stop() {
 
   @Override
   protected void append(ILoggingEvent eventObject) {
-    byte[] encodedBytes = encoder.encode(eventObject);
-    try {
-      jsonNodes.add(objectMapper.readTree(encodedBytes));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    byteLists.add(encoder.encode(eventObject));
   }
 
-  public List<JsonNode> getLoggingEntries() {
-    return Collections.unmodifiableList(jsonNodes);
+  public List<byte[]> getByteLists() {
+    return Collections.unmodifiableList(byteLists);
   }
 }