Skip to content

Commit 6126d4f

Browse files
authored
fix(java): adding resource and reflection configurations for native image testing (#809)
* fix(java): adding resource and reflection configurations for native image testing (#809)
1 parent 00ed2a8 commit 6126d4f

File tree

6 files changed

+35
-9
lines changed

6 files changed

+35
-9
lines changed

.kokoro/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ integration)
7171
;;
7272
graalvm)
7373
# Run Unit and Integration Tests with Native Image
74-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
74+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
7575
RETURN_CODE=$?
7676
;;
7777
graalvm17)
7878
# Run Unit and Integration Tests with Native Image
79-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
79+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test "-Dtest=com.google.cloud.spanner.jdbc.it.**"
8080
RETURN_CODE=$?
8181
;;
8282
samples)

owlbot.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
'.github/release-please.yml',
2222
'.github/sync-repo-settings.yaml',
2323
'.github/blunderbuss.yml',
24-
'.kokoro/nightly/integration.cfg'
24+
'.kokoro/nightly/integration.cfg',
25+
'.kokoro/build.sh'
2526
])

pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,14 @@
230230
<exclude>com.google.cloud.spanner.jdbc.JdbcStatementTimeoutTest</exclude>
231231
</excludes>
232232
<reportNameSuffix>sponge_log</reportNameSuffix>
233+
<systemPropertyVariables>
234+
<spanner.testenv.config.class>
235+
com.google.cloud.spanner.GceTestEnvConfig
236+
</spanner.testenv.config.class>
237+
<spanner.testenv.instance>
238+
projects/gcloud-devel/instances/spanner-testing-east1
239+
</spanner.testenv.instance>
240+
</systemPropertyVariables>
233241
</configuration>
234242
</plugin>
235243
<plugin>
@@ -319,6 +327,12 @@
319327
<groupId>org.apache.maven.plugins</groupId>
320328
<artifactId>maven-dependency-plugin</artifactId>
321329
<configuration>
330+
<ignoredUsedUndeclaredDependencies>
331+
<ignoredUsedUndeclaredDependency>org.graalvm.sdk:graal-sdk</ignoredUsedUndeclaredDependency>
332+
<ignoredUsedUndeclaredDependency>com.google.api.grpc:grpc-google-cloud-spanner-v1</ignoredUsedUndeclaredDependency>
333+
<ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1</ignoredUsedUndeclaredDependency>
334+
<ignoredUsedUndeclaredDependency>com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1</ignoredUsedUndeclaredDependency>
335+
</ignoredUsedUndeclaredDependencies>
322336
<ignoredUnusedDeclaredDependencies>
323337
<!-- TODO: Remove grpc-alts from ignored list once it has been removed from java-spanner -->
324338
<ignoredDependency>io.grpc:grpc-alts</ignoredDependency>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\
2+
com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\
3+
com.google.common.collect.RegularImmutableMap
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"resources":{
3+
"includes":[
4+
{"pattern":".*.sql"},
5+
{"pattern":".*.json"},
6+
{"pattern":".*.txt"}
7+
]
8+
}
9+
}

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
3636
import com.google.common.base.Strings;
3737
import com.google.common.io.BaseEncoding;
38-
import java.io.File;
39-
import java.io.FileNotFoundException;
38+
import java.io.IOException;
39+
import java.io.InputStream;
4040
import java.io.StringReader;
4141
import java.math.BigDecimal;
4242
import java.sql.BatchUpdateException;
@@ -54,7 +54,6 @@
5454
import java.util.Arrays;
5555
import java.util.Calendar;
5656
import java.util.List;
57-
import java.util.Objects;
5857
import java.util.Scanner;
5958
import java.util.TimeZone;
6059
import java.util.UUID;
@@ -1106,14 +1105,14 @@ private void assertDefaultParameterMetaData(ParameterMetaData pmd, int expectedP
11061105
}
11071106

11081107
private List<String> readValuesFromFile(String filename) {
1109-
File file = new File(Objects.requireNonNull(getClass().getResource(filename)).getFile());
11101108
StringBuilder builder = new StringBuilder();
1111-
try (Scanner scanner = new Scanner(file)) {
1109+
try (InputStream stream = ITJdbcPreparedStatementTest.class.getResourceAsStream(filename)) {
1110+
Scanner scanner = new Scanner(stream);
11121111
while (scanner.hasNextLine()) {
11131112
String line = scanner.nextLine();
11141113
builder.append(line).append("\n");
11151114
}
1116-
} catch (FileNotFoundException e) {
1115+
} catch (IOException e) {
11171116
throw new RuntimeException(e);
11181117
}
11191118
String[] array = builder.toString().split(";");

0 commit comments

Comments
 (0)