Skip to content

Commit 7eaba17

Browse files
authored
build: include junit-vintage-engine in test dependencies (#2455)
Include junit-vintage-engine in test dependencies for google-cloud-storage to ensure junit4 and junit5 tests are both run during `mvn test`. test: remove all EasyMock tests and the dependency
1 parent 3ff5f0a commit 7eaba17

15 files changed

Lines changed: 11 additions & 5281 deletions

‎java-storage/google-cloud-storage/pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,6 @@
210210
</exclusion>
211211
</exclusions>
212212
</dependency>
213-
<dependency>
214-
<groupId>org.easymock</groupId>
215-
<artifactId>easymock</artifactId>
216-
<scope>test</scope>
217-
</dependency>
218213
<dependency>
219214
<groupId>org.mockito</groupId>
220215
<artifactId>mockito-core</artifactId>
@@ -251,6 +246,12 @@
251246
<version>1.8.4</version>
252247
<scope>test</scope>
253248
</dependency>
249+
<dependency>
250+
<groupId>org.junit.vintage</groupId>
251+
<artifactId>junit-vintage-engine</artifactId>
252+
<version>${junit-platform.version}</version>
253+
<scope>test</scope>
254+
</dependency>
254255

255256
</dependencies>
256257

@@ -293,6 +294,11 @@
293294
google-api-client to be able to bootstrap.
294295
-->
295296
<dependency>com.google.http-client:google-http-client-gson</dependency>
297+
<!--
298+
Our test suite is primarily JUnit4, but also includes JQwik tests which require JUnit 5,
299+
Add in vintage engine so that both JUnit4 and JUnit5 tests are run by the JUnit5 runner.
300+
-->
301+
<dependency>org.junit.vintage:junit-vintage-engine</dependency>
296302
</ignoredDependencies>
297303
</configuration>
298304
</plugin>
@@ -316,7 +322,6 @@
316322
<reportNameSuffix>sponge_log</reportNameSuffix>
317323
</configuration>
318324
<dependencies>
319-
<!-- org.apache.maven.surefire:surefire-junit47 is also included from parent config -->
320325
<!-- add junit-platform to support jqwik tests for mvn test -->
321326
<dependency>
322327
<groupId>org.apache.maven.surefire</groupId>

0 commit comments

Comments
 (0)