Skip to content

Commit adf1b53

Browse files
committed
fix: creates quickstart db for test
Creates the quickstart database for the integration test.
1 parent 90ebe33 commit adf1b53

File tree

4 files changed

+33
-6
lines changed

4 files changed

+33
-6
lines changed

Diff for: samples/install-without-bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<systemPropertyVariables>
145145
<spanner.test.instance>spanner-testing</spanner.test.instance>
146146
<spanner.sample.database>mysample</spanner.sample.database>
147-
<spanner.quickstart.database>quickstart-db</spanner.quickstart.database>
147+
<spanner.quickstart.database>quick-db</spanner.quickstart.database>
148148
</systemPropertyVariables>
149149
</configuration>
150150
</plugin>

Diff for: samples/snapshot/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<systemPropertyVariables>
144144
<spanner.test.instance>spanner-testing</spanner.test.instance>
145145
<spanner.sample.database>mysample</spanner.sample.database>
146-
<spanner.quickstart.database>quickstart-db</spanner.quickstart.database>
146+
<spanner.quickstart.database>quick-db</spanner.quickstart.database>
147147
</systemPropertyVariables>
148148
</configuration>
149149
</plugin>

Diff for: samples/snippets/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<systemPropertyVariables>
149149
<spanner.test.instance>spanner-testing</spanner.test.instance>
150150
<spanner.sample.database>mysample</spanner.sample.database>
151-
<spanner.quickstart.database>quickstart-db</spanner.quickstart.database>
151+
<spanner.quickstart.database>quick-db</spanner.quickstart.database>
152152
</systemPropertyVariables>
153153
</configuration>
154154
</plugin>

Diff for: samples/snippets/src/test/java/com/example/spanner/QuickstartSampleIT.java

+30-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,19 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

21+
import com.google.cloud.spanner.DatabaseAdminClient;
22+
import com.google.cloud.spanner.DatabaseNotFoundException;
23+
import com.google.cloud.spanner.Spanner;
24+
import com.google.cloud.spanner.SpannerOptions;
2125
import java.io.ByteArrayOutputStream;
2226
import java.io.PrintStream;
27+
import java.util.Arrays;
28+
import java.util.Collections;
29+
import java.util.UUID;
2330
import org.junit.After;
31+
import org.junit.AfterClass;
2432
import org.junit.Before;
33+
import org.junit.BeforeClass;
2534
import org.junit.Test;
2635
import org.junit.runner.RunWith;
2736
import org.junit.runners.JUnit4;
@@ -32,13 +41,27 @@
3241
@RunWith(JUnit4.class)
3342
@SuppressWarnings("checkstyle:abbreviationaswordinname")
3443
public class QuickstartSampleIT {
35-
private String instanceId = System.getProperty("spanner.test.instance");
36-
// This database needs to exist for test to pass.
37-
private String dbId = System.getProperty("spanner.quickstart.database");
44+
private static String instanceId = System.getProperty("spanner.test.instance");
45+
private static String dbId = formatForTest(System.getProperty("spanner.quickstart.database"));
46+
private static DatabaseAdminClient dbClient;
47+
3848
private ByteArrayOutputStream bout;
3949
private PrintStream stdOut = System.out;
4050
private PrintStream out;
4151

52+
@BeforeClass
53+
public static void createDatabase() {
54+
final SpannerOptions options = SpannerOptions.newBuilder().build();
55+
final Spanner spanner = options.getService();
56+
dbClient = spanner.getDatabaseAdminClient();
57+
dbClient.createDatabase(instanceId, dbId, Collections.emptyList());
58+
}
59+
60+
@AfterClass
61+
public static void dropDatabase() {
62+
dbClient.dropDatabase(instanceId, dbId);
63+
}
64+
4265
@Before
4366
public void setUp() {
4467
bout = new ByteArrayOutputStream();
@@ -59,4 +82,8 @@ public void testQuickstart() throws Exception {
5982
String got = bout.toString();
6083
assertThat(got).contains("1");
6184
}
85+
86+
private static String formatForTest(String name) {
87+
return name + "-" + UUID.randomUUID().toString().substring(0, 20);
88+
}
6289
}

0 commit comments

Comments
 (0)