fix remaining tests to mock endpointContext.resolvedEndpoint().

Author: rmehta19

gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProviderTest.java

@@ -377,22 +377,30 @@ void testDirectPathDisallowNullCredentials() throws IOException {
 
   @Test
   void testDirectPathWithGDUEndpoint() {
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn(DEFAULT_ENDPOINT);
+
     InstantiatingGrpcChannelProvider provider =
         InstantiatingGrpcChannelProvider.newBuilder()
             .setAttemptDirectPath(true)
             .setAttemptDirectPathXds()
             .setEndpoint(DEFAULT_ENDPOINT)
+            .setEndpointContext(endpointContext)
             .build();
     assertThat(provider.canUseDirectPathWithUniverseDomain()).isTrue();
   }
 
   @Test
   void testDirectPathWithNonGDUEndpoint() {
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn("test.random.com:443");
+
     InstantiatingGrpcChannelProvider provider =
         InstantiatingGrpcChannelProvider.newBuilder()
             .setAttemptDirectPath(true)
             .setAttemptDirectPathXds()
             .setEndpoint("test.random.com:443")
+            .setEndpointContext(endpointContext)
             .build();
     assertThat(provider.canUseDirectPathWithUniverseDomain()).isFalse();
   }
@@ -830,11 +838,14 @@ public void canUseDirectPath_directPathEnvVarDisabled() throws IOException {
   @Test
   public void canUseDirectPath_directPathEnvVarNotSet_attemptDirectPathIsTrue() {
     System.setProperty("os.name", "Linux");
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn(DEFAULT_ENDPOINT);
     InstantiatingGrpcChannelProvider.Builder builder =
         InstantiatingGrpcChannelProvider.newBuilder()
             .setAttemptDirectPath(true)
             .setCredentials(computeEngineCredentials)
-            .setEndpoint(DEFAULT_ENDPOINT);
+            .setEndpoint(DEFAULT_ENDPOINT)
+            .setEndpointContext(endpointContext);
     InstantiatingGrpcChannelProvider provider =
         new InstantiatingGrpcChannelProvider(builder, GCE_PRODUCTION_NAME_AFTER_2016);
     Truth.assertThat(provider.canUseDirectPath()).isTrue();
@@ -938,11 +949,14 @@ public void canUseDirectPath_nonGDUUniverseDomain() {
                 InstantiatingGrpcChannelProvider.DIRECT_PATH_ENV_DISABLE_DIRECT_PATH))
         .thenReturn("false");
     String nonGDUEndpoint = "test.random.com:443";
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn(nonGDUEndpoint);
     InstantiatingGrpcChannelProvider.Builder builder =
         InstantiatingGrpcChannelProvider.newBuilder()
             .setAttemptDirectPath(true)
             .setCredentials(computeEngineCredentials)
             .setEndpoint(nonGDUEndpoint)
+            .setEndpointContext(endpointContext)
             .setEnvProvider(envProvider);
     InstantiatingGrpcChannelProvider provider =
         new InstantiatingGrpcChannelProvider(builder, GCE_PRODUCTION_NAME_AFTER_2016);

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

@@ -159,9 +159,12 @@ public static void destroy() {
   @BeforeEach
   void setUp() throws IOException {
     interceptor = new CapturingClientInterceptor();
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn("google.com:443");
     channel =
         InstantiatingHttpJsonChannelProvider.newBuilder()
             .setEndpoint("google.com:443")
+            .setEndpointContext(endpointContext)
             .setExecutor(executorService)
             .setHttpTransport(MOCK_SERVICE)
             .setHeaderProvider(() -> Collections.singletonMap("header-key", "headerValue"))

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

@@ -32,6 +32,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import com.google.api.gax.rpc.EndpointContext;
 import com.google.api.gax.rpc.HeaderProvider;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.mtls.AbstractMtlsTransportChannelTest;
@@ -56,8 +57,12 @@ void basicTest() throws IOException {
     ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1);
     executor.shutdown();
 
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn(DEFAULT_ENDPOINT);
+
     TransportChannelProvider provider = InstantiatingHttpJsonChannelProvider.newBuilder().build();
 
+    provider = provider.withEndpointContext(endpointContext);
     assertThat(provider.needsEndpoint()).isTrue();
     provider = provider.withEndpoint(DEFAULT_ENDPOINT);
     assertThat(provider.needsEndpoint()).isFalse();
@@ -107,8 +112,13 @@ void basicTest() throws IOException {
   // if not provided by the TransportChannelProvider
   @Test
   void managedChannelUsesDefaultChannelExecutor() throws IOException {
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn(DEFAULT_ENDPOINT);
     InstantiatingHttpJsonChannelProvider instantiatingHttpJsonChannelProvider =
-        InstantiatingHttpJsonChannelProvider.newBuilder().setEndpoint(DEFAULT_ENDPOINT).build();
+        InstantiatingHttpJsonChannelProvider.newBuilder()
+            .setEndpoint(DEFAULT_ENDPOINT)
+            .setEndpointContext(endpointContext)
+            .build();
     instantiatingHttpJsonChannelProvider =
         (InstantiatingHttpJsonChannelProvider)
             instantiatingHttpJsonChannelProvider.withHeaders(DEFAULT_HEADER_MAP);
@@ -132,9 +142,13 @@ void managedChannelUsesCustomExecutor() throws IOException {
     ScheduledExecutorService executor = new ScheduledThreadPoolExecutor(1);
     executor.shutdown();
 
+    EndpointContext endpointContext = Mockito.mock(EndpointContext.class);
+    Mockito.when(endpointContext.resolvedEndpoint()).thenReturn(DEFAULT_ENDPOINT);
+
     InstantiatingHttpJsonChannelProvider instantiatingHttpJsonChannelProvider =
         InstantiatingHttpJsonChannelProvider.newBuilder()
             .setEndpoint(DEFAULT_ENDPOINT)
+            .setEndpointContext(endpointContext)
             .setExecutor(executor)
             .build();
     instantiatingHttpJsonChannelProvider =