Skip to content

Commit

Permalink
Migrate storage IT to JUnit5 (#2705)
Browse files Browse the repository at this point in the history
  • Loading branch information
anuraaga authored and adriancole committed Jul 24, 2019
1 parent 65f8cfb commit b2b8626
Show file tree
Hide file tree
Showing 29 changed files with 887 additions and 1,229 deletions.
30 changes: 30 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<log4j.version>2.12.0</log4j.version>

<junit.version>4.12</junit.version>
<junit.jupiter.version>5.5.1</junit.jupiter.version>
<powermock.version>2.0.2</powermock.version>
<!-- Up to v2.27.0 of mockito has a conflict https://github.com/mockito/mockito/issues/1606
java.lang.NoSuchMethodError: net.bytebuddy.dynamic.loading.MultipleParentClassLoader$Builder.appendMostSpecific(Ljava/util/Collection;)Lnet/bytebuddy/dynamic/loading/MultipleParentClassLoader$Builder
Expand Down Expand Up @@ -307,6 +308,29 @@
<version>${junit.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>

<!--
Current versions of JUnit5 provide the above junit-jupiter artifact for convenience but we may
still have transitive dependencies on these older artifacts and have to make sure they're all
using the same version.
-->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down Expand Up @@ -382,6 +406,12 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
Loading

0 comments on commit b2b8626

Please sign in to comment.