Skip to content

Commit a900f31

Browse files
jeffgbutlerjeffgbutler
authored
Merge pull request #44 from jeffgbutler/master
Switch Completely to JUnit5
2 parents 10d3358 + 9ef1277 commit a900f31

28 files changed

+29
-108
lines changed

‎pom.xml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<maven.compiler.target>${java.version}</maven.compiler.target>
3636
<maven.compiler.testTarget>${java.version}</maven.compiler.testTarget>
3737
<maven.compiler.testSource>${java.version}</maven.compiler.testSource>
38-
<junit.jupiter.version>5.1.1</junit.jupiter.version>
39-
<junit.platform.version>1.1.1</junit.platform.version>
40-
<clirr.comparisonVersion>1.0.0</clirr.comparisonVersion>
38+
<junit.jupiter.version>5.2.0</junit.jupiter.version>
39+
<junit.platform.version>1.2.0</junit.platform.version>
40+
<clirr.comparisonVersion>1.1.0</clirr.comparisonVersion>
4141
</properties>
4242

4343
<reporting>
@@ -88,6 +88,17 @@
8888
</execution>
8989
</executions>
9090
</plugin>
91+
<plugin>
92+
<groupId>org.apache.maven.plugins</groupId>
93+
<artifactId>maven-surefire-plugin</artifactId>
94+
<dependencies>
95+
<dependency>
96+
<groupId>org.junit.platform</groupId>
97+
<artifactId>junit-platform-surefire-provider</artifactId>
98+
<version>${junit.platform.version}</version>
99+
</dependency>
100+
</dependencies>
101+
</plugin>
91102
</plugins>
92103
</build>
93104

@@ -106,25 +117,15 @@
106117
</dependency>
107118
<dependency>
108119
<groupId>org.junit.platform</groupId>
109-
<artifactId>junit-platform-runner</artifactId>
120+
<artifactId>junit-platform-launcher</artifactId>
110121
<version>${junit.platform.version}</version>
111122
<scope>test</scope>
112123
</dependency>
113-
<!-- added to support running JUnit5 tests with JUnit4. Remove when Infinitest catches up. -->
114-
<!-- Note: DO NOT make this the org.junit.vintage support. All the tests are written with JUnit5.
115-
Once Infinitest is ready we can remove this dependency and the corresponding @RunWith annotations
116-
-->
117-
<dependency>
118-
<groupId>junit</groupId>
119-
<artifactId>junit</artifactId>
120-
<version>4.12</version>
121-
<scope>test</scope>
122-
</dependency>
123124

124125
<dependency>
125126
<groupId>org.assertj</groupId>
126127
<artifactId>assertj-core</artifactId>
127-
<version>3.9.1</version>
128+
<version>3.10.0</version>
128129
<scope>test</scope>
129130
</dependency>
130131
<dependency>
@@ -136,13 +137,13 @@
136137
<dependency>
137138
<groupId>org.hsqldb</groupId>
138139
<artifactId>hsqldb</artifactId>
139-
<version>2.4.0</version>
140+
<version>2.4.1</version>
140141
<scope>test</scope>
141142
</dependency>
142143
<dependency>
143144
<groupId>org.springframework</groupId>
144145
<artifactId>spring-jdbc</artifactId>
145-
<version>5.0.5.RELEASE</version>
146+
<version>5.0.6.RELEASE</version>
146147
<scope>test</scope>
147148
</dependency>
148149
<dependency>

‎src/test/java/examples/animal/data/AnimalDataTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
4141
import org.junit.jupiter.api.BeforeEach;
4242
import org.junit.jupiter.api.Test;
43-
import org.junit.platform.runner.JUnitPlatform;
44-
import org.junit.runner.RunWith;
4543
import org.mybatis.dynamic.sql.SqlTable;
4644
import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
4745
import org.mybatis.dynamic.sql.insert.render.BatchInsert;
@@ -54,7 +52,6 @@
5452
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
5553
import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
5654

