fix tests.

Author: kannanjgithub

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

@@ -105,8 +105,6 @@
 @RunWith(JUnit4.class)
 public class XdsDependencyManagerTest {
   private static final Logger log = Logger.getLogger(XdsDependencyManagerTest.class.getName());
-  public static final String CLUSTER_TYPE_NAME = XdsClusterResource.getInstance().typeName();
-  public static final String ENDPOINT_TYPE_NAME = XdsEndpointResource.getInstance().typeName();
 
   private final SynchronizationContext syncContext =
       new SynchronizationContext((t, e) -> {

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

@@ -105,7 +105,7 @@ public boolean ignoreResourceDeletion() {
 
     @Override
     public boolean isTrustedXdsServer() {
-      return false;
+      return true;
     }
 
     @Override
@@ -295,7 +295,7 @@ static XdsConfig getDefaultXdsConfig(String serverHostName)
     XdsEndpointResource.EdsUpdate edsUpdate = new XdsEndpointResource.EdsUpdate(
         EDS_NAME, lbEndpointsMap, Collections.emptyList());
     XdsClusterResource.CdsUpdate cdsUpdate = XdsClusterResource.CdsUpdate.forEds(
-        CLUSTER_NAME, EDS_NAME, EMPTY_BOOTSTRAPPER_SERVER_INFO, null, null, null, false, null)
+        CLUSTER_NAME, EDS_NAME, null, null, null, null, false, null)
         .lbPolicyConfig(getWrrLbConfigAsMap()).build();
     XdsConfig.XdsClusterConfig clusterConfig = new XdsConfig.XdsClusterConfig(
         CLUSTER_NAME, cdsUpdate, new EndpointConfig(StatusOr.fromValue(edsUpdate)));