fix test

Author: rahul2393

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java

@@ -1264,8 +1264,8 @@ public Builder setRetrySettings(RetrySettings retrySettings) {
      * builder
      *     .getSpannerStubSettingsBuilder()
      *     .applyToAllUnaryMethods(
-     *         new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
-     *           public Void apply(Builder<?, ?> input) {
+     *         new ApiFunction&lt;UnaryCallSettings.Builder&lt;?, ?&gt;, Void&gt;() {
+     *           public Void apply(Builder&lt;?, ?&gt; input) {
      *             input.setRetrySettings(retrySettings);
      *             return null;
      *           }
@@ -1292,8 +1292,8 @@ public SpannerStubSettings.Builder getSpannerStubSettingsBuilder() {
      * builder
      *     .getInstanceAdminStubSettingsBuilder()
      *     .applyToAllUnaryMethods(
-     *         new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
-     *           public Void apply(Builder<?, ?> input) {
+     *         new ApiFunction&lt;UnaryCallSettings.Builder&lt;?, ?&gt;, Void&gt;() {
+     *           public Void apply(Builder&lt;?, ?&gt; input) {
      *             input.setRetrySettings(retrySettings);
      *             return null;
      *           }
@@ -1320,8 +1320,8 @@ public InstanceAdminStubSettings.Builder getInstanceAdminStubSettingsBuilder() {
      * builder
      *     .getDatabaseAdminStubSettingsBuilder()
      *     .applyToAllUnaryMethods(
-     *         new ApiFunction<UnaryCallSettings.Builder<?, ?>, Void>() {
-     *           public Void apply(Builder<?, ?> input) {
+     *         new ApiFunction&lt;UnaryCallSettings.Builder&lt;?, ?&gt;, Void&gt;() {
+     *           public Void apply(Builder&lt;?, ?&gt; input) {
      *             input.setRetrySettings(retrySettings);
      *             return null;
      *           }

google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java

@@ -70,13 +70,9 @@ public class ChannelUsageTest {
   @Parameter(0)
   public int numChannels;
 
-  @Parameter(1)
-  public boolean enableGcpPool;
-
-  @Parameters(name = "num channels = {0}, enable GCP pool = {1}")
+  @Parameters(name = "num channels = {0}")
   public static Collection<Object[]> data() {
-    return Arrays.asList(
-        new Object[][] {{1, true}, {1, false}, {2, true}, {2, false}, {4, true}, {4, false}});
+    return Arrays.asList(new Object[][] {{1}, {2}, {4}});
   }
 
   private static final Statement SELECT1 = Statement.of("SELECT 1 AS COL1");
@@ -208,27 +204,10 @@ private SpannerOptions createSpannerOptions() {
                     .build())
             .setHost("http://" + endpoint)
             .setCredentials(NoCredentials.getInstance());
-    if (enableGcpPool) {
-      builder.enableGrpcGcpExtension();
-    }
 
     return builder.build();
   }
 
-  @Test
-  public void testCreatesNumChannels() {
-    try (Spanner spanner = createSpannerOptions().getService()) {
-      assumeFalse(
-          "GRPC-GCP is currently not supported with multiplexed sessions",
-          isMultiplexedSessionsEnabled(spanner) && enableGcpPool);
-      DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("p", "i", "d"));
-      try (ResultSet resultSet = client.singleUse().executeQuery(SELECT1)) {
-        while (resultSet.next()) {}
-      }
-    }
-    assertEquals(numChannels, batchCreateSessionLocalIps.size());
-  }
-
   @Test
   public void testUsesAllChannels() throws InterruptedException {
     final int multiplier = 2;