From fd092d06c14bff552d0a94cbfeeccb0fe76dd77f Mon Sep 17 00:00:00 2001 From: Jisha Abubaker Date: Tue, 26 Sep 2017 13:12:18 -0700 Subject: [PATCH] samples: adding a test prefix to db to allow for concurrent runs (#867) --- .../src/test/java/com/example/spanner/SpannerSampleIT.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java b/samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java index fd695426b8..3a8c3e5903 100644 --- a/samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java +++ b/samples/snippets/src/test/java/com/example/spanner/SpannerSampleIT.java @@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.util.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -39,7 +40,7 @@ public class SpannerSampleIT { // The instance needs to exist for tests to pass. private final String instanceId = System.getProperty("spanner.test.instance"); - private final String databaseId = System.getProperty("spanner.sample.database"); + private final String databaseId = formatForTest(System.getProperty("spanner.sample.database")); DatabaseId dbId; DatabaseAdminClient dbClient; private long lastUpdateDataTimeInMillis; @@ -116,4 +117,8 @@ public void testSample() throws Exception { out = runSample("readonlytransaction"); assertThat(out.replaceAll("[\r\n]+", " ")).containsMatch("(Total Junk.*){2}"); } + + private String formatForTest(String name) { + return name + "-" + UUID.randomUUID().toString().substring(0, 20); + } }