Remove JUnit4 as Infinitest has caught up

jeffgbutler · jeffgbutler · commit 50e4b2def628 · 2018-06-03T16:24:22.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -35,9 +35,9 @@
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.compiler.testTarget>${java.version}</maven.compiler.testTarget>
     <maven.compiler.testSource>${java.version}</maven.compiler.testSource>
-    <junit.jupiter.version>5.1.1</junit.jupiter.version>
-    <junit.platform.version>1.1.1</junit.platform.version>
-    <clirr.comparisonVersion>1.0.0</clirr.comparisonVersion>
+    <junit.jupiter.version>5.2.0</junit.jupiter.version>
+    <junit.platform.version>1.2.0</junit.platform.version>
+    <clirr.comparisonVersion>1.1.0</clirr.comparisonVersion>
   </properties>
   
   <reporting>
@@ -88,6 +88,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-surefire-provider</artifactId>
+            <version>${junit.platform.version}</version>            
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
   
@@ -106,20 +117,10 @@
     </dependency>
     <dependency>
       <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-runner</artifactId>
+      <artifactId>junit-platform-launcher</artifactId>
       <version>${junit.platform.version}</version>
       <scope>test</scope>
     </dependency>
-    <!-- added to support running JUnit5 tests with JUnit4.  Remove when Infinitest catches up. -->
-    <!-- Note: DO NOT make this the org.junit.vintage support.  All the tests are written with JUnit5.
-         Once Infinitest is ready we can remove this dependency and the corresponding @RunWith annotations
-     -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
     
     <dependency>
       <groupId>org.assertj</groupId>
diff --git a/src/test/java/examples/animal/data/AnimalDataTest.java b/src/test/java/examples/animal/data/AnimalDataTest.java
@@ -40,8 +40,6 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
@@ -54,7 +52,6 @@
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
 