57-
@RunWith(JUnitPlatform.class)
5855
public class AnimalDataTest {
5956

6057
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

‎src/test/java/examples/animal/data/BindingTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Test;
39-
import org.junit.platform.runner.JUnitPlatform;
40-
import org.junit.runner.RunWith;
4139

42-
@RunWith(JUnitPlatform.class)
4340
/**
4441
* Tests for understanding where bind parameters are allowed
4542
*

‎src/test/java/examples/animal/data/OptionalConditionsAnimalDataTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@
3636
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Test;
39-
import org.junit.platform.runner.JUnitPlatform;
40-
import org.junit.runner.RunWith;
4139
import org.mybatis.dynamic.sql.render.RenderingStrategy;
4240
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4341

44-
@RunWith(JUnitPlatform.class)
4542
public class OptionalConditionsAnimalDataTest {
4643

4744
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

‎src/test/java/examples/column/comparison/ColumnComparisonTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@
3636
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Test;
39-
import org.junit.platform.runner.JUnitPlatform;
40-
import org.junit.runner.RunWith;
4139
import org.mybatis.dynamic.sql.render.RenderingStrategy;
4240
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4341

44-
@RunWith(JUnitPlatform.class)
4542
public class ColumnComparisonTest {
4643

4744
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

‎src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapperTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,13 @@
3838
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3939
import org.junit.jupiter.api.BeforeEach;
4040
import org.junit.jupiter.api.Test;
41-
import org.junit.platform.runner.JUnitPlatform;
42-
import org.junit.runner.RunWith;
4341
import org.mybatis.dynamic.sql.insert.render.BatchInsert;
4442
import org.mybatis.dynamic.sql.render.RenderingStrategy;
4543
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4644
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
4745

4846
import examples.generated.always.GeneratedAlwaysRecord;
4947

50-
@RunWith(JUnitPlatform.class)
5148
public class GeneratedAlwaysAnnotatedMapperTest {
5249

5350
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

‎src/test/java/examples/generated/always/spring/SpringTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import org.junit.jupiter.api.AfterEach;
2828
import org.junit.jupiter.api.BeforeEach;
2929
import org.junit.jupiter.api.Test;
30-
import org.junit.platform.runner.JUnitPlatform;
31-
import org.junit.runner.RunWith;
3230
import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
3331
import org.mybatis.dynamic.sql.insert.render.BatchInsert;
3432
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
@@ -49,7 +47,6 @@
4947

5048
import examples.generated.always.GeneratedAlwaysRecord;
5149

52-
@RunWith(JUnitPlatform.class)
5350
public class SpringTest {
5451
private EmbeddedDatabase db;
5552
private NamedParameterJdbcTemplate template;

‎src/test/java/examples/groupby/GroupByTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@
3636
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3737
import org.junit.jupiter.api.BeforeEach;
3838
import org.junit.jupiter.api.Test;
39-
import org.junit.platform.runner.JUnitPlatform;
40-
import org.junit.runner.RunWith;
4139
import org.mybatis.dynamic.sql.render.RenderingStrategy;
4240
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4341

44-
@RunWith(JUnitPlatform.class)
4542
public class GroupByTest {
4643

4744
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

‎src/test/java/examples/joins/JoinMapperTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,9 @@
4040
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
4141
import org.junit.jupiter.api.BeforeEach;
4242
import org.junit.jupiter.api.Test;
43-
import org.junit.platform.runner.JUnitPlatform;
44-
import org.junit.runner.RunWith;
4543
import org.mybatis.dynamic.sql.render.RenderingStrategy;
4644
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
4745

48-
@RunWith(JUnitPlatform.class)
4946
public class JoinMapperTest {
5047

5148
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

‎src/test/java/examples/paging/LimitAndOffsetTest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package examples.paging;
1717

18-
import static examples.animal.data.AnimalDataDynamicSqlSupport.*;
19-
import static org.assertj.core.api.Assertions.*;
18+
import static examples.animal.data.AnimalDataDynamicSqlSupport.id;
19+
import static org.assertj.core.api.Assertions.assertThat;
2020

2121
import java.io.InputStream;
2222
import java.io.InputStreamReader;
@@ -34,12 +34,9 @@
3434
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
3535
import org.junit.jupiter.api.BeforeEach;
3636
import org.junit.jupiter.api.Test;
37-
import org.junit.platform.runner.JUnitPlatform;
38-
import org.junit.runner.RunWith;
3937

4038
import examples.animal.data.AnimalData;
4139

42-
@RunWith(JUnitPlatform.class)
4340
public class LimitAndOffsetTest {
4441

4542
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";

0 commit comments

Comments
 (0)