fix: use unique db names for parallel tests

olavloite · lesv · commit e908fd61fbe3 · 2020-02-16T12:12:55.000-08:00
Integration tests should use unique database names as these
may execute in parallel for different Java versions.
diff --git a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java
@@ -39,6 +39,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import javax.annotation.Nullable;
@@ -49,6 +51,7 @@
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class SpannerGroupWriteIT {
 
+  private final Random random = new Random();
   private String instanceId;
   private String databaseId;
 
@@ -59,7 +62,7 @@ public class SpannerGroupWriteIT {
   @Before
   public void setUp() throws Exception {
     instanceId = System.getProperty("spanner.test.instance");
-    databaseId = "df-spanner-groupwrite-it";
+    databaseId = "df-spanner-gwrite-it-" + random.nextInt(1000000000);
 
     spannerOptions = SpannerOptions.getDefaultInstance();
     spanner = spannerOptions.getService();
diff --git a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java
@@ -34,6 +34,8 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
@@ -44,6 +46,7 @@
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class SpannerReadIT {
 
+  private final Random random = new Random();
   private String instanceId;
   private String databaseId;
 
@@ -53,7 +56,7 @@ public class SpannerReadIT {
   @Before
   public void setUp() throws InterruptedException, ExecutionException {
     instanceId = System.getProperty("spanner.test.instance");
-    databaseId = "df-spanner-read-it";
+    databaseId = "df-spanner-read-it-" + random.nextInt(1000000000);
 
     spannerOptions = SpannerOptions.getDefaultInstance();
     spanner = spannerOptions.getService();
diff --git a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java
@@ -34,6 +34,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Random;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.junit.After;
@@ -43,6 +45,7 @@
 @SuppressWarnings("checkstyle:abbreviationaswordinname")
 public class SpannerWriteIT {
 
+  private final Random random = new Random();
   private String instanceId;
   private String databaseId;
 
@@ -55,7 +58,7 @@ public class SpannerWriteIT {
   public void setUp() throws Exception {
 
     instanceId = System.getProperty("spanner.test.instance");
-    databaseId = "df-spanner-write-it";
+    databaseId = "df-spanner-write-it-" + random.nextInt(1000000000);
 
     spannerOptions = SpannerOptions.getDefaultInstance();
     spanner = spannerOptions.getService();