-@RunWith(JUnitPlatform.class)
 public class AnimalDataTest {
     
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/animal/data/BindingTest.java b/src/test/java/examples/animal/data/BindingTest.java
@@ -36,10 +36,7 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 /**
  * Tests for understanding where bind parameters are allowed
  *
diff --git a/src/test/java/examples/animal/data/OptionalConditionsAnimalDataTest.java b/src/test/java/examples/animal/data/OptionalConditionsAnimalDataTest.java
@@ -36,12 +36,9 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class OptionalConditionsAnimalDataTest {
     
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/column/comparison/ColumnComparisonTest.java b/src/test/java/examples/column/comparison/ColumnComparisonTest.java
@@ -36,12 +36,9 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class ColumnComparisonTest {
     
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapperTest.java b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysAnnotatedMapperTest.java
@@ -38,16 +38,13 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 
 import examples.generated.always.GeneratedAlwaysRecord;
 
-@RunWith(JUnitPlatform.class)
 public class GeneratedAlwaysAnnotatedMapperTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/generated/always/spring/SpringTest.java b/src/test/java/examples/generated/always/spring/SpringTest.java
@@ -27,8 +27,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.BatchInsert;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
@@ -49,7 +47,6 @@
 
 import examples.generated.always.GeneratedAlwaysRecord;
 
-@RunWith(JUnitPlatform.class)
 public class SpringTest {
     private EmbeddedDatabase db;
     private NamedParameterJdbcTemplate template;
diff --git a/src/test/java/examples/groupby/GroupByTest.java b/src/test/java/examples/groupby/GroupByTest.java
@@ -36,12 +36,9 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class GroupByTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/joins/JoinMapperTest.java b/src/test/java/examples/joins/JoinMapperTest.java
@@ -40,12 +40,9 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class JoinMapperTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/paging/LimitAndOffsetTest.java b/src/test/java/examples/paging/LimitAndOffsetTest.java
@@ -15,8 +15,8 @@
  */
 package examples.paging;
 
-import static examples.animal.data.AnimalDataDynamicSqlSupport.*;
-import static org.assertj.core.api.Assertions.*;
+import static examples.animal.data.AnimalDataDynamicSqlSupport.id;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -34,12 +34,9 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
 import examples.animal.data.AnimalData;
 
-@RunWith(JUnitPlatform.class)
 public class LimitAndOffsetTest {
     
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/examples/simple/SampleWhereClausesTest.java b/src/test/java/examples/simple/SampleWhereClausesTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,16 +16,13 @@
 package examples.simple;
 
 import static examples.simple.SimpleTableDynamicSqlSupport.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class SampleWhereClausesTest {
 
     @Test
diff --git a/src/test/java/examples/simple/SimpleTableAnnotatedMapperTest.java b/src/test/java/examples/simple/SimpleTableAnnotatedMapperTest.java
@@ -38,12 +38,9 @@
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class SimpleTableAnnotatedMapperTest {
 
     private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
diff --git a/src/test/java/org/mybatis/dynamic/sql/SqlTableTest.java b/src/test/java/org/mybatis/dynamic/sql/SqlTableTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,13 +15,10 @@
  */
 package org.mybatis.dynamic.sql;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 
-@RunWith(JUnitPlatform.class)
 public class SqlTableTest {
 
     @Test
diff --git a/src/test/java/org/mybatis/dynamic/sql/delete/DeleteStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/delete/DeleteStatementTest.java
@@ -22,14 +22,11 @@
 import java.sql.JDBCType;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 
-@RunWith(JUnitPlatform.class)
 public class DeleteStatementTest {
     private static final SqlTable foo = SqlTable.of("foo");
     private static final SqlColumn<Integer> id = foo.column("id", JDBCType.INTEGER);
diff --git a/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/insert/InsertStatementTest.java
@@ -25,16 +25,13 @@
 import java.util.stream.Collector;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.insert.render.FieldAndValue;
 import org.mybatis.dynamic.sql.insert.render.FieldAndValueCollector;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 
-@RunWith(JUnitPlatform.class)
 public class InsertStatementTest {
 
     private static final SqlTable foo = SqlTable.of("foo");
diff --git a/src/test/java/org/mybatis/dynamic/sql/mybatis3/CriterionRendererTest.java b/src/test/java/org/mybatis/dynamic/sql/mybatis3/CriterionRendererTest.java
@@ -25,8 +25,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlCriterion;
 import org.mybatis.dynamic.sql.SqlTable;
@@ -36,7 +34,6 @@
 import org.mybatis.dynamic.sql.where.condition.IsEqualTo;
 import org.mybatis.dynamic.sql.where.render.CriterionRenderer;
 
-@RunWith(JUnitPlatform.class)
 public class CriterionRendererTest {
     @Test
     public void testAliasWithIgnore() {
diff --git a/src/test/java/org/mybatis/dynamic/sql/mybatis3/InsertStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/mybatis3/InsertStatementTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,14 +21,11 @@
 import java.sql.JDBCType;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 
-@RunWith(JUnitPlatform.class)
 public class InsertStatementTest {
     private static final SqlTable foo = SqlTable.of("foo");
     private static final SqlColumn<Integer> id = foo.column("id", JDBCType.INTEGER);
diff --git a/src/test/java/org/mybatis/dynamic/sql/mybatis3/SelectStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/mybatis3/SelectStatementTest.java
@@ -24,14 +24,11 @@
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class SelectStatementTest {
     public static final SqlTable table = SqlTable.of("foo");
     public static final SqlColumn<Date> column1 = table.column("column1", JDBCType.DATE);
diff --git a/src/test/java/org/mybatis/dynamic/sql/mybatis3/UpdateStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/mybatis3/UpdateStatementTest.java
@@ -16,19 +16,17 @@
 package org.mybatis.dynamic.sql.mybatis3;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mybatis.dynamic.sql.SqlBuilder.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
+import static org.mybatis.dynamic.sql.SqlBuilder.update;
 
 import java.sql.JDBCType;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class UpdateStatementTest {
     private static final SqlTable foo = SqlTable.of("foo");
     private static final SqlColumn<Integer> id = foo.column("id", JDBCType.INTEGER);
diff --git a/src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java
@@ -24,14 +24,11 @@
 import java.util.Map;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 
-@RunWith(JUnitPlatform.class)
 public class SelectStatementTest {
     
     public static final SqlTable table = SqlTable.of("foo");
diff --git a/src/test/java/org/mybatis/dynamic/sql/select/render/QueryExpressionCollectorTest.java b/src/test/java/org/mybatis/dynamic/sql/select/render/QueryExpressionCollectorTest.java
@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -24,11 +24,8 @@
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
-import org.junit.platform.runner.JUnitPlatform;
-import org.junit.runner.RunWith;
 import org.mybatis.dynamic.sql.where.render.WhereClauseProvider;
 
-@RunWith(JUnitPlatform.class)
 public class QueryExpressionCollectorTest {
 
     @Test
diff --git a/src/test/java/org/mybatis/dynamic/sql/subselect/SubSelectTest.java b/src/test/java/org/mybatis/dynamic/sql/subselect/SubSelectTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/update/UpdateStatementTest.java b/src/test/java/org/mybatis/dynamic/sql/update/UpdateStatementTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/util/FragmentCollectorTest.java b/src/test/java/org/mybatis/dynamic/sql/util/FragmentCollectorTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/WhereModelTest.java b/src/test/java/org/mybatis/dynamic/sql/where/WhereModelTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/render/CriterionRendererTest.java b/src/test/java/org/mybatis/dynamic/sql/where/render/CriterionRendererTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/render/OptionalCriterionRenderTest.java b/src/test/java/org/mybatis/dynamic/sql/where/render/OptionalCriterionRenderTest.java
diff --git a/src/test/java/org/mybatis/dynamic/sql/where/render/RenderedCriterionTest.java b/src/test/java/org/mybatis/dynamic/sql/where/render/RenderedCriterionTest.java
