try fixing tests

pongad · pongad · commit aa14500ac6bc · 2017-05-25T15:19:03.000+10:00
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java
@@ -16,14 +16,18 @@
 
 package com.google.cloud.pubsub.spi.v1;
 
+import static org.junit.Assert.*;
+
 import com.google.api.core.ApiFuture;
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.FlowControlSettings;
 import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
+import com.google.api.gax.core.CredentialsProvider;
 import com.google.api.gax.grpc.ChannelProvider;
 import com.google.api.gax.grpc.ExecutorProvider;
 import com.google.api.gax.grpc.FixedExecutorProvider;
 import com.google.api.gax.grpc.InstantiatingExecutorProvider;
+import com.google.auth.Credentials;
 import com.google.cloud.pubsub.spi.v1.Publisher.Builder;
 import com.google.protobuf.ByteString;
 import com.google.pubsub.v1.PublishResponse;
@@ -35,18 +39,15 @@
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.internal.ServerImpl;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.threeten.bp.Duration;
 
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-
-import static org.junit.Assert.*;
-
 @RunWith(JUnit4.class)
 public class PublisherImplTest {
 
@@ -78,6 +79,16 @@ public ManagedChannel getChannel(Executor executor) {
         }
       };
 
+  // Gax declares a similar type, which can be used after gax is upgraded.
+  @Deprecated
+  private static final CredentialsProvider NO_CREDENTIALS_PROVIDER =
+      new CredentialsProvider() {
+        @Override
+        public Credentials getCredentials() {
+          return null;
+        }
+      };
+
   private FakeScheduledExecutorService fakeExecutor;
 
   private FakePublisherServiceImpl testPublisherServiceImpl;
@@ -427,6 +438,7 @@ public void testPublisherGetters() throws Exception {
             .setDelayThreshold(Duration.ofMillis(11))
             .setElementCountThreshold(12L)
             .build());
+    builder.setCredentialsProvider(NO_CREDENTIALS_PROVIDER);
     builder.setFlowControlSettings(
         FlowControlSettings.newBuilder()
             .setMaxOutstandingRequestBytes(13)
@@ -661,6 +673,7 @@ private Builder getTestPublisherBuilder() {
     return Publisher.defaultBuilder(TEST_TOPIC)
         .setExecutorProvider(FixedExecutorProvider.create(fakeExecutor))
         .setChannelProvider(TEST_CHANNEL_PROVIDER)
+        .setCredentialsProvider(NO_CREDENTIALS_PROVIDER)
         .setLongRandom(
             new Publisher.LongRandom() {
               @Override
