Skip to content

Commit f9678d9

Browse files
jinseopkim0jinseopkim0
authored
refactor(bigquerystorage): move all integration tests to google-cloud-bigquerystorage-it (#13988)
Moves all 22 integration test classes and helper/proto resources from `google-cloud-bigquerystorage` into a dedicated downstream integration test module (`google-cloud-bigquerystorage-it`). ### Motivation - Removes the test-scope dependency on `google-cloud-bigquery` from `google-cloud-bigquerystorage`. - Prevents test code and `.proto` schema duplication between `java-bigquery` and `java-bigquerystorage`. - Consolidates all end-to-end integration tests in a dedicated downstream module that depends on both `google-cloud-bigquerystorage` and `google-cloud-bigquery`. Kokoro CIs show that the migrated tests are running. b/500459077
1 parent b1f6186 commit f9678d9

26 files changed

Lines changed: 1010 additions & 6 deletions

‎java-bigquerystorage/google-cloud-bigquerystorage-it/pom.xml‎

Lines changed: 326 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,326 @@
1+
<?xml version="1.0"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>com.google.cloud</groupId>
6+
<artifactId>google-cloud-bigquerystorage-parent</artifactId>
7+
<version>3.32.0-SNAPSHOT</version>
8+
</parent>
9+
10+
<artifactId>google-cloud-bigquerystorage-it</artifactId>
11+
<name>Google Cloud BigQuery Storage Integration Tests</name>
12+
<description>Integration tests for Google Cloud BigQuery Storage</description>
13+
14+
<properties>
15+
<maven.compiler.source>1.8</maven.compiler.source>
16+
<maven.compiler.target>1.8</maven.compiler.target>
17+
</properties>
18+
19+
<dependencies>
20+
<dependency>
21+
<groupId>com.google.cloud</groupId>
22+
<artifactId>google-cloud-bigquerystorage</artifactId>
23+
<scope>test</scope>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.google.protobuf</groupId>
27+
<artifactId>protobuf-java</artifactId>
28+
<scope>test</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.google.auth</groupId>
32+
<artifactId>google-auth-library-credentials</artifactId>
33+
<scope>test</scope>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.google.cloud</groupId>
37+
<artifactId>google-cloud-core</artifactId>
38+
<scope>test</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>com.google.protobuf</groupId>
42+
<artifactId>protobuf-java-util</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>com.google.api</groupId>
47+
<artifactId>api-common</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>com.google.api.grpc</groupId>
52+
<artifactId>proto-google-common-protos</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>com.google.guava</groupId>
57+
<artifactId>guava</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.json</groupId>
62+
<artifactId>json</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.google.api</groupId>
67+
<artifactId>gax</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.grpc</groupId>
72+
<artifactId>grpc-api</artifactId>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.google.api.grpc</groupId>
77+
<artifactId>proto-google-cloud-bigquerystorage-v1</artifactId>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>com.google.auth</groupId>
82+
<artifactId>google-auth-library-oauth2-http</artifactId>
83+
<scope>test</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.apache.arrow</groupId>
87+
<artifactId>arrow-vector</artifactId>
88+
<scope>test</scope>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.apache.arrow</groupId>
92+
<artifactId>arrow-memory-core</artifactId>
93+
<scope>test</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>org.apache.arrow</groupId>
97+
<artifactId>arrow-memory-netty</artifactId>
98+
<scope>test</scope>
99+
</dependency>
100+
<dependency>
101+
<groupId>com.google.http-client</groupId>
102+
<artifactId>google-http-client</artifactId>
103+
<scope>test</scope>
104+
</dependency>
105+
<dependency>
106+
<groupId>io.opentelemetry</groupId>
107+
<artifactId>opentelemetry-api</artifactId>
108+
<scope>test</scope>
109+
</dependency>
110+
<dependency>
111+
<groupId>com.google.cloud</groupId>
112+
<artifactId>google-cloud-bigquery</artifactId>
113+
<scope>test</scope>
114+
</dependency>
115+
<dependency>
116+
<groupId>org.apache.avro</groupId>
117+
<artifactId>avro</artifactId>
118+
<scope>test</scope>
119+
</dependency>
120+
<dependency>
121+
<groupId>org.awaitility</groupId>
122+
<artifactId>awaitility</artifactId>
123+
<scope>test</scope>
124+
</dependency>
125+
<dependency>
126+
<groupId>com.google.api.grpc</groupId>
127+
<artifactId>grpc-google-cloud-bigquerystorage-v1beta1</artifactId>
128+
<scope>test</scope>
129+
</dependency>
130+
<dependency>
131+
<groupId>com.google.api.grpc</groupId>
132+
<artifactId>grpc-google-cloud-bigquerystorage-v1beta2</artifactId>
133+
<scope>test</scope>
134+
</dependency>
135+
<dependency>
136+
<groupId>com.google.api.grpc</groupId>
137+
<artifactId>grpc-google-cloud-bigquerystorage-v1beta</artifactId>
138+
<scope>test</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>com.google.api.grpc</groupId>
142+
<artifactId>proto-google-cloud-bigquerystorage-v1beta1</artifactId>
143+
<scope>test</scope>
144+
</dependency>
145+
<dependency>
146+
<groupId>com.google.api.grpc</groupId>
147+
<artifactId>proto-google-cloud-bigquerystorage-v1beta2</artifactId>
148+
<scope>test</scope>
149+
</dependency>
150+
<dependency>
151+
<groupId>com.google.api.grpc</groupId>
152+
<artifactId>proto-google-cloud-bigquerystorage-v1beta</artifactId>
153+
<scope>test</scope>
154+
</dependency>
155+
<dependency>
156+
<groupId>junit</groupId>
157+
<artifactId>junit</artifactId>
158+
<scope>test</scope>
159+
</dependency>
160+
<dependency>
161+
<groupId>com.google.truth</groupId>
162+
<artifactId>truth</artifactId>
163+
<scope>test</scope>
164+
</dependency>
165+
<dependency>
166+
<groupId>org.mockito</groupId>
167+
<artifactId>mockito-core</artifactId>
168+
<scope>test</scope>
169+
</dependency>
170+
<dependency>
171+
<groupId>org.junit.jupiter</groupId>
172+
<artifactId>junit-jupiter-api</artifactId>
173+
<version>5.11.4</version>
174+
<scope>test</scope>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.junit.jupiter</groupId>
178+
<artifactId>junit-jupiter-engine</artifactId>
179+
<version>5.11.4</version>
180+
<scope>test</scope>
181+
</dependency>
182+
<dependency>
183+
<groupId>io.opentelemetry</groupId>
184+
<artifactId>opentelemetry-sdk</artifactId>
185+
<scope>test</scope>
186+
</dependency>
187+
<dependency>
188+
<groupId>io.opentelemetry</groupId>
189+
<artifactId>opentelemetry-sdk-common</artifactId>
190+
<scope>test</scope>
191+
</dependency>
192+
<dependency>
193+
<groupId>io.opentelemetry</groupId>
194+
<artifactId>opentelemetry-sdk-trace</artifactId>
195+
<scope>test</scope>
196+
</dependency>
197+
</dependencies>
198+
199+
<build>
200+
<extensions>
201+
<extension>
202+
<groupId>kr.motd.maven</groupId>
203+
<artifactId>os-maven-plugin</artifactId>
204+
<version>1.7.1</version>
205+
</extension>
206+
</extensions>
207+
<plugins>
208+
<plugin>
209+
<groupId>org.xolstice.maven.plugins</groupId>
210+
<artifactId>protobuf-maven-plugin</artifactId>
211+
<version>0.6.1</version>
212+
<configuration>
213+
<protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
214+
</configuration>
215+
<executions>
216+
<execution>
217+
<goals>
218+
<goal>test-compile</goal>
219+
</goals>
220+
</execution>
221+
</executions>
222+
</plugin>
223+
<plugin>
224+
<groupId>org.apache.maven.plugins</groupId>
225+
<artifactId>maven-surefire-plugin</artifactId>
226+
<configuration>
227+
<skipTests>true</skipTests>
228+
</configuration>
229+
</plugin>
230+
<plugin>
231+
<groupId>org.apache.maven.plugins</groupId>
232+
<artifactId>maven-failsafe-plugin</artifactId>
233+
<version>3.5.2</version>
234+
<dependencies>
235+
<dependency>
236+
<groupId>org.apache.maven.surefire</groupId>
237+
<artifactId>surefire-junit-platform</artifactId>
238+
<version>${surefire.version}</version>
239+
</dependency>
240+
</dependencies>
241+
</plugin>
242+
</plugins>
243+
</build>
244+
245+
<profiles>
246+
<profile>
247+
<id>java17</id>
248+
<activation>
249+
<jdk>[17,)</jdk>
250+
</activation>
251+
<build>
252+
<plugins>
253+
<plugin>
254+
<groupId>org.apache.maven.plugins</groupId>
255+
<artifactId>maven-surefire-plugin</artifactId>
256+
<configuration>
257+
<argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
258+
</configuration>
259+
</plugin>
260+
<plugin>
261+
<groupId>org.apache.maven.plugins</groupId>
262+
<artifactId>maven-failsafe-plugin</artifactId>
263+
<configuration>
264+
<argLine>--add-opens=java.base/java.nio=ALL-UNNAMED</argLine>
265+
</configuration>
266+
</plugin>
267+
</plugins>
268+
</build>
269+
</profile>
270+
<profile>
271+
<id>native</id>
272+
<build>
273+
<plugins>
274+
<plugin>
275+
<groupId>org.apache.maven.plugins</groupId>
276+
<artifactId>maven-surefire-plugin</artifactId>
277+
<version>${surefire.version}</version>
278+
<dependencies>
279+
<dependency>
280+
<groupId>org.junit.jupiter</groupId>
281+
<artifactId>junit-jupiter-engine</artifactId>
282+
<version>${junit-vintage-engine.version}</version>
283+
</dependency>
284+
<dependency>
285+
<groupId>org.junit.vintage</groupId>
286+
<artifactId>junit-vintage-engine</artifactId>
287+
<version>${junit-vintage-engine.version}</version>
288+
</dependency>
289+
</dependencies>
290+
<configuration>
291+
<skipTests>false</skipTests>
292+
<!-- Include all tests during native image testing. -->
293+
<excludes combine.self="override">
294+
<exclude>**/ITBigQueryWrite*RetryTest.java</exclude>
295+
</excludes>
296+
<includes>
297+
<include>**/IT*.java</include>
298+
</includes>
299+
</configuration>
300+
</plugin>
301+
<plugin>
302+
<groupId>org.graalvm.buildtools</groupId>
303+
<artifactId>native-maven-plugin</artifactId>
304+
<version>${native-maven-plugin.version}</version>
305+
<extensions>true</extensions>
306+
<executions>
307+
<execution>
308+
<id>test-native</id>
309+
<goals>
310+
<goal>test</goal>
311+
</goals>
312+
<phase>test</phase>
313+
</execution>
314+
</executions>
315+
<configuration>
316+
<buildArgs>
317+
<buildArg>--no-fallback</buildArg>
318+
<buildArg>--no-server</buildArg>
319+
</buildArgs>
320+
</configuration>
321+
</plugin>
322+
</plugins>
323+
</build>
324+
</profile>
325+
</profiles>
326+
</project>

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryBigDecimalByteStringEncoderTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryBigDecimalByteStringEncoderTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageLongRunningTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageLongRunningTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageReadClientTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageReadClientTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageWriteClientTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageWriteClientTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryTimeEncoderTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryTimeEncoderTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryWriteNonQuotaRetryTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryWriteNonQuotaRetryTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryWriteQuotaRetryTest.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryWriteQuotaRetryTest.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/util/BigQueryResource.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/util/BigQueryResource.java

File renamed without changes.

java-bigquerystorage/google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/util/Helper.java renamed to java-bigquerystorage/google-cloud-bigquerystorage-it/src/test/java/com/google/cloud/bigquery/storage/v1/it/util/Helper.java

File renamed without changes.

0 commit comments

Comments
 (0)