Fix tests, use resources instead of files

Author: Bill Prin

bigquery/pom.xml

@@ -2,13 +2,18 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud.bigquery.samples</groupId>
-  <artifactId>bq-gettingstarted</artifactId>
+  <artifactId>bigquery-samples</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>bq-gettingstarted</name>
-  <url>http://maven.apache.org</url>
 
-  <repositories>
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+
+    <repositories>
       <repository>
           <id>googleapis</id>
           <url>https://google-api-client-libraries.appspot.com/mavenrepo</url>
@@ -39,8 +44,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -56,6 +59,12 @@
   </properties>
 
   <build>
+      <sourceDirectory>src/main/java</sourceDirectory>
+      <resources>
+        <resource>
+          <directory>src/main/resources</directory>
+        </resource>
+      </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

bigquery/src/main/resources/constants.json

@@ -0,0 +1,9 @@
+{
+    "projectId": "bigquery-devrel-samples",
+    "datasetId": "test_dataset",
+    "currentTableId": "test_table",
+    "newTableId": "test_table2",
+    "cloudStorageInputURI": "gs://bigquery-devrel-samples-bucket/data.csv",
+    "cloudStorageOutputURI": "gs://bigquery-devrel-samples-bucket/output.csv",
+    "query": "SELECT corpus FROM publicdata:samples.shakespeare GROUP BY corpus;"
+}

bigquery/src/main/resources/schema.json

@@ -0,0 +1 @@
+[{"type": "STRING", "name": "Name"}, {"type": "INTEGER", "name": "Age"}, {"type": "FLOAT", "name": "Weight"}, {"type": "BOOLEAN", "name": "IsMagic"}]

bigquery/src/main/resources/streamrows.json

@@ -0,0 +1,7 @@
+[
+  {"Name": "test", "Age": 0, "Weight": 100.0, "IsMagic": false},
+  {"Name": "test", "Age": 1, "Weight": 100.0, "IsMagic": false},
+  {"Name": "test", "Age": 2, "Weight": 100.0, "IsMagic": false},
+  {"Name": "test", "Age": 3, "Weight": 100.0, "IsMagic": false},
+  {"Name": "test", "Age": 0, "Weight": 100.0, "IsMagic": false}
+]

bigquery/src/test/java/com/google/cloud/bigquery/samples/test/BigquerySampleTest.java

@@ -5,17 +5,15 @@
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonSyntaxException;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
+import java.io.*;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
 
 /**
  * TODO: Insert description here. (generated by elibixby)
  */
-public class BigquerySampleTest extends BigqueryUtils{
+public class BigquerySampleTest extends BigqueryUtils {
 
   protected static class Constants{
     private String projectId;
@@ -69,23 +67,18 @@ public String getCloudStorageInputURI() {
     }
   }
 
-
-  protected static final Path RESOURCE_PATH = Paths.get(System.getProperty("user.dir"))
-      .getParent().resolve("resources");
-  
-  protected static final File CONSTANTS_FILE = new File(RESOURCE_PATH.resolve("constants.json").toString());
-  
   protected static Constants CONSTANTS = null ;
-  
+
   protected BigquerySampleTest() throws JsonSyntaxException, JsonIOException, FileNotFoundException{
     if(CONSTANTS == null){
+      InputStream is = this.getClass().getResourceAsStream
+              ("/constants.json");
       CONSTANTS = (new Gson()).<Constants>fromJson(
-          new FileReader(CONSTANTS_FILE),
-          Constants.class);
-      
+              new InputStreamReader(is),
+              Constants.class);
     }
   }
-  
-  
-  
+
+
+
 }

bigquery/src/test/java/com/google/cloud/bigquery/samples/test/LoadDataCSVSampleTest.java

@@ -6,10 +6,7 @@
 
 import org.junit.Test;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
 
 /**
  * TODO: Insert description here. (generated by elibixby)
@@ -25,17 +22,20 @@ public LoadDataCSVSampleTest() throws JsonSyntaxException, JsonIOException, File
     // TODO(elibixby): Auto-generated constructor stub
     super();
   }
-  
+
   @Test
   public void testLoadData() throws IOException, InterruptedException{
+
+      InputStreamReader is = new InputStreamReader(LoadDataCSVSample
+              .class.getResourceAsStream("/schema.json"));
     LoadDataCSVSample.run(
-        CONSTANTS.getCloudStorageInputURI(), 
+        CONSTANTS.getCloudStorageInputURI(),
         CONSTANTS.getProjectId(),
         CONSTANTS.getDatasetId(),
         CONSTANTS.getNewTableId(),
-        new FileReader(new File(RESOURCE_PATH.resolve("schema.json").toString())),
+          is ,
         5000L);
   }
-  
+
 
 }

bigquery/src/test/java/com/google/cloud/bigquery/samples/test/StreamingSampleTest.java

@@ -10,10 +10,7 @@
 
 import org.junit.Test;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
+import java.io.*;
 import java.util.Iterator;
 
 /**
@@ -29,22 +26,22 @@ public class StreamingSampleTest extends BigquerySampleTest {
   public StreamingSampleTest() throws JsonSyntaxException, JsonIOException, FileNotFoundException {
     super();
   }
-  
+
   @Test
   public void testStream() throws IOException{
     JsonReader json = new JsonReader(
-        new FileReader(
-            new File(RESOURCE_PATH.resolve("streamrows.json").toString())));
+            new InputStreamReader(BigquerySampleTest
+                    .class.getResourceAsStream("/streamrows.json")));
     Iterator<TableDataInsertAllResponse> response = StreamingSample.run(
         CONSTANTS.getProjectId(),
         CONSTANTS.getDatasetId(),
         CONSTANTS.getCurrentTableId(),
         json);
-    
+
     while(response.hasNext()){
       assertTrue(!response.next().isEmpty());
     }
-    
+
   }
-  
+
 }

pom.xml

@@ -21,6 +21,7 @@
     <modules>
         <module>taskqueue/deferred</module>
         <module>unittests</module>
+        <module>bigquery</module>
     </modules>
 
     <dependencyManagement>
@@ -68,11 +69,6 @@
             <version>${appengine.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>${appengine.target.version}</version>
-        </dependency>
     </dependencies>
   </dependencyManagement>