test via public methods/results, remove hasTransport() test only method

Author: danielzhaotongliu

xds/src/main/java/io/grpc/xds/GrpcXdsTransportFactory.java

@@ -77,11 +77,6 @@ public XdsTransport createForTest(ManagedChannel channel) {
     return new GrpcXdsTransport(channel, callCredentials, null);
   }
 
-  @VisibleForTesting
-  static boolean hasTransport(Bootstrapper.ServerInfo serverInfo) {
-    return xdsServerInfoToTransportMap.containsKey(serverInfo);
-  }
-
   @VisibleForTesting
   static class GrpcXdsTransport implements XdsTransport {
 

xds/src/test/java/io/grpc/xds/GrpcXdsTransportFactoryTest.java

@@ -124,23 +124,19 @@ public void refCountedXdsTransport_sameXdsServerAddress_returnsExistingTransport
         Bootstrapper.ServerInfo.create(
             "localhost:" + server.getPort(), InsecureChannelCredentials.create());
     GrpcXdsTransportFactory xdsTransportFactory = new GrpcXdsTransportFactory(null);
-    // Verify calling create() for the first time creates a new GrpcXdsTransport instance.
+    // Calling create() for the first time creates a new GrpcXdsTransport instance.
     // The ref count was previously 0 and now is 1.
     XdsTransportFactory.XdsTransport transport1 = xdsTransportFactory.create(xdsServerInfo);
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo)).isTrue();
-    // Verify calling create() for the second time to the same xDS server address returns the same
+    // Calling create() for the second time to the same xDS server address returns the same
     // GrpcXdsTransport instance. The ref count was previously 1 and now is 2.
     XdsTransportFactory.XdsTransport transport2 = xdsTransportFactory.create(xdsServerInfo);
     assertThat(transport1).isSameInstanceAs(transport2);
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo)).isTrue();
-    // Verify calling shutdown() for the first time does not shut down the GrpcXdsTransport
-    // instance. The ref count was previously 2 and now is 1.
+    // Calling shutdown() for the first time does not shut down the GrpcXdsTransport instance.
+    // The ref count was previously 2 and now is 1.
     transport1.shutdown();
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo)).isTrue();
-    // Verify calling shutdown() for the second time shuts down and cleans up the
-    // GrpcXdsTransport instance. The ref count was previously 1 and now is 0.
+    // Calling shutdown() for the second time shuts down the GrpcXdsTransport instance.
+    // The ref count was previously 1 and now is 0.
     transport2.shutdown();
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo)).isFalse();
   }
 
   @Test
@@ -159,23 +155,19 @@ public void refCountedXdsTransport_differentXdsServerAddress_returnsDifferentTra
         Bootstrapper.ServerInfo.create(
             "localhost:" + server2.getPort(), InsecureChannelCredentials.create());
     GrpcXdsTransportFactory xdsTransportFactory = new GrpcXdsTransportFactory(null);
-    // Verify calling create() to the first xDS server creates a new GrpcXdsTransport instance.
+    // Calling create() to the first xDS server creates a new GrpcXdsTransport instance.
     // The ref count was previously 0 and now is 1.
     XdsTransportFactory.XdsTransport transport1 = xdsTransportFactory.create(xdsServerInfo1);
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo1)).isTrue();
-    // Verify calling create() to the second xDS server creates a different GrpcXdsTransport
-    // instance. The ref count was previously 0 and now is 1.
+    // Calling create() to the second xDS server creates a different GrpcXdsTransport instance.
+    // The ref count was previously 0 and now is 1.
     XdsTransportFactory.XdsTransport transport2 = xdsTransportFactory.create(xdsServerInfo2);
     assertThat(transport1).isNotSameInstanceAs(transport2);
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo2)).isTrue();
-    // Verify calling shutdown() shuts down and cleans up the GrpcXdsTransport instance for
-    // the first xDS server. The ref count was previously 1 and now is 0.
+    // Calling shutdown() shuts down the GrpcXdsTransport instance for the first xDS server.
+    // The ref count was previously 1 and now is 0.
     transport1.shutdown();
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo1)).isFalse();
-    // Verify calling shutdown() shuts down and cleans up the GrpcXdsTransport instance for
-    // the second xDS server. The ref count was previously 1 and now is 0.
+    // Calling shutdown() shuts down the GrpcXdsTransport instance for the second xDS server.
+    // The ref count was previously 1 and now is 0.
     transport2.shutdown();
-    assertThat(GrpcXdsTransportFactory.hasTransport(xdsServerInfo2)).isFalse();
     // Clean up the second xDS server.
     server2.shutdown();
   }