---

mziccard · mziccard · commit f0fad1e9c7aa · 2016-05-11T13:57:11.000+02:00
yaml --- r: 4811 b: refs/heads/logging-alpha c: 215a5df h: refs/heads/master i: 4809: 97178da 4807: b6bc04e
diff --git a/[refs] b/[refs]
@@ -12,7 +12,7 @@ refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
 refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
 refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
 refs/heads/gcs-nio: 283aeaf15efdcf3621eb6859f05e55ad7764375d
-refs/heads/logging-alpha: cd848c0ff6edc1da9965e853219bfb72837fd37e
+refs/heads/logging-alpha: 215a5dfd611a58a2a2114fae84c69515597d002e
 refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
 refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0
 refs/tags/v0.1.2: 3eb3fe866ba22487686048f45d927b8c8638ea3f
diff --git a/branches/logging-alpha/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubsubHelper.java b/branches/logging-alpha/gcloud-java-pubsub/src/main/java/com/google/cloud/pubsub/testing/LocalPubsubHelper.java
@@ -19,17 +19,21 @@
 import com.google.api.gax.testing.DownloadableEmulatorRunner;
 import com.google.api.gax.testing.GCloudEmulatorRunner;
 import com.google.api.gax.testing.LocalServiceHelper;
-
-import io.grpc.ManagedChannel;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
+import com.google.cloud.AuthCredentials;
+import com.google.cloud.RetryParams;
+import com.google.cloud.pubsub.PubSubOptions;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
+
+import io.grpc.ManagedChannel;
+import io.grpc.netty.NegotiationType;
+import io.grpc.netty.NettyChannelBuilder;
 
 /**
  * A class that runs a Pubsub emulator instance for use in tests.
@@ -38,11 +42,13 @@ public class LocalPubsubHelper {
 
   private final int port;
   private final LocalServiceHelper serviceHelper;
+  private final String projectId;
 
   // Local server settings
   private static final int DEFAULT_PORT = 8080;
   private static final String DEFAULT_HOST = "localhost";
   private static final URL EMULATOR_URL;
+  private static final String PROJECT_ID_PREFIX = "test-project-";
 
   // GCloud emulator settings
   private static final String GCLOUD_CMD_TEXT = "gcloud beta emulators pubsub start";
@@ -77,8 +83,8 @@ public LocalPubsubHelper() {
     DownloadableEmulatorRunner downloadRunner =
         new DownloadableEmulatorRunner(Arrays.asList(BIN_NAME, BIN_CMD_PORT_FLAG + port),
             EMULATOR_URL, MD5_CHECKSUM);
-    serviceHelper =
-        new LocalServiceHelper(Arrays.asList(gcloudRunner, downloadRunner), port);
+    serviceHelper = new LocalServiceHelper(Arrays.asList(gcloudRunner, downloadRunner), port);
+    projectId = PROJECT_ID_PREFIX + UUID.randomUUID().toString();
   }
 
   /**
@@ -121,4 +127,17 @@ public ManagedChannel createChannel() {
         .negotiationType(NegotiationType.PLAINTEXT)
         .build();
   }
+
+  /**
+   * Returns a {@link PubSubOptions} instance that sets the host to use the PubSub emulator on
+   * localhost.
+   */
+  public PubSubOptions options() {
+    return PubSubOptions.builder()
+        .projectId(projectId)
+        .host("localhost:" + port)
+        .authCredentials(AuthCredentials.noAuth())
+        .retryParams(RetryParams.noRetries())
+        .build();
+  }
 }
