fix tests

Author: igorbernstein2

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

@@ -201,8 +201,8 @@ public void channelPrimerIsCalledPeriodically() throws IOException {
 
  Mockito.doAnswer(extractChannelRefresher)
  .when(scheduledExecutorService)
- .schedule(
- Mockito.any(Runnable.class), Mockito.anyLong(), Mockito.eq(TimeUnit.MILLISECONDS));
+ .scheduleAtFixedRate(
+ Mockito.any(Runnable.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.any());
 
  FakeChannelFactory channelFactory =
  new FakeChannelFactory(Arrays.asList(channel1, channel2, channel3), mockChannelPrimer);
@@ -211,26 +211,16 @@ public void channelPrimerIsCalledPeriodically() throws IOException {
  // 1 call during the creation
  Mockito.verify(mockChannelPrimer, Mockito.times(1))
  .primeChannel(Mockito.any(ManagedChannel.class));
- Mockito.verify(scheduledExecutorService, Mockito.times(1))
- .schedule(
- Mockito.any(Runnable.class), Mockito.anyLong(), Mockito.eq(TimeUnit.MILLISECONDS));
 
  channelRefreshers.get(0).run();
  // 1 more call during channel refresh
  Mockito.verify(mockChannelPrimer, Mockito.times(2))
  .primeChannel(Mockito.any(ManagedChannel.class));
- Mockito.verify(scheduledExecutorService, Mockito.times(2))
- .schedule(
- Mockito.any(Runnable.class), Mockito.anyLong(), Mockito.eq(TimeUnit.MILLISECONDS));
 
  channelRefreshers.get(0).run();
  // 1 more call during channel refresh
  Mockito.verify(mockChannelPrimer, Mockito.times(3))
  .primeChannel(Mockito.any(ManagedChannel.class));
- Mockito.verify(scheduledExecutorService, Mockito.times(3))
- .schedule(
- Mockito.any(Runnable.class), Mockito.anyLong(), Mockito.eq(TimeUnit.MILLISECONDS));
- scheduledExecutorService.shutdown();
  }
 
  // ----

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

@@ -32,7 +32,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider.Builder;