test: improvements

Author: diegomarquezp

gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/BodySizeRecordingTest.java

@@ -38,7 +38,6 @@
 import com.google.api.gax.rpc.StreamController;
 import com.google.auth.Credentials;
 import com.google.protobuf.Field;
-import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -89,17 +88,17 @@ class BodySizeRecordingTest {
   private TestApiTracer tracer;
 
   @BeforeAll
-  public static void initialize() {
+  static void initialize() {
     executorService = Executors.newFixedThreadPool(2);
   }
 
   @AfterAll
-  public static void destroy() {
+  static void destroy() {
     executorService.shutdownNow();
   }
 
   @BeforeEach
-  void setUp() throws IOException {
+  void setUp() {
     channel =
         ManagedHttpJsonChannel.newBuilder()
             .setEndpoint("google.com:443")
@@ -189,7 +188,9 @@ void testBodySizeRecordingServerStreaming() throws Exception {
         request,
         new ResponseObserver<Field>() {
           @Override
-          public void onStart(StreamController controller) {}
+          public void onStart(StreamController controller) {
+            // no behavior needed
+          }
 
           @Override
           public void onResponse(Field response) {

gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonCallContextTest.java

@@ -252,6 +252,16 @@ void testMergeWithTracer() {
         .isSameInstanceAs(defaultTracer);
   }
 
+  @Test
+  void testWithTracer() {
+    ApiTracer tracer = Mockito.mock(ApiTracer.class);
+    HttpJsonCallContext emptyContext = HttpJsonCallContext.createDefault();
+    // Default context has a default tracer.
+    assertNotNull(emptyContext.getTracer());
+    HttpJsonCallContext context = emptyContext.withTracer(tracer);
+    Truth.assertThat(context.getTracer()).isSameInstanceAs(tracer);
+  }
+
   @Test
   void testWithRetrySettings() {
     RetrySettings retrySettings = Mockito.mock(RetrySettings.class);

gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonCallOptionsTest.java

@@ -31,12 +31,22 @@
 
 import static com.google.api.gax.util.TimeConversionTestUtils.testDurationMethod;
 import static com.google.api.gax.util.TimeConversionTestUtils.testInstantMethod;
+import static com.google.common.truth.Truth.assertThat;
 
+import com.google.api.gax.tracing.ApiTracer;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 public class HttpJsonCallOptionsTest {
   private final HttpJsonCallOptions.Builder OPTIONS_BUILDER = HttpJsonCallOptions.newBuilder();
 
+  @Test
+  public void testTracer() {
+    ApiTracer tracer = Mockito.mock(ApiTracer.class);
+    HttpJsonCallOptions options = OPTIONS_BUILDER.setTracer(tracer).build();
+    assertThat(options.getTracer()).isSameInstanceAs(tracer);
+  }
+
   @Test
   public void testDeadline() {
     final long millis = 3;