Add bigtable and storage to conformance-tests module

google-cloud-testing/google-cloud-conformance-tests/generate-conformance-tests.sh

@@ -22,22 +22,40 @@ function errNotify() {
 }
 trap errNotify ERR
 
-function generateFirestore() {
+function cpDir() {
+  mkdir -p $1
+  cp -R -t $1 ${@:2}
+}
+
+function main() {
   rm generate.log 2> /dev/null || true
 
-  local javaPackage="com/google/cloud/conformance/firestore/v1"
+  local javaBasePackage="com/google/cloud/conformance"
+  local firestorePackage="${javaBasePackage}/firestore/v1"
+  local storagePackage="${javaBasePackage}/storage/v1"
+  local bigtablePackage="${javaBasePackage}/bigtable/v2"
 
   msg "Cleaning existing generated protos"
-  rm -rf src/main/java/${javaPackage}/*
+  rm -rf src/main/java/${firestorePackage}/*
+  rm -rf src/main/java/${storagePackage}/*
+  rm -rf src/main/java/${bigtablePackage}/*
   msg "Cleaning existing test definitions"
-  rm -rf src/main/resources/${javaPackage}/*
+  rm -rf src/main/resources/${firestorePackage}/*
+  rm -rf src/main/resources/${storagePackage}/*
+  rm -rf src/main/resources/${bigtablePackage}/*
   msg "Cleaning existing proto files"
   rm -rf src/main/proto/google/cloud/conformance/firestore/v1/*
+  rm -rf src/main/proto/google/cloud/conformance/storage/v1/*
+  rm -rf src/main/proto/google/cloud/conformance/bigtable/v2/*
 
   msg "Copying new proto files"
-  cp -R -t src/main/proto/ conformance-tests/firestore/v1/proto/*
+  cpDir src/main/proto/ conformance-tests/firestore/v1/proto/*
+  cpDir src/main/proto/ conformance-tests/storage/v1/proto/*
+  cpDir src/main/proto/ conformance-tests/bigtable/v2/proto/*
   msg "Copying new test definitions"
-  cp -R -t "src/main/resources/${javaPackage}/" conformance-tests/firestore/v1/*.json
+  cpDir "src/main/resources/${firestorePackage}/" conformance-tests/firestore/v1/*.json
+  cpDir "src/main/resources/${storagePackage}/" conformance-tests/storage/v1/*.json
+  cpDir "src/main/resources/${bigtablePackage}/" conformance-tests/bigtable/v2/*.json
 
   msg "Generating protos"
   mvn -Pgen-conformance-protos clean verify > generate.log 2>&1
@@ -46,30 +64,26 @@ function generateFirestore() {
   ## java classes generated from protoc do not include the copyright header
   ## prepend it to the generated files
   local moduleDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-  pushd target/generated-sources/protobuf/java/${javaPackage}
-  for f in $(find ./ -type f -name '*.java'); do
-    echo "Processing $f"
+  pushd target/generated-sources/protobuf/java/ > /dev/null 2>&1
+  for f in $(find ./ -type f -name '*.java' | sort); do
+    msg "Processing $f"
     mv ${f} ${f}.tmp
     cat ${moduleDir}/copyright-header.txt > ${f}
     cat ${f}.tmp >> ${f}
     rm ${f}.tmp
   done
-  popd
+  popd > /dev/null 2>&1
 
   ## move generated proto class(es) into the main src root
-  cp -R -t src/main/java/${javaPackage} target/generated-sources/protobuf/java/${javaPackage}/*
+  cpDir src/main/java/ target/generated-sources/protobuf/java/*
 
   ## cleanup any generated files that may have not been moved over
   mvn clean > /dev/null 2>&1
 
-  msg "Building module"
+  msg "Building module..."
   ## ensure building of the module still works
   mvn clean package
-
-}
-
-function main() {
-  generateFirestore
+  msg "Complete"
 }
 
 function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;}

google-cloud-testing/google-cloud-conformance-tests/pom.xml

@@ -31,6 +31,10 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-firestore-v1</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-bigtable-v2</artifactId>
+    </dependency>
   </dependencies>
 
   <build>