fix(java): adding resource and reflection configurations for native i…

…mage testing (#809) * fix(java): adding resource and reflection configurations for native image testing (#809)
googleapis · May 31, 2022 · 6126d4f · 6126d4f
1 parent 00ed2a8
commit 6126d4f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 9 deletions.
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -71,12 +71,12 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
     RETURN_CODE=$?
     ;;
 graalvm17)
     # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
     RETURN_CODE=$?
     ;;
 samples)

diff --git a/owlbot.py b/owlbot.py
@@ -21,5 +21,6 @@
     '.github/release-please.yml',
     '.github/sync-repo-settings.yaml',
     '.github/blunderbuss.yml',
-    '.kokoro/nightly/integration.cfg'
+    '.kokoro/nightly/integration.cfg',
+    '.kokoro/build.sh'
 ])
diff --git a/pom.xml b/pom.xml
@@ -230,6 +230,14 @@
             <exclude>com.google.cloud.spanner.jdbc.JdbcStatementTimeoutTest</exclude>
           </excludes>
           <reportNameSuffix>sponge_log</reportNameSuffix>
+          <systemPropertyVariables>
+            <spanner.testenv.config.class>
+              com.google.cloud.spanner.GceTestEnvConfig
+            </spanner.testenv.config.class>
+            <spanner.testenv.instance>
+              projects/gcloud-devel/instances/spanner-testing-east1
+            </spanner.testenv.instance>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>
@@ -319,6 +327,12 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
+            <ignoredUsedUndeclaredDependencies>
+              <ignoredUsedUndeclaredDependency>org.graalvm.sdk:graal-sdk</ignoredUsedUndeclaredDependency>
+              <ignoredUsedUndeclaredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredUsedUndeclaredDependency>
+              <ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1</ignoredUsedUndeclaredDependency>
+              <ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1</ignoredUsedUndeclaredDependency>
+            </ignoredUsedUndeclaredDependencies>
             <ignoredUnusedDeclaredDependencies>
               <!-- TODO: Remove grpc-alts from ignored list once it has been removed from java-spanner -->
               <ignoredDependency>io.grpc:grpc-alts</ignoredDependency>

diff --git a/.../META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/.../META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties
@@ -0,0 +1,3 @@
+Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\
+  com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\
+  com.google.common.collect.RegularImmutableMap
diff --git a/...ces/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/resource-config.json b/...ces/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/resource-config.json
@@ -0,0 +1,9 @@
+{
+  "resources":{
+    "includes":[
+      {"pattern":".*.sql"},
+      {"pattern":".*.json"},
+      {"pattern":".*.txt"}
+    ]
+  }
+}
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java
@@ -35,8 +35,8 @@
 import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
-import java.io.File;
-import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
 import java.math.BigDecimal;
 import java.sql.BatchUpdateException;
@@ -54,7 +54,6 @@
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 import java.util.Scanner;
 import java.util.TimeZone;
 import java.util.UUID;
@@ -1106,14 +1105,14 @@ private void assertDefaultParameterMetaData(ParameterMetaData pmd, int expectedP
   }
 
   private List<String> readValuesFromFile(String filename) {
-    File file = new File(Objects.requireNonNull(getClass().getResource(filename)).getFile());
     StringBuilder builder = new StringBuilder();
-    try (Scanner scanner = new Scanner(file)) {
+    try (InputStream stream = ITJdbcPreparedStatementTest.class.getResourceAsStream(filename)) {
+      Scanner scanner = new Scanner(stream);
       while (scanner.hasNextLine()) {
         String line = scanner.nextLine();
         builder.append(line).append("\n");
       }
-    } catch (FileNotFoundException e) {
+    } catch (IOException e) {
       throw new RuntimeException(e);
     }
     String[] array = builder.toString().split(";");