Delete invasive test inspection methods

ejona86 · ejona86 · commit c84946a848c2 · 2024-07-24T12:03:13.000-07:00
diff --git a/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java b/xds/src/main/java/io/grpc/xds/client/ControlPlaneClient.java
@@ -206,15 +206,6 @@ boolean isReady() {
     return adsStream != null && adsStream.call != null && adsStream.call.isReady();
   }
 
-  @Nullable
-  @VisibleForTesting
-  Map<XdsResourceType<?>, String> getNonce() {
-    if (adsStream == null) {
-      return null;
-    }
-    return adsStream.respNonces;
-  }
-
   /**
    * Starts a timer for each requested resource that hasn't been responded to and
    * has been waiting for the channel to get ready.
diff --git a/xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java b/xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java
@@ -84,7 +84,7 @@ public void uncaughtException(Thread t, Throwable e) {
   final Map<ServerInfo, LoadReportClient> serverLrsClientMap =
       new HashMap<>();
 
-  final Map<ServerInfo, ControlPlaneClient> serverCpClientMap = new HashMap<>();
+  private final Map<ServerInfo, ControlPlaneClient> serverCpClientMap = new HashMap<>();
   private final Map<XdsResourceType<? extends ResourceUpdate>,
       Map<String, ResourceSubscriber<? extends ResourceUpdate>>>
       resourceSubscribers = new HashMap<>();
diff --git a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java
@@ -87,7 +87,6 @@
 import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
 import io.grpc.xds.client.Bootstrapper.CertificateProviderInfo;
 import io.grpc.xds.client.Bootstrapper.ServerInfo;
-import io.grpc.xds.client.ControlPlaneClientTestBase;
 import io.grpc.xds.client.EnvoyProtoData.Node;
 import io.grpc.xds.client.LoadStatsManager2.ClusterDropStats;
 import io.grpc.xds.client.Locality;
@@ -142,7 +141,7 @@
 @RunWith(JUnit4.class)
 // The base class was used to test both xds v2 and v3. V2 is dropped now so the base class is not
 // necessary. Still keep it for future version usage. Remove if too much trouble to maintain.
-public abstract class GrpcXdsClientImplTestBase extends ControlPlaneClientTestBase {
+public abstract class GrpcXdsClientImplTestBase {
   private static final String SERVER_URI = "trafficdirector.googleapis.com";
   private static final String SERVER_URI_CUSTOME_AUTHORITY = "trafficdirector2.googleapis.com";
   private static final String SERVER_URI_EMPTY_AUTHORITY = "trafficdirector3.googleapis.com";
