Use GOOGLE_CLOUD_PROJECT for BigQuery tests.

tswast · tswast · commit 26c61c672047 · 2017-01-30T10:37:09.000-08:00
This removes dependency on hard-coded project name for the BigQuery REST
samples.
diff --git a/.travis.yml b/.travis.yml
@@ -42,6 +42,7 @@ before_install:
 - openssl aes-256-cbc -K $encrypted_eb858daba67b_key -iv $encrypted_eb858daba67b_iv -in secrets.env.enc -out secrets.env -d
   && set +x && source secrets.env && set -x
   || true
+- export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
 # Skip the install step, since Maven will download the dependencies we need
 # when the test build runs.
 # http://stackoverflow.com/q/31945809/101923
diff --git a/bigquery/rest/README.md b/bigquery/rest/README.md
@@ -11,19 +11,31 @@ Install [Maven](http://maven.apache.org/).
 
 Build your project with:
 
-	mvn clean package -DskipTests
+    mvn clean package -DskipTests
 
 You can then run a given `ClassName` via:
 
-	mvn exec:java -Dexec.mainClass=com.example.bigquery.ClassName \
-		-Dexec.args="any arguments to the app"
+    mvn exec:java -Dexec.mainClass=com.example.bigquery.ClassName \
+      -Dexec.args="any arguments to the app"
 
 ### Labeling a dataset
 
 [Label a dataset](https://cloud.google.com/bigquery/docs/labeling-datasets).
 
-	mvn exec:java -Dexec.mainClass=com.example.bigquery.LabelsSample \
-		-Dexec.args="project-id dataset-id label-key label-value"
+    mvn exec:java -Dexec.mainClass=com.example.bigquery.LabelsSample \
+      -Dexec.args="project-id dataset-id label-key label-value"
+
+## Testing
+
+To run the tests for this sample, first set the `GOOGLE_CLOUD_PROJECT`
+environment variable. The project should have a dataset named `test_dataset`
+with a table named `test_table`.
+
+    export GOOGLE_CLOUD_PROJECT=my-project
+
+Then run the tests with Maven.
+
+    mvn clean verify
 
 ## Products
 - [Google BigQuery][2]
diff --git a/bigquery/rest/src/test/java/com/example/bigquery/Constants.java b/bigquery/rest/src/test/java/com/example/bigquery/Constants.java
@@ -17,7 +17,6 @@
 package com.example.bigquery;
 
 public class Constants {
-  public static final String PROJECT_ID = "cloud-samples-tests";
-  public static final String DATASET_ID = "test_dataset_java";
-  public static final String TABLE_ID = "test_table_java";
+  public static final String DATASET_ID = "test_dataset";
+  public static final String TABLE_ID = "test_table";
 }
diff --git a/bigquery/rest/src/test/java/com/example/bigquery/LabelsSampleIT.java b/bigquery/rest/src/test/java/com/example/bigquery/LabelsSampleIT.java
@@ -33,9 +33,11 @@
 public class LabelsSampleIT {
   private ByteArrayOutputStream bout;
   private PrintStream out;
+  private String projectId;
 
   @Before
   public void setUp() {
+    projectId = System.getenv("GOOGLE_CLOUD_PROJECT");
     bout = new ByteArrayOutputStream();
     out = new PrintStream(bout);
     System.setOut(out);
@@ -49,7 +51,7 @@ public void tearDown() {
   @Test
   public void testLabelDataset() throws Exception {
     LabelsSample.main(
-        new String[] {Constants.PROJECT_ID, Constants.DATASET_ID, "environment", "test"});
+        new String[] {projectId, Constants.DATASET_ID, "environment", "test"});
     String got = bout.toString();
     assertThat(got).contains("Updated label \"environment\" with value \"test\"");
   }
@@ -58,7 +60,7 @@ public void testLabelDataset() throws Exception {
   public void testLabelTable() throws Exception {
     LabelsSample.main(
         new String[] {
-            Constants.PROJECT_ID,
+            projectId,
             Constants.DATASET_ID,
             Constants.TABLE_ID,
             "data-owner",

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`package com.example.bigquery;`
`18`	`18`
`19`	`19`	`public class Constants {`
`20`		`- public static final String PROJECT_ID = "cloud-samples-tests";`
`21`		`- public static final String DATASET_ID = "test_dataset_java";`
`22`		`- public static final String TABLE_ID = "test_table_java";`
	`20`	`+ public static final String DATASET_ID = "test_dataset";`
	`21`	`+ public static final String TABLE_ID = "test_table";`
`23`	`22`	`}`