---

lucasoares · sduskis · commit ee0acabf5e81 · 2019-04-11T16:16:32.000-04:00
yaml --- r: 27567 b: refs/heads/mrschmidt-collectiongroup c: 47884a3 h: refs/heads/master i: 27565: 1f58d5c 27563: 4937ae3 27559: 64a887e 27551: 9ecd0b5
diff --git a/[refs] b/[refs]
@@ -173,7 +173,7 @@ refs/heads/autosynth-securitycenter: f2f2feb8f3949c986d37e55cd23cdb0ce774f287
 refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
 refs/heads/cscc-samples: 620d105e6b574cfeeee04e413a157b7bd34ebc8b
 refs/heads/igorbernstein2-patch-1: f62464ee14df1e44a3b173cdc3976563d1b3078b
-refs/heads/mrschmidt-collectiongroup: f9ffc7a9a6b1683f3e9b41ff265d58e305576645
+refs/heads/mrschmidt-collectiongroup: 47884a3c08d216d4ae7a7a891291af717fb47ef5
 refs/heads/release-google-cloud-java-v0.83.0: 4b55ec1b81b3886ede61ae868391a3cdf7eed90e
 refs/heads/release-google-cloud-java-v0.83.1-SNAPSHOT: 8d6db7ee534d12b1df38d8cf314871df76f87577
 refs/heads/v4support: aa837fd70877f5a0628d8036e88952db035b792c
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/LocalDatastoreHelper.java
@@ -78,10 +78,10 @@ public class LocalDatastoreHelper extends BaseEmulatorHelper<DatastoreOptions> {
     }
   }
 
-  private LocalDatastoreHelper(double consistency) {
+  private LocalDatastoreHelper(double consistency, int port) {
     super(
         "datastore",
-        BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
+        port > 0 ? port : BaseEmulatorHelper.findAvailablePort(DEFAULT_PORT),
         PROJECT_ID_PREFIX + UUID.randomUUID().toString());
     Path tmpDirectory = null;
     try {
@@ -162,7 +162,32 @@ public double getConsistency() {
    *     consistency of non-ancestor queries; non-ancestor queries are eventually consistent.
    */
   public static LocalDatastoreHelper create(double consistency) {
-    return new LocalDatastoreHelper(consistency);
+    return create(consistency, 0);
+  }
+
+  /**
+   * Creates a local Datastore helper with the specified settings for project ID and consistency.
+   *
+   * @param consistency the fraction of Datastore writes that are immediately visible to global
+   *     queries, with 0.0 meaning no writes are immediately visible and 1.0 meaning all writes are
+   *     immediately visible. Note that setting this to 1.0 may mask incorrect assumptions about the
+   *     consistency of non-ancestor queries; non-ancestor queries are eventually consistent.
+   * @param port the port to be used to start the emulator service. Note that setting this to 0 the
+   *     emulator will search for a free random port.
+   */
+  public static LocalDatastoreHelper create(double consistency, int port) {
+    return new LocalDatastoreHelper(consistency, port);
+  }
+
+  /**
+   * Creates a local Datastore helper with a placeholder project ID and the default consistency
+   * setting of 0.9.
+   *
+   * @param port the port to be used to start the emulator service. Note that setting this to 0 the
+   *     emulator will search for a free random port.
+   */
+  public static LocalDatastoreHelper create(int port) {
+    return new LocalDatastoreHelper(DEFAULT_CONSISTENCY, port);
   }
 
   /**
diff --git a/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java b/branches/mrschmidt-collectiongroup/google-cloud-clients/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/LocalDatastoreHelperTest.java
@@ -17,6 +17,7 @@
 package com.google.cloud.datastore.testing;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -56,6 +57,23 @@ public void testCreate() {
     assertTrue(helper.getProjectId().startsWith(PROJECT_ID_PREFIX));
   }
 
+  @Test
+  public void testCreatePort() {
+    LocalDatastoreHelper helper = LocalDatastoreHelper.create(0.75, 8888);
+    DatastoreOptions options = helper.getOptions(NAMESPACE);
+    assertTrue(options.getHost().endsWith("8888"));
+    assertTrue(Math.abs(0.75 - helper.getConsistency()) < TOLERANCE);
+    helper = LocalDatastoreHelper.create();
+    options = helper.getOptions(NAMESPACE);
+    assertTrue(Math.abs(0.9 - helper.getConsistency()) < TOLERANCE);
+    assertFalse(options.getHost().endsWith("8888"));
+    assertFalse(options.getHost().endsWith("8080"));
+    helper = LocalDatastoreHelper.create(9999);
+    options = helper.getOptions(NAMESPACE);
+    assertTrue(Math.abs(0.9 - helper.getConsistency()) < TOLERANCE);
+    assertTrue(options.getHost().endsWith("9999"));
+  }
+
   @Test
   public void testOptions() {
     LocalDatastoreHelper helper = LocalDatastoreHelper.create();
