:hankey: 半成品升级 JUnit5

build.gradle

@@ -19,6 +19,7 @@ ext {
         mybatisVersion = '3.5.0',
         springVersion = '5.1.4.RELEASE',
         jsqlparserVersion = '1.3',
+        junitVersion = '5.3.2',
     ]
 
     lib = [
@@ -43,7 +44,8 @@ ext {
         "logback-classic"       : "ch.qos.logback:logback-classic:1.2.3",
         //test
         "spring-test"           : "org.springframework:spring-test:${springVersion}",
-        "junit"                 : "junit:junit:4.12",
+        "junit-jupiter-api"     : "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
+        "junit-jupiter-engine"  : "org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
         "mockito-all"           : "org.mockito:mockito-all:1.10.19",
         "fastjson"              : "com.alibaba:fastjson:1.2.49",
         "jackson"               : "com.fasterxml.jackson.core:jackson-databind:2.9.6",
@@ -107,7 +109,8 @@ subprojects {
         implementation "${lib.lombok}"
         testAnnotationProcessor "${lib.lombok}"
         testCompileOnly "${lib.'mockito-all'}"
-        testCompile "${lib.junit}"
+        testCompile "${lib.'junit-jupiter-api'}"
+        testRuntime "${lib.'junit-jupiter-engine'}"
     }
 
     task sourcesJar(type: Jar) {

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/EncryptTest.java

@@ -8,29 +8,29 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.EncryptUtils;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * 加密测试
  */
-public class EncryptTest {
+class EncryptTest {
 
     @Test
-    public void md5Base64() {
-        Assert.assertEquals("Jgmg8jeuq9EyB1ybYtj1fg==",
+    void md5Base64() {
+        Assertions.assertEquals("Jgmg8jeuq9EyB1ybYtj1fg==",
             EncryptUtils.md5Base64("犯我中华者虽远必诛"));
     }
 
     @Test
-    public void other() {
+    void other() {
         System.out.println(TableInfoHelper.checkRelated(true, "order", "'order'"));
         System.out.println(TableInfoHelper.checkRelated(true, "order", "order"));
         System.out.println(TableInfoHelper.checkRelated(true, "orderFile", "'ORDER_FILE'"));
     }
 
     @Test
-    public void testTableInfoHelper() {
+    void testTableInfoHelper() {
         TableInfo info = TableInfoHelper.initTableInfo(null, Xx.class);
         System.out.println("----------- AllInsertSqlColumn -----------");
         System.out.println(info.getAllInsertSqlColumnMaybeIf());

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/JSqlParserTest.java

@@ -1,23 +1,22 @@
 package com.baomidou.mybatisplus.core.test;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.update.Update;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * SQL 解析测试
  */
-public class JSqlParserTest {
+class JSqlParserTest {
 
 
     @Test
-    public void parser() throws Exception {
+    void parser() throws Exception {
         Select select = (Select) CCJSqlParserUtil.parse("SELECT a,b,c FROM tableName t WHERE t.col = 9 and b=c LIMIT 3, ?");
 
         PlainSelect ps = (PlainSelect) select.getSelectBody();
@@ -31,15 +30,15 @@ public class JSqlParserTest {
 
 
     @Test
-    public void updateWhereParser() throws Exception {
+    void updateWhereParser() throws Exception {
         Update update = (Update) CCJSqlParserUtil.parse("Update tableName t SET t.a=(select c from tn where tn.id=t.id),b=2,c=3 ");
-        Assert.assertNull(update.getWhere());
+        Assertions.assertNull(update.getWhere());
     }
 
 
     @Test
-    public void deleteWhereParser() throws Exception {
+    void deleteWhereParser() throws Exception {
         Delete delete = (Delete) CCJSqlParserUtil.parse("delete from tableName t");
-        Assert.assertNull(delete.getWhere());
+        Assertions.assertNull(delete.getWhere());
     }
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/WrapperTest.java

@@ -21,16 +21,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
-
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
+import org.junit.jupiter.api.Test;
 
-public class WrapperTest {
+class WrapperTest {
 
     private void log(String message) {
         System.out.println(message);
@@ -47,7 +46,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void test() {
+    void test() {
         try {
             Wrapper<User> wrapper = new QueryWrapper<User>().lambda().eq(User::getName, 123)
                 .or(c -> c.eq(User::getRoleId, 1).eq(User::getId, 2))
@@ -60,7 +59,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void test1() {
+    void test1() {
         QueryWrapper<User> ew = new QueryWrapper<User>()
             .eq("xxx", 123)
             .and(i -> i.eq("andx", 65444).le("ande", 66666))
@@ -70,7 +69,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void test2() {
+    void test2() {
         UpdateWrapper<User> ew = new UpdateWrapper<User>()
             .set("name", "三毛").set("id", 1)
             .eq("xxx", 123)
@@ -81,7 +80,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void test3() {
+    void test3() {
         UpdateWrapper<User> ew = new UpdateWrapper<User>()
             .setSql("abc=1,def=2").eq("id", 1).ge("age", 3);
         log(ew.getSqlSet());
@@ -89,7 +88,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void testQueryWrapper() {
+    void testQueryWrapper() {
         logSqlSegment("去除第一个 or,以及自动拼接 and,以及手动拼接 or,以及去除最后的多个or", new QueryWrapper<User>().or()
             .ge("age", 3).or().ge("age", 3).ge("age", 3).or().or().or().or());
 
@@ -128,7 +127,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void testCompare() {
+    void testCompare() {
         QueryWrapper<User> queryWrapper = new QueryWrapper<User>()
             .allEq(getMap()).allEq((k, v) -> true, getMap())
             .eq("id", 1).ne("id", 1)
@@ -142,7 +141,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void testFunc() {
+    void testFunc() {
         QueryWrapper<User> queryWrapper = new QueryWrapper<User>()
             .isNull("nullColumn").or().isNotNull("notNullColumn")
             .orderByAsc("id").orderByDesc("name")
@@ -156,7 +155,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void testJoin() {
+    void testJoin() {
         QueryWrapper<User> queryWrapper = new QueryWrapper<User>()
             .last("limit 1").or()
             .apply("date_format(column,'%Y-%m-%d') = '2008-08-08'")
@@ -168,7 +167,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void testNested() {
+    void testNested() {
         QueryWrapper<User> queryWrapper = new QueryWrapper<User>()
             .and(i -> i.eq("id", 1).nested(j -> j.ne("id", 2)))
             .or(i -> i.eq("id", 1).and(j -> j.ne("id", 2)))
@@ -178,7 +177,7 @@ public class WrapperTest {
     }
 
     @Test
-    public void testPluralLambda() {
+    void testPluralLambda() {
         TableInfoHelper.initTableInfo(null, User.class);
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(User::getName, "sss");

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/BeanUtilsTest.java

@@ -1,13 +1,11 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Map;
 
-import org.junit.Test;
-
 import lombok.Getter;
 import lombok.Setter;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * 测试 bean utils
@@ -15,24 +13,24 @@ import lombok.Setter;
  * @author HCL
  * 2018/7/24 17:44
  */
-public class BeanUtilsTest {
+class BeanUtilsTest {
 
     /**
      * 测试 beanToMap
      */
     @Test
-    public void beanMapConvertTest() {
+    void beanMapConvertTest() {
         Map<String, Object> map = BeanUtils.beanToMap(new User() {{
             setId(123);
             setName("baomidou");
         }});
-        assertEquals(2, map.keySet().size());
-        assertEquals(123, map.get("id"));
-        assertEquals("baomidou", map.get("name"));
+        Assertions.assertEquals(2, map.keySet().size());
+        Assertions.assertEquals(123, map.get("id"));
+        Assertions.assertEquals("baomidou", map.get("name"));
         // 测试反向转换过程
         User user = BeanUtils.mapToBean(map, User.class);
-        assertEquals(123, user.getId());
-        assertEquals("baomidou", user.getName());
+        Assertions.assertEquals(123, user.getId());
+        Assertions.assertEquals("baomidou", user.getName());
 
     }
 
@@ -42,7 +40,6 @@ public class BeanUtilsTest {
     @Getter
     @Setter
     public static class User {
-
         private String name;
         private int id;
     }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/ClassUtilsTest.java

@@ -1,36 +1,34 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 /**
  * 测试
  *
  * @author HCL
  * 2018/7/26 9:53
  */
-public class ClassUtilsTest {
+class ClassUtilsTest {
 
     /**
      * 测试实例化方法
      */
     @Test
-    public void newInstanceTest() {
+    void newInstanceTest() {
         // 根据设计，只要能实例化，并且 对象不为 null ， 即认为执行成功
         Demo demo = ClassUtils.newInstance(Demo.class);
-        Assert.assertNotNull(demo);
+        Assertions.assertNotNull(demo);
 
         Map map = ClassUtils.newInstance(HashMap.class);
-        Assert.assertNotNull(map);
+        Assertions.assertNotNull(map);
     }
 
     /**
      * 实例化的 demo class
      */
-    private static class Demo {
-
-    }
+    private static class Demo {}
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/LambdaUtilsTest.java

@@ -3,17 +3,17 @@ package com.baomidou.mybatisplus.core.toolkit;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
 import lombok.Getter;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-public class LambdaUtilsTest {
+class LambdaUtilsTest {
 
     @Test
-    public void testResolve() {
+    void testResolve() {
         SerializedLambda lambda = LambdaUtils.resolve(TestPojo::getId);
-        Assert.assertEquals(TestPojo.class.getName(), lambda.getImplClassName());
-        Assert.assertEquals("getId", lambda.getImplMethodName());
-        Assert.assertEquals("id", StringUtils.resolveFieldName(lambda.getImplMethodName()));
+        Assertions.assertEquals(TestPojo.class.getName(), lambda.getImplClassName());
+        Assertions.assertEquals("getId", lambda.getImplMethodName());
+        Assertions.assertEquals("id", StringUtils.resolveFieldName(lambda.getImplMethodName()));
 
         Cond<TestPojo> cond = new Cond<>();
         System.out.println(cond.eq(TestPojo::getId, 123).toString());

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/ReflectionKitTest.java

@@ -1,8 +1,8 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -13,72 +13,72 @@ import java.util.Map;
  *
  * @author nieqiuqiu 2019/1/16.
  */
-public class ReflectionKitTest {
-    
+class ReflectionKitTest {
+
     @Data
     private static class A {
-        
+
         private transient String test;
-        
+
         private static String testStatic;
-        
+
         private String name;
-        
+
         private Boolean testWrap;
-        
+
         private boolean testSimple;
-        
+
     }
-    
+
     @Data
     private static class B extends A {
-        
+
         private Integer age;
-        
+
     }
-    
+
     @Data
     private static class C extends B {
-        
+
         private String sex;
-        
+
     }
-    
+
     @Test
-    public void testGetFieldList() {
+    void testGetFieldList() {
         List<Field> fieldList = ReflectionKit.getFieldList(C.class);
-        Assert.assertEquals(5, fieldList.size());
+        Assertions.assertEquals(5, fieldList.size());
     }
-    
+
     @Test
-    public void testGetFieldMap() throws NoSuchFieldException {
+    void testGetFieldMap() throws NoSuchFieldException {
         Map<String, Field> fieldMap = ReflectionKit.getFieldMap(C.class);
-        Assert.assertEquals(5, fieldMap.size());
-        Assert.assertEquals(fieldMap.get("sex"), C.class.getDeclaredField("sex"));
-        Assert.assertEquals(fieldMap.get("age"), B.class.getDeclaredField("age"));
-        Assert.assertEquals(fieldMap.get("name"), A.class.getDeclaredField("name"));
+        Assertions.assertEquals(5, fieldMap.size());
+        Assertions.assertEquals(fieldMap.get("sex"), C.class.getDeclaredField("sex"));
+        Assertions.assertEquals(fieldMap.get("age"), B.class.getDeclaredField("age"));
+        Assertions.assertEquals(fieldMap.get("name"), A.class.getDeclaredField("name"));
     }
-    
+
     @Test
-    public void testGetMethodCapitalize() throws NoSuchFieldException {
+    void testGetMethodCapitalize() throws NoSuchFieldException {
         Field field = C.class.getDeclaredField("sex");
         String getMethod = ReflectionKit.getMethodCapitalize(field, "sex");
-        Assert.assertEquals("getSex", getMethod);
+        Assertions.assertEquals("getSex", getMethod);
         field = A.class.getDeclaredField("testWrap");
         getMethod = ReflectionKit.getMethodCapitalize(field, "testWrap");
-        Assert.assertEquals("getTestWrap", getMethod);
+        Assertions.assertEquals("getTestWrap", getMethod);
         field = A.class.getDeclaredField("testSimple");
         getMethod = ReflectionKit.getMethodCapitalize(field, "testSimple");
-        Assert.assertEquals("isTestSimple", getMethod);
+        Assertions.assertEquals("isTestSimple", getMethod);
     }
-    
+
     @Test
-    public void testGetMethodValue() {
+    void testGetMethodValue() {
         C c = new C();
         c.setSex("女");
         c.setName("妹纸");
         c.setAge(18);
-        Assert.assertEquals(c.getSex(), ReflectionKit.getMethodValue(c.getClass(), c, "sex"));
-        Assert.assertEquals(c.getAge(), ReflectionKit.getMethodValue(c, "age"));
+        Assertions.assertEquals(c.getSex(), ReflectionKit.getMethodValue(c.getClass(), c, "sex"));
+        Assertions.assertEquals(c.getAge(), ReflectionKit.getMethodValue(c, "age"));
     }
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/StringUtilsTest.java

@@ -1,19 +1,18 @@
 package com.baomidou.mybatisplus.core.toolkit;
 
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author HCL
  * Create at 2018/9/17
  */
 
-public class StringUtilsTest {
+class StringUtilsTest {
 
     @Test
-    public void camelToUnderlineTest() {
+    void camelToUnderlineTest() {
         String s = "userId";
-        Assert.assertEquals("user_id", StringUtils.camelToUnderline(s));
+        Assertions.assertEquals("user_id", StringUtils.camelToUnderline(s));
     }
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/condition/IStrCondition.java

@@ -3,6 +3,4 @@ package com.baomidou.mybatisplus.core.toolkit.condition;
 /**
  * Create by HCL at 2018/05/29
  */
-public interface IStrCondition<T, SC> extends ICondition<SC, T, String> {
-
-}
+public interface IStrCondition<T, SC> extends ICondition<SC, T, String> {}

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/condition/WrapperImpl.java

@@ -10,6 +10,4 @@ public class WrapperImpl<T> extends IStrConditionImpl<T, Wrapper<T>> implements
         return super.toString();
     }
 
-
-
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/condition/WrapperTest.java

@@ -1,13 +1,12 @@
 package com.baomidou.mybatisplus.core.toolkit.condition;
 
-import org.junit.Test;
-
 import lombok.Getter;
+import org.junit.jupiter.api.Test;
 
-public class WrapperTest {
+class WrapperTest {
 
     @Test
-    public void name() {
+    void name() {
         Wrapper<User> wrapper = new WrapperImpl<>();
         wrapper.eq("id", 123);
         System.out.println(wrapper.getSqlSeq());

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlFormatterTest.java

@@ -1,15 +1,15 @@
 package com.baomidou.mybatisplus.core.toolkit.sql;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author miemie
  * @since 2019-01-09
  */
-public class SqlFormatterTest {
+class SqlFormatterTest {
 
     @Test
-    public void format() {
+    void format() {
         String format = new SqlFormatter().format(" INSERT INTO bianla_easemob_chat_record \n" +
             " ( msg_id,\n" +
             "\tmsg_send_time,\n" +

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -21,18 +21,13 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.MybatisXMLConfigBuilder;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.enums.IEnum;
-import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.extension.handlers.EnumAnnotationTypeHandler;
 import com.baomidou.mybatisplus.extension.handlers.EnumTypeHandler;
 import com.baomidou.mybatisplus.extension.toolkit.AopUtils;
 import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
 import com.baomidou.mybatisplus.extension.toolkit.PackageHelper;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
-
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.cache.Cache;
 import org.apache.ibatis.executor.ErrorContext;
@@ -46,7 +41,6 @@ import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
 import org.apache.ibatis.transaction.TransactionFactory;
-import org.apache.ibatis.type.EnumOrdinalTypeHandler;
 import org.apache.ibatis.type.TypeHandler;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 import org.mybatis.logging.Logger;
@@ -63,21 +57,14 @@ import org.springframework.core.NestedIOException;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
 
+import javax.sql.DataSource;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Stream;
 
-import javax.sql.DataSource;
-
 import static org.springframework.util.Assert.notNull;
 import static org.springframework.util.Assert.state;
 import static org.springframework.util.ObjectUtils.isEmpty;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/kotlin/WrapperTest.kt

@@ -17,7 +17,7 @@ package com.baomidou.mybatisplus.extension.kotlin
 
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 class WrapperTest {
 

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/DB2DialectTest.java

@@ -1,16 +1,16 @@
 package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author miemie
  * @since 2018-11-01
  */
-public class DB2DialectTest {
+class DB2DialectTest {
 
     @Test
-    public void m1() {
+    void m1() {
         String sql = "select * from xxx where id = ? order by id";
         DB2Dialect db2Dialect = new DB2Dialect();
         Page page = new Page(2, 10);

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java

@@ -1,7 +1,5 @@
 package com.baomidou.mybatisplus.test.generator;
 
-import org.junit.Test;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
@@ -10,6 +8,7 @@ import com.baomidou.mybatisplus.generator.config.GlobalConfig;
 import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import org.junit.jupiter.api.Test;
 
 /**
  * 代码生成器 示例
@@ -17,29 +16,29 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
  * @author K神
  * @since 2017/12/29
  */
-public class CodeGeneratorTest {
+class CodeGeneratorTest {
 
     /**
      * 是否强制带上注解
      */
-    boolean enableTableFieldAnnotation = false;
+    private boolean enableTableFieldAnnotation = false;
     /**
      * 生成的注解带上IdType类型
      */
-    IdType tableIdType = null;
+    private IdType tableIdType = null;
     /**
      * 是否去掉生成实体的属性名前缀
      */
-    String[] fieldPrefix = null;
+    private String[] fieldPrefix = null;
     /**
      * 生成的Service 接口类名是否以I开头
      * <p>默认是以I开头</p>
      * <p>user表 -> IUserService, UserServiceImpl</p>
      */
-    boolean serviceClassNameStartWithI = true;
+    private boolean serviceClassNameStartWithI = true;
 
     @Test
-    public void generateCode() {
+    void generateCode() {
         String packageName = "com.baomidou.springboot";
         enableTableFieldAnnotation = false;
         tableIdType = null;

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorWithTemplateTest.java

@@ -3,8 +3,6 @@ package com.baomidou.mybatisplus.test.generator;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Test;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
@@ -15,6 +13,7 @@ import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.TemplateConfig;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import org.junit.jupiter.api.Test;
 
 /**
  * 代码生成器 示例
@@ -22,29 +21,29 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
  * @author K神
  * @since 2017/12/29
  */
-public class CodeGeneratorWithTemplateTest {
+class CodeGeneratorWithTemplateTest {
 
     /**
      * 是否强制带上注解
      */
-    boolean enableTableFieldAnnotation = false;
+    private boolean enableTableFieldAnnotation = false;
     /**
      * 生成的注解带上IdType类型
      */
-    IdType tableIdType = null;
+    private IdType tableIdType = null;
     /**
      * 是否去掉生成实体的属性名前缀
      */
-    String[] fieldPrefix = null;
+    private String[] fieldPrefix = null;
     /**
      * 生成的Service 接口类名是否以I开头
      * <p>默认是以I开头</p>
      * <p>user表 -> IUserService, UserServiceImpl</p>
      */
-    boolean serviceClassNameStartWithI = true;
+    private boolean serviceClassNameStartWithI = true;
 
     @Test
-    public void generateCode() {
+    void generateCode() {
         String packageName = "com.baomidou.springboot";
         enableTableFieldAnnotation = false;
         tableIdType = null;

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -142,7 +142,7 @@ public class MysqlGenerator extends GeneratorTest {
                     map.put("abc", this.getConfig().getGlobalConfig().getAuthor() + "-mp");
                     this.setMap(map);
                 }
-            }.setFileOutConfigList(Collections.<FileOutConfig>singletonList(new FileOutConfig(
+            }.setFileOutConfigList(Collections.singletonList(new FileOutConfig(
                 "/templates/mapper.xml" + ((1 == result) ? ".ftl" : ".vm")) {
                 // 自定义输出文件目录
                 @Override

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/SQLServerGenerator.java

@@ -73,7 +73,7 @@ public class SQLServerGenerator extends GeneratorTest {
         StrategyConfig strategy = new StrategyConfig();
         // strategy.setCapitalMode(true);// 全局大写命名
         // strategy.setDbColumnUnderline(true);//全局下划线命名
-        strategy.setTablePrefix(new String[]{"bmd_", "mp_"});// 此处可以修改为您的表前缀
+        strategy.setTablePrefix("bmd_", "mp_");// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
         // strategy.setInclude(new String[] { "user" }); // 需要生成的表
         // strategy.setExclude(new String[]{"test"}); // 排除生成的表

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/SampleTest.java

@@ -1,21 +1,19 @@
 package com.baomidou.mybatisplus.test;
 
-import org.apache.ibatis.reflection.DefaultReflectorFactory;
-import org.apache.ibatis.reflection.MetaClass;
-import org.junit.Test;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.test.base.entity.CommonData;
 import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.ibatis.reflection.DefaultReflectorFactory;
+import org.apache.ibatis.reflection.MetaClass;
+import org.junit.jupiter.api.Test;
 
-public class SampleTest {
+class SampleTest {
 
     @Test
-    public void testTableInfoHelper2() {
+    void testTableInfoHelper2() {
         TableInfo info = TableInfoHelper.initTableInfo(null, CommonLogicData.class);
 //        System.out.println("----------- AllInsertSqlColumn -----------");
 //        System.out.println(info.getAllInsertSqlColumn());
@@ -28,20 +26,20 @@ public class SampleTest {
     }
 
     @Test
-    public void testTableInfoHelper3() {
+    void testTableInfoHelper3() {
         MetaClass metaClass = MetaClass.forClass(CommonData.class, new DefaultReflectorFactory());
         String property = metaClass.findProperty("TESTINT", true);
         System.out.println(property);
     }
 
     @Test
-    public void testWrapperOrderBy() {
+    void testWrapperOrderBy() {
         System.out.println(Wrappers.query().orderByAsc("1", "2", "3", "4").getSqlSegment());
         System.out.println(Wrappers.query().orderByDesc("1", "2", "3", "4").getSqlSegment());
     }
 
     @Test
-    public void testClone() {
+    void testClone() {
         QueryWrapper<Object> wrapper = Wrappers.query().orderByAsc("1", "2", "3", "4");
         QueryWrapper<Object> clone = wrapper.clone().orderByDesc("5", "6", "7");
         System.out.println(wrapper.getSqlSegment());
@@ -49,7 +47,7 @@ public class SampleTest {
     }
 
     @Test
-    public void testPrefixOrder() {
+    void testPrefixOrder() {
         System.out.println(Wrappers.query().eq("order_id", 1).getSqlSegment());
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/commons/CommonLogicDataMapper.java

@@ -7,5 +7,4 @@ import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
  * @author miemie
  * @since 2018-07-06
  */
-public interface CommonLogicDataMapper extends MyBaseMapper<CommonLogicData> {
-}
+public interface CommonLogicDataMapper extends MyBaseMapper<CommonLogicData> {}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/commons/ResultMapEntityMapper.java

@@ -7,5 +7,4 @@ import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
  * @author miemie
  * @since 2019-01-19
  */
-public interface ResultMapEntityMapper extends MyBaseMapper<ResultMapEntity> {
-}
+public interface ResultMapEntityMapper extends MyBaseMapper<ResultMapEntity> {}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/pg/PgDataMapper.java

@@ -7,6 +7,4 @@ import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
  * @author miemie
  * @since 2018-08-06
  */
-public interface PgDataMapper extends MyBaseMapper<PgData> {
-
-}
+public interface PgDataMapper extends MyBaseMapper<PgData> {}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/ActiveRecordTest.java

@@ -1,20 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.mockito.internal.matchers.GreaterThan;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +7,17 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import com.baomidou.mybatisplus.test.h2.service.IH2StudentService;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 
 /**
@@ -29,8 +25,9 @@ import com.baomidou.mybatisplus.test.h2.service.IH2StudentService;
  *
  * @author nieqiurong 2018/7/27.
  */
-@FixMethodOrder(MethodSorters.JVM)
-@RunWith(SpringJUnit4ClassRunner.class)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.JVM)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 public class ActiveRecordTest {
 
@@ -43,24 +40,24 @@ public class ActiveRecordTest {
     @Transactional
     public void testInsert() {
         H2Student student = new H2Student(null, "测试学生", 2);
-        Assert.assertTrue(student.insert());
-        Assert.assertTrue(student.insert());
+        Assertions.assertTrue(student.insert());
+        Assertions.assertTrue(student.insert());
     }
 
     @Test
     public void testUpdate() {
         H2Student student = new H2Student(1L, "Tom长大了", 2);
-        Assert.assertTrue(student.updateById());
+        Assertions.assertTrue(student.updateById());
         student.setName("不听话的学生");
-        Assert.assertTrue(student.update(new QueryWrapper<H2Student>().gt("id", 10)));
+        Assertions.assertTrue(student.update(new QueryWrapper<H2Student>().gt("id", 10)));
     }
 
     @Test
     public void testSelect() {
         H2Student student = new H2Student();
         student.setId(1L);
-        Assert.assertNotNull(student.selectById());
-        Assert.assertNotNull(student.selectById(1L));
+        Assertions.assertNotNull(student.selectById());
+        Assertions.assertNotNull(student.selectById(1L));
     }
 
     @Test
@@ -68,7 +65,7 @@ public class ActiveRecordTest {
         H2Student student = new H2Student();
         List<H2Student> students = student.selectList(new QueryWrapper<>(student));
         students.forEach($this -> LOGGER.info("用户信息:{}", $this));
-        Assert.assertThat(students.size(), new GreaterThan<>(1));
+        Assertions.assertTrue(students.size() > 1);
     }
 
     @Test
@@ -79,7 +76,7 @@ public class ActiveRecordTest {
         List<H2Student> records = page.getRecords();
         LOGGER.info("总数:{}", page.getTotal());
         records.forEach($this -> LOGGER.info("用户信息:{}", $this));
-        Assert.assertTrue(page.getTotal() > 1);
+        Assertions.assertTrue(page.getTotal() > 1);
     }
 
     @Test
@@ -87,29 +84,29 @@ public class ActiveRecordTest {
         H2Student student = new H2Student();
         int count = new H2Student().selectCount(new QueryWrapper<>(student));
         LOGGER.info("count:{}", count);
-        Assert.assertTrue(count > 1);
+        Assertions.assertTrue(count > 1);
     }
 
     @Test
     public void testInsertOrUpdate() {
         H2Student student = new H2Student(2L, "Jerry也长大了", 2);
-        Assert.assertTrue(student.insertOrUpdate());
+        Assertions.assertTrue(student.insertOrUpdate());
         student.setId(null);
-        Assert.assertTrue(student.insertOrUpdate());
+        Assertions.assertTrue(student.insertOrUpdate());
     }
 
     @Test
     public void testSelectAll() {
         H2Student student = new H2Student();
         List<H2Student> students = student.selectAll();
-        Assert.assertNotNull(students);
+        Assertions.assertNotNull(students);
         students.forEach($this -> LOGGER.info("用户信息:{}", $this));
     }
 
     @Test
     public void testSelectOne() {
         H2Student student = new H2Student();
-        Assert.assertNotNull(student.selectOne(new QueryWrapper<>()));
+        Assertions.assertNotNull(student.selectOne(new QueryWrapper<>()));
     }
 
     @Test
@@ -118,7 +115,7 @@ public class ActiveRecordTest {
             h2StudentService.testTransactional();
         } catch (MybatisPlusException e) {
             List<H2Student> students = new H2Student().selectList(new QueryWrapper<H2Student>().lambda().like(H2Student::getName, "tx"));
-            Assert.assertTrue(CollectionUtils.isEmpty(students));
+            Assertions.assertTrue(CollectionUtils.isEmpty(students));
         }
     }
 
@@ -126,8 +123,8 @@ public class ActiveRecordTest {
     public void testDelete() {
         H2Student student = new H2Student();
         student.setId(2L);
-        Assert.assertTrue(student.deleteById());
-        Assert.assertTrue(student.deleteById(12L));
-        Assert.assertTrue(student.delete(new QueryWrapper<H2Student>().gt("id", 10)));
+        Assertions.assertTrue(student.deleteById());
+        Assertions.assertTrue(student.deleteById(12L));
+        Assertions.assertTrue(student.delete(new QueryWrapper<H2Student>().gt("id", 10)));
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/GenerateCode4H2Database.java

@@ -1,12 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
@@ -15,6 +8,10 @@ import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.querys.H2Query;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * <p></p>
@@ -22,13 +19,12 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
  * @author yuxiaobin
  * @date 2019/1/8
  */
-@FixMethodOrder(MethodSorters.JVM)
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class GenerateCode4H2Database extends BaseTest{
+class GenerateCode4H2Database extends BaseTest{
 
     @Test
-    public void test() {
+    void test() {
         String dbUrl = "jdbc:h2:mem:test;MODE=mysql";
         DataSourceConfig dataSourceConfig = new DataSourceConfig();
         dataSourceConfig.setDbType(DbType.H2)
@@ -40,7 +36,7 @@ public class GenerateCode4H2Database extends BaseTest{
         generate("com.baomidou.mp.h2", dataSourceConfig, "h2user");
     }
 
-    public void generate(String packageName, DataSourceConfig dataSourceConfig, String tableNames) {
+    void generate(String packageName, DataSourceConfig dataSourceConfig, String tableNames) {
         boolean serviceClassNameStartWithI = false;
         boolean enableTableFieldAnnotation = true;
         GlobalConfig config = new GlobalConfig();

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2Delete1Eq1Test.java

@@ -2,10 +2,10 @@ package com.baomidou.mybatisplus.test.h2;
 
 import javax.annotation.Resource;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
@@ -20,9 +20,11 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
  * @author hubin
  * @since 2018-06-05
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.JVM)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2Delete1Eq1Test extends BaseTest {
+class H2Delete1Eq1Test extends BaseTest {
 
     @Resource
     protected H2UserMapper logicDeleteMapper;
@@ -30,7 +32,7 @@ public class H2Delete1Eq1Test extends BaseTest {
     protected H2StudentMapper defaultMapper;
 
     @Test
-    public void crudTest() {
+    void crudTest() {
         for (int i = 0; i < 10; i++) {
             logicDeleteMapper.insert(new H2User("mp" + i, AgeEnum.ONE));
         }
@@ -56,7 +58,7 @@ public class H2Delete1Eq1Test extends BaseTest {
     }
 
     @Test
-    public void delete() {
+    void delete() {
         logicDeleteMapper.delete(new QueryWrapper<>());
         defaultMapper.delete(new QueryWrapper<>());
     }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjectHandler.java

@@ -1,4 +1,3 @@
-package com.baomidou.mybatisplus.test.h2;
 /*
  * Copyright (c) 2011-2020, hubin (jobob@qq.com).
  * <p>
@@ -14,6 +13,7 @@ package com.baomidou.mybatisplus.test.h2;
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+package com.baomidou.mybatisplus.test.h2;
 
 import java.sql.Timestamp;
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2StudentMapperTest.java

@@ -1,15 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.Resource;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
@@ -19,6 +9,14 @@ import com.baomidou.mybatisplus.test.h2.entity.enums.GenderEnum;
 import com.baomidou.mybatisplus.test.h2.entity.enums.GradeEnum;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2StudentMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * Mybatis Plus H2 Junit Test
@@ -26,15 +24,17 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
  * @author hubin
  * @since 2018-06-05
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.JVM)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2StudentMapperTest extends BaseTest {
+class H2StudentMapperTest extends BaseTest {
 
     @Resource
     protected H2StudentMapper studentMapper;
 
     @Test
-    public void crudTest() {
+    void crudTest() {
 //        H2Student stu = new H2Student();
 //        stu.setGrade(GradeEnum.HIGH);
 //        studentMapper.update(stu, null);
@@ -66,7 +66,7 @@ public class H2StudentMapperTest extends BaseTest {
     }
 
     @Test
-    public void pageCountZeroTest() {
+    void pageCountZeroTest() {
         IPage page = studentMapper.selectPage(new Page<>(), Wrappers.<H2Student>query().eq("name", "无"));
         if (null != page) {
             System.out.println("total: " + page.getTotal());

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.test.h2.entity.SuperEntity;
 import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -29,22 +29,24 @@ import static java.util.stream.Collectors.toList;
  * @author hubin
  * @since 2018-06-05
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.JVM)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserMapperTest extends BaseTest {
+class H2UserMapperTest extends BaseTest {
 
     @Resource
     protected H2UserMapper userMapper;
 
     @Test
-    public void crudTest() {
+    void crudTest() {
         H2User h2User = new H2User();
         h2User.setName(NQQ);
         h2User.setAge(AgeEnum.ONE);
         h2User.setDeleted(0);
         h2User.setDesc("这是一个不错的小伙子");
         h2User.setTestType(1);
-        Assert.assertTrue(1 == userMapper.insert(h2User));
+        Assertions.assertEquals(1, userMapper.insert(h2User));
 
         log(h2User.getTestId());
 
@@ -55,7 +57,7 @@ public class H2UserMapperTest extends BaseTest {
         for (int i = 0; i < 10; i++) {
             userMapper.insert(new H2User("mp" + i, AgeEnum.ONE));
         }
-        Assert.assertTrue(1 == userMapper.deleteById(1L));
+        Assertions.assertEquals(1, userMapper.deleteById(1L));
 
         Map<String, Object> map = new HashMap<>();
         map.put("name", "mp0");
@@ -63,51 +65,49 @@ public class H2UserMapperTest extends BaseTest {
 
         // 根据 map 查询
         h2User = userMapper.selectByMap(map).get(0);
-        Assert.assertTrue(AgeEnum.ONE == h2User.getAge());
+        Assertions.assertSame(AgeEnum.ONE, h2User.getAge());
 
         // 根据 map 删除
-        Assert.assertTrue(1 == userMapper.deleteByMap(map));
+        Assertions.assertEquals(1, userMapper.deleteByMap(map));
 
         // 查询列表
         LambdaQueryWrapper<H2User> wrapper = new QueryWrapper<H2User>().lambda().like(H2User::getName, "mp");
         log(wrapper.getSqlSegment());
 
         List<H2User> h2UserList = userMapper.selectList(wrapper);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(h2UserList));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(h2UserList));
 
         // 查询总数
         int count = userMapper.selectCount(wrapper.clone());
-        Assert.assertTrue(count > 1);
+        Assertions.assertTrue(count > 1);
 
         // 批量删除
-        Assert.assertTrue(count == userMapper.deleteBatchIds(h2UserList
-            .stream().map(SuperEntity::getTestId).collect(toList())));
+        Assertions.assertEquals(count, userMapper.deleteBatchIds(h2UserList.stream().map(SuperEntity::getTestId).collect(toList())));
 
         // 更新
         h2User = new H2User();
         h2User.setAge(AgeEnum.TWO);
         h2User.setDesc("测试置空");
-        Assert.assertTrue(1 == userMapper.update(h2User,
-            new QueryWrapper<H2User>().eq("name", NQQ)));
+        Assertions.assertEquals(1, userMapper.update(h2User, new QueryWrapper<H2User>().eq("name", NQQ)));
 
         log(userMapper.selectOne(new QueryWrapper<>(new H2User().setName(NQQ).setAge(AgeEnum.TWO))));
 
         h2User.setAge(AgeEnum.THREE);
         h2User.setDesc(null);
-        Assert.assertTrue(userMapper.update(h2User,
+        Assertions.assertTrue(userMapper.update(h2User,
             new UpdateWrapper<H2User>().lambda()
                 .set(H2User::getDesc, "")
                 .eq(H2User::getName, "Jerry")) > 0);
 
         log(userMapper.selectOne(new QueryWrapper<>(new H2User().setName(NQQ).setAge(AgeEnum.THREE))));
 
-        Assert.assertEquals(1, userMapper.insert(h2User));
+        Assertions.assertEquals(1, userMapper.insert(h2User));
         // 根据主键更新 age = 18
         h2User.setAge(AgeEnum.TWO);
-        Assert.assertEquals(1, userMapper.updateById(h2User));
+        Assertions.assertEquals(1, userMapper.updateById(h2User));
 
         // 查询一条记录
-        Assert.assertNotNull(userMapper.selectOne(new QueryWrapper<>(new H2User().setName("Joe").setTestType(1))));
+        Assertions.assertNotNull(userMapper.selectOne(new QueryWrapper<>(new H2User().setName("Joe").setTestType(1))));
 
         log(h2User.toString());
 
@@ -117,8 +117,7 @@ public class H2UserMapperTest extends BaseTest {
             System.out.println(h2UserPage.getTotal());
             System.out.println(h2UserPage.getSize());
         }
-        Assert.assertTrue(null != userMapper.selectPage(new Page<>(1, 10),
-            new QueryWrapper<H2User>().orderByAsc("name")));
+        Assertions.assertNotNull(userMapper.selectPage(new Page<>(1, 10), new QueryWrapper<H2User>().orderByAsc("name")));
 
         // 查询结果集，测试 lambda 对象后 QueryWrapper 是否参数继续传递
         QueryWrapper<H2User> qw = new QueryWrapper<>();
@@ -129,11 +128,11 @@ public class H2UserMapperTest extends BaseTest {
                 System.out.println(m);
             }
         }
-        Assert.assertTrue(CollectionUtils.isNotEmpty(userMapper.selectMaps(new QueryWrapper<>(new H2User().setTestType(3)))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(userMapper.selectMaps(new QueryWrapper<>(new H2User().setTestType(3)))));
     }
 
     @Test
-    public void delete() {
+    void delete() {
         userMapper.delete(new QueryWrapper<>(new H2User().setAge(AgeEnum.TWO))
             .eq("name", "Tony"));
     }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -1,27 +1,24 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Mybatis Plus H2 Junit Test
@@ -29,8 +26,9 @@ import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
  * @author Caratacus
  * @since 2017/4/1
  */
-@FixMethodOrder(MethodSorters.JVM)
-@RunWith(SpringJUnit4ClassRunner.class)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.JVM)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 public class H2UserTest extends BaseTest {
 
@@ -39,58 +37,58 @@ public class H2UserTest extends BaseTest {
 
 
     @Test
-    public void testInsertMy() {
+    void testInsertMy() {
         String name = "自定义insert";
         int version = 1;
         int row = userService.myInsert(name, version);
-        Assert.assertEquals(1, row);
+        Assertions.assertEquals(1, row);
     }
 
     @Test
-    public void testInsertObjectWithParam() {
+    void testInsertObjectWithParam() {
         String name = "自定义insert带Param注解";
         int version = 1;
         int row = userService.myInsertWithParam(name, version);
-        Assert.assertEquals(1, row);
+        Assertions.assertEquals(1, row);
     }
 
     @Test
-    public void testInsertObjectWithoutParam() {
+    void testInsertObjectWithoutParam() {
         String name = "自定义insert带Param注解";
         int version = 1;
         int row = userService.myInsertWithoutParam(name, version);
-        Assert.assertEquals(1, row);
+        Assertions.assertEquals(1, row);
     }
 
     @Test
-    public void testEntityWrapperSelectSql() {
+    void testEntityWrapperSelectSql() {
         QueryWrapper<H2User> ew = new QueryWrapper<>();
         ew.select("test_id as testId, name, age");
         List<H2User> list = userService.list(ew);
         for (H2User u : list) {
-            Assert.assertNotNull(u.getTestId());
-            Assert.assertNotNull(u.getName());
-            Assert.assertNull(u.getPrice());
+            Assertions.assertNotNull(u.getTestId());
+            Assertions.assertNotNull(u.getName());
+            Assertions.assertNull(u.getPrice());
         }
     }
 
     @Test
-    public void testQueryWithParamInSelectStatement() {
+    void testQueryWithParamInSelectStatement() {
         Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
         param.put("nameParam", nameParam);
         param.put("ageFrom", 1);
         param.put("ageTo", 100);
         List<H2User> list = userService.queryWithParamInSelectStatememt(param);
-        Assert.assertNotNull(list);
+        Assertions.assertNotNull(list);
         for (H2User u : list) {
-            Assert.assertEquals(nameParam, u.getName());
-            Assert.assertNotNull(u.getTestId());
+            Assertions.assertEquals(nameParam, u.getName());
+            Assertions.assertNotNull(u.getTestId());
         }
     }
 
-    @Test
-    public void testQueryWithParamInSelectStatement4Page() {
+//    @Test
+//    void testQueryWithParamInSelectStatement4Page() {
 //        Map<String, Object> param = new HashMap<>();
 //        String nameParam = "selectStmtParam";
 //        param.put("nameParam", nameParam);
@@ -103,21 +101,21 @@ public class H2UserTest extends BaseTest {
 //            Assert.assertNotNull(u.getId());
 //        }
 //        Assert.assertNotEquals(0, page.getTotal());
-    }
+//    }
 
     @Test
-    public void testSelectCountWithParamInSelectItems() {
+    void testSelectCountWithParamInSelectItems() {
         Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
         param.put("nameParam", nameParam);
         param.put("ageFrom", 1);
         param.put("ageTo", 100);
         int count = userService.selectCountWithParamInSelectItems(param);
-        Assert.assertNotEquals(0, count);
+        Assertions.assertNotEquals(0, count);
     }
 
     @Test
-    public void testUpdateByIdWithOptLock() {
+    void testUpdateByIdWithOptLock() {
         Long id = 991L;
         H2User user = new H2User();
         user.setTestId(id);
@@ -130,19 +128,19 @@ public class H2UserTest extends BaseTest {
         userService.save(user);
 
         H2User userDB = userService.getById(id);
-        Assert.assertEquals(1, userDB.getVersion().intValue());
+        Assertions.assertEquals(1, userDB.getVersion().intValue());
 
         userDB.setName("992");
         userService.updateById(userDB);
-        Assert.assertEquals("updated version value should be updated to entity", 2, userDB.getVersion().intValue());
+        Assertions.assertEquals(2, userDB.getVersion().intValue(), "updated version value should be updated to entity");
 
         userDB = userService.getById(id);
-        Assert.assertEquals(2, userDB.getVersion().intValue());
-        Assert.assertEquals("992", userDB.getName());
+        Assertions.assertEquals(2, userDB.getVersion().intValue());
+        Assertions.assertEquals("992", userDB.getName());
     }
 
     @Test
-    public void testUpdateByEwWithOptLock() {
+    void testUpdateByEwWithOptLock() {
         H2User userInsert = new H2User();
         userInsert.setName("optLockerTest");
         userInsert.setAge(AgeEnum.THREE);
@@ -168,13 +166,13 @@ public class H2UserTest extends BaseTest {
         for (H2User u : userService.list(ew)) {
             System.out.println(u.getName() + "," + u.getAge() + "," + u.getVersion());
             if (u.getTestId().equals(id99)) {
-                Assert.assertEquals("optLocker should update version+=1", 100, u.getVersion().intValue());
+                Assertions.assertEquals(100, u.getVersion().intValue(), "optLocker should update version+=1");
             }
         }
     }
 
     @Test
-    public void testOptLocker4WrapperIsNull() {
+    void testOptLocker4WrapperIsNull() {
         H2User userInsert = new H2User();
         userInsert.setName("optLockerTest");
         userInsert.setAge(AgeEnum.THREE);
@@ -202,89 +200,88 @@ public class H2UserTest extends BaseTest {
         for (H2User u : userService.list(ew)) {
             System.out.println(u.getName() + "," + u.getAge() + "," + u.getVersion());
             if (u.getTestId().equals(id99)) {
-                Assert.assertEquals("optLocker should update version+=1", 100, u.getVersion().intValue());
+                Assertions.assertEquals(100, u.getVersion().intValue(), "optLocker should update version+=1");
             } else {
-                Assert.assertEquals("other records should not be updated", idPriceMap.get(u.getTestId()), u.getPrice());
+                Assertions.assertEquals(idPriceMap.get(u.getTestId()), u.getPrice(), "other records should not be updated");
             }
         }
         userService.update(new H2User().setPrice(BigDecimal.ZERO), null);
         for (H2User u : userService.list(new QueryWrapper<>())) {
             System.out.println(u.getName() + "," + u.getAge() + "," + u.getVersion());
-            Assert.assertEquals("all records should be updated", u.getPrice().setScale(2, RoundingMode.HALF_UP).intValue(), BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP).intValue());
+            Assertions.assertEquals(u.getPrice().setScale(2, RoundingMode.HALF_UP).intValue(), BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP).intValue(), "all records should be updated");
         }
 
     }
 
     @Test
-    public void testBatchTransactional() {
+    void testBatchTransactional() {
         try {
             userService.testBatchTransactional();
         } catch (MybatisPlusException e) {
             List<H2User> list = userService.list(new QueryWrapper<H2User>().like("name", "batch"));
-            Assert.assertTrue(CollectionUtils.isEmpty(list));
+            Assertions.assertTrue(CollectionUtils.isEmpty(list));
         }
     }
 
     @Test
-    public void testSimpleTransactional() {
+    void testSimpleTransactional() {
         try {
             userService.testSimpleTransactional();
         } catch (MybatisPlusException e) {
             List<H2User> list = userService.list(new QueryWrapper<H2User>().like("name", "simple"));
-            Assert.assertTrue(CollectionUtils.isEmpty(list));
+            Assertions.assertTrue(CollectionUtils.isEmpty(list));
         }
     }
 
     @Test
-    public void testSaveOrUpdateBatchTransactional() {
+    void testSaveOrUpdateBatchTransactional() {
         try {
             userService.testSaveOrUpdateBatchTransactional();
         } catch (MybatisPlusException e) {
             List<H2User> list = userService.list(new QueryWrapper<H2User>().like("name", "savOrUpdate"));
-            Assert.assertTrue(CollectionUtils.isEmpty(list));
+            Assertions.assertTrue(CollectionUtils.isEmpty(list));
         }
     }
 
     @Test
-    public void testSaveBatch() {
-        Assert.assertTrue(userService.saveBatch(Arrays.asList(new H2User("saveBatch1"), new H2User("saveBatch2"), new H2User("saveBatch3"), new H2User("saveBatch4"))));
-        Assert.assertTrue(userService.saveBatch(Arrays.asList(new H2User("saveBatch5"), new H2User("saveBatch6"), new H2User("saveBatch7"), new H2User("saveBatch8")), 2));
-
+    void testSaveBatch() {
+        Assertions.assertTrue(userService.saveBatch(Arrays.asList(new H2User("saveBatch1"), new H2User("saveBatch2"), new H2User("saveBatch3"), new H2User("saveBatch4"))));
+        Assertions.assertTrue(userService.saveBatch(Arrays.asList(new H2User("saveBatch5"), new H2User("saveBatch6"), new H2User("saveBatch7"), new H2User("saveBatch8")), 2));
     }
 
     @Test
-    public void testUpdateBatch() {
-        Assert.assertTrue(userService.updateBatchById(Arrays.asList(new H2User(1010L, "batch1010"), new H2User(1011L, "batch1011"), new H2User(1010L, "batch1010"), new H2User(1012L, "batch1012"))));
-        Assert.assertTrue(userService.updateBatchById(Arrays.asList(new H2User(1010L, "batch1010A"), new H2User(1011L, "batch1011A"), new H2User(1010L, "batch1010"), new H2User(1012L, "batch1012")), 1));
+    void testUpdateBatch() {
+        Assertions.assertTrue(userService.updateBatchById(Arrays.asList(new H2User(1010L, "batch1010"), new H2User(1011L, "batch1011"), new H2User(1010L, "batch1010"), new H2User(1012L, "batch1012"))));
+        Assertions.assertTrue(userService.updateBatchById(Arrays.asList(new H2User(1010L, "batch1010A"), new H2User(1011L, "batch1011A"), new H2User(1010L, "batch1010"), new H2User(1012L, "batch1012")), 1));
     }
 
     @Test
-    public void testSaveOrUpdateBatch() {
-        Assert.assertTrue(userService.saveOrUpdateBatch(Arrays.asList(new H2User(1010L, "batch1010"), new H2User("batch1011"), new H2User(1010L, "batch1010"), new H2User("batch1015"))));
-        Assert.assertTrue(userService.saveOrUpdateBatch(Arrays.asList(new H2User(1010L, "batch1010A"), new H2User("batch1011A"), new H2User(1010L, "batch1010"), new H2User("batch1016")), 1));
+    void testSaveOrUpdateBatch() {
+        Assertions.assertTrue(userService.saveOrUpdateBatch(Arrays.asList(new H2User(1010L, "batch1010"), new H2User("batch1011"), new H2User(1010L, "batch1010"), new H2User("batch1015"))));
+        Assertions.assertTrue(userService.saveOrUpdateBatch(Arrays.asList(new H2User(1010L, "batch1010A"), new H2User("batch1011A"), new H2User(1010L, "batch1010"), new H2User("batch1016")), 1));
     }
 
     @Test
-    public void testSimpleAndBatch() {
-        Assert.assertTrue(userService.save(new H2User("testSimpleAndBatch1", 0)));
-        Assert.assertTrue(userService.saveOrUpdateBatch(Arrays.asList(new H2User("testSimpleAndBatch2"), new H2User("testSimpleAndBatch3"), new H2User("testSimpleAndBatch4")), 1));
+    void testSimpleAndBatch() {
+        Assertions.assertTrue(userService.save(new H2User("testSimpleAndBatch1", 0)));
+        Assertions.assertTrue(userService.saveOrUpdateBatch(Arrays.asList(new H2User("testSimpleAndBatch2"), new H2User("testSimpleAndBatch3"), new H2User("testSimpleAndBatch4")), 1));
     }
 
     @Test
-    public void testSimpleAndBatchTransactional() {
+    void testSimpleAndBatchTransactional() {
         try {
             userService.testSimpleAndBatchTransactional();
         } catch (MybatisPlusException e) {
             List<H2User> list = userService.list(new QueryWrapper<H2User>().like("name", "simpleAndBatchTx"));
-            Assert.assertTrue(CollectionUtils.isEmpty(list));
+            Assertions.assertTrue(CollectionUtils.isEmpty(list));
         }
     }
 
     @Test
-    public void testServiceImplInnerLambdaQuery() {
+    void testServiceImplInnerLambdaQuery() {
         H2User tomcat = userService.lambdaQuery().eq(H2User::getName, "Tomcat").one();
-        Assert.assertNotNull(tomcat);
-        Assert.assertNotEquals(0L, userService.lambdaQuery().like(H2User::getName, "a").count().longValue());
+        Assertions.assertNotNull(tomcat);
+        Assertions.assertNotEquals(0L, userService.lambdaQuery().like(H2User::getName, "a").count().longValue());
         userService.lambdaQuery().like(H2User::getName, "T")
             .ne(H2User::getAge, AgeEnum.TWO)
             .ge(H2User::getVersion, 1)
@@ -293,9 +290,9 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
-    public void testServiceChainQuery() {
+    void testServiceChainQuery() {
         H2User tomcat = userService.query().eq("name", "Tomcat").one();
-        Assert.assertNotNull("tomcat should not be null", tomcat);
+        Assertions.assertNotNull(tomcat, "tomcat should not be null");
         userService.query().nested(i -> i.eq("name", "Tomcat")).list();
         userService.lambdaUpdate().set(H2User::getName, "Tom").eq(H2User::getName, "Tomcat").update();
     }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/SqlRunnerTest.java

@@ -1,31 +1,27 @@
 package com.baomidou.mybatisplus.test.h2;
 
-
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.mockito.internal.matchers.GreaterThan;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import com.baomidou.mybatisplus.test.h2.service.IH2StudentService;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 
 /**
  * SqlRunner测试
  * @author nieqiurong 2018/8/25 11:05.
  */
-@FixMethodOrder(MethodSorters.JVM)
-@RunWith(SpringJUnit4ClassRunner.class)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.JVM)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 public class SqlRunnerTest {
 
@@ -33,31 +29,31 @@ public class SqlRunnerTest {
     private IH2StudentService studentService;
 
     @Test
-    public void testSelectCount(){
+    void testSelectCount(){
         int count = SqlRunner.db().selectCount("select count(1) from h2student");
-        Assert.assertThat(count, new GreaterThan<>(0));
+        Assertions.assertTrue(count > 0);
         count = SqlRunner.db().selectCount("select count(1) from h2student where id > {0}",0);
-        Assert.assertThat(count, new GreaterThan<>(0));
+        Assertions.assertTrue(count > 0);
         count = SqlRunner.db(H2Student.class).selectCount("select count(1) from h2student");
-        Assert.assertThat(count, new GreaterThan<>(0));
+        Assertions.assertTrue(count > 0);
         count = SqlRunner.db(H2Student.class).selectCount("select count(1) from h2student where id > {0}",0);
-        Assert.assertThat(count, new GreaterThan<>(0));
+        Assertions.assertTrue(count > 0);
     }
 
     @Test
     @Transactional
-    public void testInsert(){
-        Assert.assertTrue(SqlRunner.db().insert("INSERT INTO h2student ( name, age ) VALUES ( {0}, {1} )","测试学生",2));
-        Assert.assertTrue(SqlRunner.db(H2Student.class).insert("INSERT INTO h2student ( name, age ) VALUES ( {0}, {1} )","测试学生2",3));
+    void testInsert(){
+        Assertions.assertTrue(SqlRunner.db().insert("INSERT INTO h2student ( name, age ) VALUES ( {0}, {1} )","测试学生",2));
+        Assertions.assertTrue(SqlRunner.db(H2Student.class).insert("INSERT INTO h2student ( name, age ) VALUES ( {0}, {1} )","测试学生2",3));
     }
 
     @Test
-    public void testTransactional(){
+    void testTransactional(){
         try {
             studentService.testSqlRunnerTransactional();
         } catch (RuntimeException e){
             List<H2Student> list = studentService.list(new QueryWrapper<H2Student>().like("name", "sqlRunnerTx"));
-            Assert.assertTrue(CollectionUtils.isEmpty(list));
+            Assertions.assertTrue(CollectionUtils.isEmpty(list));
         }
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/TestXmlConfig.java

@@ -1,29 +1,29 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
 import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * 测试XML配置
  * @author nieqiurong 2018/8/14 13:30.
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-xml-h2.xml"})
-public class TestXmlConfig {
+class TestXmlConfig {
 
     @Autowired
     protected IH2UserService userService;
 
     @Test
-    public void test() {
+    void test() {
         H2User user = userService.getById(101L);
-        Assert.assertNotNull(user);
+        Assertions.assertNotNull(user);
     }
 
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2StudentMapper.java

@@ -6,6 +6,4 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
  * 学生Mapper层
  * @author nieqiurong 2018/7/27.
  */
-public interface H2StudentMapper extends SuperMapper<H2Student> {
-
-}
+public interface H2StudentMapper extends SuperMapper<H2Student> {}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java

@@ -21,14 +21,12 @@ import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.ResultMapEntityMapper;
 import com.baomidou.mybatisplus.test.base.mapper.mysql.MysqlDataMapper;
 import com.baomidou.mybatisplus.test.mysql.config.MysqlDb;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -43,10 +41,11 @@ import static java.util.stream.Collectors.toMap;
  * @author hubin
  * @since 2018-06-05
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
-public class MysqlTestDataMapperTest {
+class MysqlTestDataMapperTest {
 
     private final List<String> list = Arrays.asList("1", "2", "3");
     private final Map<String, Object> map = list.parallelStream().collect(toMap(identity(), identity()));
@@ -59,14 +58,14 @@ public class MysqlTestDataMapperTest {
     @Resource
     private ResultMapEntityMapper resultMapEntityMapper;
 
-    @BeforeClass
-    public static void init() throws Exception {
+    @BeforeAll
+    static void init() throws Exception {
         MysqlDb.initMysqlData();
         System.out.println("init success");
     }
 
     @Test
-    public void a1_insertForeach() {
+    void a1_insertForeach() {
         for (int i = 1; i < 20; i++) {
             Long id = (long) i;
             String str = String.format("第%s条数据", i);
@@ -79,7 +78,7 @@ public class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void a2_insertBatch() {
+    void a2_insertBatch() {
         List<MysqlData> mysqlDataList = new ArrayList<>();
         List<CommonData> commonDataList = new ArrayList<>();
         List<CommonLogicData> commonLogicDataList = new ArrayList<>();
@@ -89,43 +88,43 @@ public class MysqlTestDataMapperTest {
             commonDataList.add(new CommonData().setTestInt(i).setTestEnum(TestEnum.TWO).setTestStr(str));
             commonLogicDataList.add(new CommonLogicData().setTestInt(i).setTestStr(str));
         }
-        Assert.assertEquals(9, mysqlMapper.insertBatchSomeColumn(mysqlDataList));
-        Assert.assertEquals(9, commonMapper.insertBatchSomeColumn(commonDataList));
-        Assert.assertEquals(9, commonLogicMapper.insertBatchSomeColumn(commonLogicDataList));
+        Assertions.assertEquals(9, mysqlMapper.insertBatchSomeColumn(mysqlDataList));
+        Assertions.assertEquals(9, commonMapper.insertBatchSomeColumn(commonDataList));
+        Assertions.assertEquals(9, commonLogicMapper.insertBatchSomeColumn(commonLogicDataList));
     }
 
     @Test
-    public void b1_deleteById() {
+    void b1_deleteById() {
         long id = 1L;
-        Assert.assertEquals(1, commonMapper.deleteById(id));
-        Assert.assertEquals(1, commonLogicMapper.deleteById(id));
-        Assert.assertEquals(1, mysqlMapper.deleteById(id));
+        Assertions.assertEquals(1, commonMapper.deleteById(id));
+        Assertions.assertEquals(1, commonLogicMapper.deleteById(id));
+        Assertions.assertEquals(1, mysqlMapper.deleteById(id));
     }
 
     @Test
-    public void b2_deleteByMap() {
+    void b2_deleteByMap() {
         long id = 2L;
         Map<String, Object> map = new HashMap<>();
         map.put("id", id);
         map.put("test_int", 5);
-        Assert.assertEquals(0, commonMapper.deleteByMap(map));
-        Assert.assertEquals(0, commonLogicMapper.deleteByMap(map));
+        Assertions.assertEquals(0, commonMapper.deleteByMap(map));
+        Assertions.assertEquals(0, commonLogicMapper.deleteByMap(map));
         Map<String, Object> map2 = new HashMap<>();
         map2.put("id", id);
         map2.put("`order`", 5);
-        Assert.assertEquals(0, mysqlMapper.deleteByMap(map2));
+        Assertions.assertEquals(0, mysqlMapper.deleteByMap(map2));
     }
 
     @Test
     public void b3_delete() {
         long id = 2L;
-        Assert.assertEquals(1, commonMapper.delete(new QueryWrapper<CommonData>().lambda()
+        Assertions.assertEquals(1, commonMapper.delete(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, id)
             .eq(CommonData::getTestInt, 2)));
-        Assert.assertEquals(1, commonLogicMapper.delete(new QueryWrapper<CommonLogicData>().lambda()
+        Assertions.assertEquals(1, commonLogicMapper.delete(new QueryWrapper<CommonLogicData>().lambda()
             .eq(CommonLogicData::getId, id)
             .eq(CommonLogicData::getTestInt, 2)));
-        Assert.assertEquals(1, mysqlMapper.delete(new QueryWrapper<MysqlData>().lambda()
+        Assertions.assertEquals(1, mysqlMapper.delete(new QueryWrapper<MysqlData>().lambda()
             .eq(MysqlData::getId, id)
             .eq(MysqlData::getOrder, 2)));
     }
@@ -133,51 +132,51 @@ public class MysqlTestDataMapperTest {
     @Test
     public void b4_deleteBatchIds() {
         List<Long> ids = Arrays.asList(3L, 4L);
-        Assert.assertEquals(2, commonMapper.deleteBatchIds(ids));
-        Assert.assertEquals(2, commonLogicMapper.deleteBatchIds(ids));
-        Assert.assertEquals(2, mysqlMapper.deleteBatchIds(ids));
+        Assertions.assertEquals(2, commonMapper.deleteBatchIds(ids));
+        Assertions.assertEquals(2, commonLogicMapper.deleteBatchIds(ids));
+        Assertions.assertEquals(2, mysqlMapper.deleteBatchIds(ids));
     }
 
     @Test
     public void b5_deleteByIdWithFill() {
         long id = 5L;
         // 真删
-        Assert.assertEquals(1, commonMapper.deleteByIdWithFill(new CommonData().setId(id)));
+        Assertions.assertEquals(1, commonMapper.deleteByIdWithFill(new CommonData().setId(id)));
         // 逻辑删除带填充
-        Assert.assertEquals(1, commonLogicMapper.deleteByIdWithFill(new CommonLogicData().setId(id)));
+        Assertions.assertEquals(1, commonLogicMapper.deleteByIdWithFill(new CommonLogicData().setId(id)));
         // 真删
-        Assert.assertEquals(1, mysqlMapper.deleteByIdWithFill(new MysqlData().setId(id)));
+        Assertions.assertEquals(1, mysqlMapper.deleteByIdWithFill(new MysqlData().setId(id)));
     }
 
     @Test
     public void c1_updateById() {
         long id = 6L;
-        Assert.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(555).setVersion(0)
+        Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(555).setVersion(0)
             .setTestEnum(TestEnum.TWO)));
-        Assert.assertEquals(1, commonLogicMapper.updateById(new CommonLogicData().setId(id).setTestInt(555)));
-        Assert.assertEquals(1, mysqlMapper.updateById(new MysqlData().setId(id).setOrder(555)));
-        Assert.assertEquals(1, resultMapEntityMapper.updateById(new ResultMapEntity().setId(id).setList(list).setMap(map)));
+        Assertions.assertEquals(1, commonLogicMapper.updateById(new CommonLogicData().setId(id).setTestInt(555)));
+        Assertions.assertEquals(1, mysqlMapper.updateById(new MysqlData().setId(id).setOrder(555)));
+        Assertions.assertEquals(1, resultMapEntityMapper.updateById(new ResultMapEntity().setId(id).setList(list).setMap(map)));
     }
 
     @Test
     public void c2_optimisticUpdateById() {
         long id = 7L;
-        Assert.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(778)
+        Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(778)
             .setVersion(0)));
     }
 
     @Test
     public void c3_update() {
         long id = 8L;
-        Assert.assertEquals(1, commonMapper.update(
+        Assertions.assertEquals(1, commonMapper.update(
             new CommonData().setTestInt(888).setVersion(0),
             new UpdateWrapper<CommonData>().lambda().eq(CommonData::getId, id)
                 .eq(CommonData::getTestInt, 8)));
-        Assert.assertEquals(1, commonLogicMapper.update(
+        Assertions.assertEquals(1, commonLogicMapper.update(
             new CommonLogicData().setTestInt(888),
             new UpdateWrapper<CommonLogicData>().lambda().eq(CommonLogicData::getId, id)
                 .eq(CommonLogicData::getTestInt, 8)));
-        Assert.assertEquals(1, mysqlMapper.update(
+        Assertions.assertEquals(1, mysqlMapper.update(
             new MysqlData().setOrder(888),
             new UpdateWrapper<MysqlData>().lambda().eq(MysqlData::getId, id)
                 .eq(MysqlData::getOrder, 8)));
@@ -191,23 +190,23 @@ public class MysqlTestDataMapperTest {
     @Test
     public void d2_selectById() {
         long id = 6L;
-        Assert.assertNotNull(commonMapper.selectById(id).getTestEnum());
-        Assert.assertTrue(commonMapper.getById(id).isPresent());
-        Assert.assertNotNull(commonLogicMapper.selectById(id));
-        Assert.assertNotNull(mysqlMapper.selectById(id));
+        Assertions.assertNotNull(commonMapper.selectById(id).getTestEnum());
+        Assertions.assertTrue(commonMapper.getById(id).isPresent());
+        Assertions.assertNotNull(commonLogicMapper.selectById(id));
+        Assertions.assertNotNull(mysqlMapper.selectById(id));
         ResultMapEntity resultMapEntity = resultMapEntityMapper.selectById(id);
-        Assert.assertNotNull(resultMapEntity);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getMap()));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getList()));
+        Assertions.assertNotNull(resultMapEntity);
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getMap()));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getList()));
     }
 
     @Test
     public void d3_selectBatchIds() {
         List<Long> ids = Arrays.asList(7L, 8L);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectBatchIds(ids)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectBatchIds(ids)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectBatchIds(ids)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(resultMapEntityMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(resultMapEntityMapper.selectBatchIds(ids)));
     }
 
     @Test
@@ -216,33 +215,33 @@ public class MysqlTestDataMapperTest {
         Map<String, Object> map = new HashMap<>();
         map.put("id", id);
         map.put("test_int", 9);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectByMap(map)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectByMap(map)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectByMap(map)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectByMap(map)));
         Map<String, Object> map2 = new HashMap<>();
         map2.put("id", id);
         map2.put("`order`", 9);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectByMap(map2)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectByMap(map2)));
     }
 
     @Test
     public void d5_selectOne() {
         long id = 10L;
-        Assert.assertNotNull(commonMapper.selectOne(new QueryWrapper<CommonData>().lambda()
+        Assertions.assertNotNull(commonMapper.selectOne(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, id).eq(CommonData::getTestInt, 10)));
-        Assert.assertNotNull(commonLogicMapper.selectOne(new QueryWrapper<CommonLogicData>().lambda()
+        Assertions.assertNotNull(commonLogicMapper.selectOne(new QueryWrapper<CommonLogicData>().lambda()
             .eq(CommonLogicData::getId, id).eq(CommonLogicData::getTestInt, 10)));
-        Assert.assertNotNull(mysqlMapper.selectOne(new QueryWrapper<MysqlData>().lambda()
+        Assertions.assertNotNull(mysqlMapper.selectOne(new QueryWrapper<MysqlData>().lambda()
             .eq(MysqlData::getId, id).eq(MysqlData::getOrder, 10)));
     }
 
     @Test
     public void d6_selectList() {
         long id = 10L;
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .lambda().eq(CommonData::getTestInt, 10))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
             .lambda().eq(CommonLogicData::getId, id).eq(CommonLogicData::getTestInt, 10))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(new QueryWrapper<MysqlData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(new QueryWrapper<MysqlData>()
             .lambda().eq(MysqlData::getId, id).eq(MysqlData::getOrder, 10))));
     }
 
@@ -250,46 +249,46 @@ public class MysqlTestDataMapperTest {
     public void d7_1_selectListForNoLogic() {
         MysqlData data = new MysqlData().setOrder(1);
         // 1. 只有 entity
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data))));
         // 2. 有 entity 也有 where 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(data).eq(MysqlData::getGroup, 1))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(data).eq(MysqlData::getGroup, 1))));
         // 3. 有 entity 也有 where 条件 也有 last 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(data).eq(MysqlData::getGroup, 1).last("limit 1"))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(data).eq(MysqlData::getGroup, 1).last("limit 1"))));
         // 4. 有 entity 也有 last 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data)
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data)
             .last("limit 1"))));
         // 5. 只有 order by 或者 last
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.<MysqlData>query()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.<MysqlData>query()
             .lambda().orderByDesc(MysqlData::getOrder).last("limit 1"))));
         // 6. 什么都没有情况
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.emptyWrapper())));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.emptyWrapper())));
         // 7. 只有 where 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1))));
         // 8. 有 where 条件 也有 last 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1).last("limit 1"))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1).last("limit 1"))));
     }
 
     @Test
     public void d7_2_selectListForLogic() {
         // 1. 只有 entity
         CommonLogicData data = new CommonLogicData().setTestInt(11);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.query(data))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.query(data))));
         // 2. 有 entity 也有 where 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(data).eq(CommonLogicData::getId, 11))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(data).eq(CommonLogicData::getId, 11))));
         // 3. 有 entity 也有 where 条件 也有 last 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(data).eq(CommonLogicData::getId, 11).last("limit 1"))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(data).eq(CommonLogicData::getId, 11).last("limit 1"))));
         // 4. 有 entity 也有 last 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.query(data)
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.query(data)
             .last("limit 1"))));
         // 5. 只有 order by 或者 last
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.<CommonLogicData>query()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.<CommonLogicData>query()
             .lambda().orderByAsc(CommonLogicData::getTestInt).last("limit 1"))));
         // 6. 什么都没有情况
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.emptyWrapper())));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.emptyWrapper())));
         // 7. 只有 where 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).eq(CommonLogicData::getId, 11))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).eq(CommonLogicData::getId, 11))));
         // 8. 有 where 条件 也有 last 条件
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).eq(CommonLogicData::getId, 11).last("limit 1"))));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).eq(CommonLogicData::getId, 11).last("limit 1"))));
     }
 
     @Test
@@ -297,45 +296,45 @@ public class MysqlTestDataMapperTest {
         Page<CommonData> page = new Page<>(1, 5);
         page.setDesc("c_time", "u_time");
         IPage<CommonData> dataPage = commonMapper.selectPage(page, null);
-        Assert.assertSame(dataPage, page);
-        Assert.assertNotEquals(null, dataPage.getTotal());
-        Assert.assertNotEquals(0, dataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
+        Assertions.assertSame(dataPage, page);
+        Assertions.assertNotEquals(null, dataPage.getTotal());
+        Assertions.assertNotEquals(0, dataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
         System.out.println(JSON.toJSONString(dataPage));
         System.out.println(JSON.toJSON(dataPage.convert(CommonData::getId)));
 
         Page<CommonData> commonDataPage = new Page<>(1, 5);
         commonDataPage.setDesc("c_time", "u_time");
         IPage<CommonData> commonDataDataPage = commonMapper.myPage(commonDataPage);
-        Assert.assertSame(commonDataDataPage, commonDataPage);
-        Assert.assertNotEquals(null, commonDataDataPage.getTotal());
-        Assert.assertNotEquals(0, commonDataDataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonDataDataPage.getRecords()));
+        Assertions.assertSame(commonDataDataPage, commonDataPage);
+        Assertions.assertNotEquals(null, commonDataDataPage.getTotal());
+        Assertions.assertNotEquals(0, commonDataDataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonDataDataPage.getRecords()));
         System.out.println(JSON.toJSONString(commonDataDataPage));
         System.out.println(JSON.toJSON(commonDataDataPage.convert(CommonData::getId)));
 
         Page<CommonLogicData> logicPage = new Page<>(1, 5);
         IPage<CommonLogicData> logicDataPage = commonLogicMapper.selectPage(logicPage, null);
-        Assert.assertSame(logicDataPage, logicPage);
-        Assert.assertNotEquals(null, logicDataPage.getTotal());
-        Assert.assertNotEquals(0, logicDataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(logicDataPage.getRecords()));
+        Assertions.assertSame(logicDataPage, logicPage);
+        Assertions.assertNotEquals(null, logicDataPage.getTotal());
+        Assertions.assertNotEquals(0, logicDataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(logicDataPage.getRecords()));
         System.out.println(JSON.toJSONString(logicDataPage));
 
         Page<MysqlData> mysqlPage = new Page<>(1, 5);
         IPage<MysqlData> mysqlDataPage = mysqlMapper.selectPage(mysqlPage, null);
-        Assert.assertSame(mysqlDataPage, mysqlPage);
-        Assert.assertNotEquals(null, mysqlDataPage.getTotal());
-        Assert.assertNotEquals(0, mysqlDataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlDataPage.getRecords()));
+        Assertions.assertSame(mysqlDataPage, mysqlPage);
+        Assertions.assertNotEquals(null, mysqlDataPage.getTotal());
+        Assertions.assertNotEquals(0, mysqlDataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlDataPage.getRecords()));
         System.out.println(JSON.toJSONString(mysqlDataPage));
 
         Page<ResultMapEntity> resultMapEntityPage = new Page<>(1, 5);
         IPage<ResultMapEntity> resultMapEntityDataPage = resultMapEntityMapper.selectPage(resultMapEntityPage, null);
-        Assert.assertSame(resultMapEntityDataPage, resultMapEntityPage);
-        Assert.assertNotEquals(null, resultMapEntityDataPage.getTotal());
-        Assert.assertNotEquals(0, resultMapEntityDataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(resultMapEntityDataPage.getRecords()));
+        Assertions.assertSame(resultMapEntityDataPage, resultMapEntityPage);
+        Assertions.assertNotEquals(null, resultMapEntityDataPage.getTotal());
+        Assertions.assertNotEquals(0, resultMapEntityDataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(resultMapEntityDataPage.getRecords()));
         System.out.println(JSON.toJSONString(resultMapEntityDataPage));
     }
 
@@ -344,20 +343,20 @@ public class MysqlTestDataMapperTest {
         Page<CommonData> page = new Page<>(1, 5);
         page.setDesc("c_time", "u_time");
         IPage<CommonData> dataPage = new CommonData().selectPage(page, new QueryWrapper<CommonData>().lambda());
-        Assert.assertSame(dataPage, page);
-        Assert.assertNotEquals(null, dataPage.getTotal());
-        Assert.assertNotEquals(0, dataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
+        Assertions.assertSame(dataPage, page);
+        Assertions.assertNotEquals(null, dataPage.getTotal());
+        Assertions.assertNotEquals(0, dataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
         System.out.println(JSON.toJSONString(dataPage));
     }
 
     @Test
     public void d8_testApply() {
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .apply("test_int = 12"))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
             .apply("test_int = 12"))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(new QueryWrapper<MysqlData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(new QueryWrapper<MysqlData>()
             .apply("`order` = 12"))));
     }
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/SelectCountDistinctTest.java

@@ -9,43 +9,42 @@ import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.mysql.config.MysqlDb;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Resource;
 import java.sql.SQLException;
 import java.util.List;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
-public class SelectCountDistinctTest {
+class SelectCountDistinctTest {
 
     @Resource
     private CommonLogicDataMapper commonLogicMapper;
     @Resource
     private CommonDataMapper commonDataMapper;
 
-    @Before
-    public void init() throws SQLException {
+    @BeforeAll
+    static void init() throws SQLException {
         MysqlDb.initMysqlData();
         insertLogic();
         insertCommon();
         System.out.println("init table and data success");
     }
 
-    private void insertLogic() {
+    private static void insertLogic() {
         commonLogicMapper.insert(new CommonLogicData().setTestInt(25).setTestStr("test"));
         commonLogicMapper.insert(new CommonLogicData().setTestInt(25).setTestStr("test"));
     }
 
-    private void insertCommon() {
+    private static void insertCommon() {
         commonDataMapper.insert(new CommonData().setTestInt(25).setTestStr("test"));
         commonDataMapper.insert(new CommonData().setTestInt(25).setTestStr("test"));
     }
@@ -56,7 +55,7 @@ public class SelectCountDistinctTest {
         distinct.select("distinct test_int");
         distinct.eq("test_int", 25).or().eq("test_str", "test");
         int count = commonDataMapper.selectCount(distinct);
-        Assert.assertEquals(1, count);
+        Assertions.assertEquals(1, count);
     }
 
     @Test
@@ -65,7 +64,7 @@ public class SelectCountDistinctTest {
         distinct.select("distinct test_int, test_str");
         distinct.eq("test_int", 25).or().eq("test_str", "test");
         int count = commonDataMapper.selectCount(distinct);
-        Assert.assertEquals(1, count);
+        Assertions.assertEquals(1, count);
     }
 
     @Test
@@ -74,7 +73,7 @@ public class SelectCountDistinctTest {
         distinct.select("distinct test_int");
         distinct.eq("test_int", 25).or().eq("test_str", "test");
         int count = commonLogicMapper.selectCount(distinct);
-        Assert.assertEquals(1, count);
+        Assertions.assertEquals(1, count);
     }
 
     @Test
@@ -82,8 +81,8 @@ public class SelectCountDistinctTest {
         QueryWrapper<CommonLogicData> commonQuery = new QueryWrapper<>();
         List<CommonLogicData> commonLogicDataList = commonLogicMapper.selectList(commonQuery);
         CommonLogicData commonLogicData = commonLogicDataList.get(0);
-        Assert.assertEquals(25, commonLogicData.getTestInt().intValue());
-        Assert.assertEquals("test", commonLogicData.getTestStr());
+        Assertions.assertEquals(25, commonLogicData.getTestInt().intValue());
+        Assertions.assertEquals("test", commonLogicData.getTestStr());
     }
 
     @Test
@@ -91,7 +90,7 @@ public class SelectCountDistinctTest {
         LambdaQueryWrapper<CommonLogicData> lambdaQueryWrapper =
             new QueryWrapper<CommonLogicData>().select("distinct test_int").lambda();
         int count = commonLogicMapper.selectCount(lambdaQueryWrapper);
-        Assert.assertEquals(1, count);
+        Assertions.assertEquals(1, count);
     }
 
     @Test
@@ -99,7 +98,7 @@ public class SelectCountDistinctTest {
         LambdaQueryWrapper<CommonData> lambdaQueryWrapper =
             new QueryWrapper<CommonData>().select("distinct test_int, test_str").lambda();
         int count = commonDataMapper.selectCount(lambdaQueryWrapper);
-        Assert.assertEquals(1, count);
+        Assertions.assertEquals(1, count);
     }
 
     @Test
@@ -107,7 +106,7 @@ public class SelectCountDistinctTest {
         QueryWrapper<CommonLogicData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
         int count = commonLogicMapper.selectCount(queryWrapper);
-        Assert.assertEquals(2, count);
+        Assertions.assertEquals(2, count);
     }
 
     @Test
@@ -115,7 +114,7 @@ public class SelectCountDistinctTest {
         QueryWrapper<CommonData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
         int count = commonDataMapper.selectCount(queryWrapper);
-        Assert.assertEquals(2, count);
+        Assertions.assertEquals(2, count);
     }
 
     @Test
@@ -123,9 +122,9 @@ public class SelectCountDistinctTest {
         QueryWrapper<CommonData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
         IPage<CommonData> page = commonDataMapper.selectPage(new Page<CommonData>(1, 10), queryWrapper);
-        Assert.assertEquals(2, page.getTotal());
-        Assert.assertNotNull(page.getRecords().get(0));
-        Assert.assertNotNull(page.getRecords().get(1));
+        Assertions.assertEquals(2, page.getTotal());
+        Assertions.assertNotNull(page.getRecords().get(0));
+        Assertions.assertNotNull(page.getRecords().get(1));
     }
 
     @Test
@@ -134,8 +133,8 @@ public class SelectCountDistinctTest {
         queryWrapper.select("distinct test_int, test_str");
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
         IPage<CommonData> page = commonDataMapper.selectPage(new Page<CommonData>(1, 10), queryWrapper);
-        Assert.assertEquals(1, page.getTotal());
-        Assert.assertNotNull(page.getRecords().get(0));
+        Assertions.assertEquals(1, page.getTotal());
+        Assertions.assertNotNull(page.getRecords().get(0));
     }
 
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresTestDataMapperTest.java

@@ -1,21 +1,5 @@
 package com.baomidou.mybatisplus.test.postgres;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -30,6 +14,18 @@ import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.pg.PgDataMapper;
 import com.baomidou.mybatisplus.test.postgres.config.PostgresDb;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Mybatis Plus mysql Junit Test
@@ -37,10 +33,11 @@ import com.baomidou.mybatisplus.test.postgres.config.PostgresDb;
  * @author hubin
  * @since 2018-06-05
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
+// @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:postgres/spring-test-postgres.xml"})
-public class PostgresTestDataMapperTest {
+class PostgresTestDataMapperTest {
 
     @Resource
     private CommonDataMapper commonMapper;
@@ -49,14 +46,14 @@ public class PostgresTestDataMapperTest {
     @Resource
     private PgDataMapper pgMapper;
 
-    @BeforeClass
-    public static void init() throws Exception {
+    @BeforeAll
+    static void init() throws Exception {
         PostgresDb.initPgData();
         System.out.println("init success");
     }
 
     @Test
-    public void a_insertForeach() {
+    void a_insertForeach() {
         for (int i = 1; i < 20; i++) {
             Long id = (long) i;
             commonMapper.insert(new CommonData().setTestInt(i).setTestStr(String.format("第%s条数据", i)).setId(id)
@@ -67,166 +64,166 @@ public class PostgresTestDataMapperTest {
     }
 
     @Test
-    public void b1_deleteById() {
-        Assert.assertEquals(1, commonMapper.deleteById(1L));
-        Assert.assertEquals(1, commonLogicMapper.deleteById(1L));
-        Assert.assertEquals(1, pgMapper.deleteById(1L));
+    void b1_deleteById() {
+        Assertions.assertEquals(1, commonMapper.deleteById(1L));
+        Assertions.assertEquals(1, commonLogicMapper.deleteById(1L));
+        Assertions.assertEquals(1, pgMapper.deleteById(1L));
     }
 
     @Test
-    public void b2_deleteByMap() {
+    void b2_deleteByMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("id", 2L);
         map.put("test_int", 5);
-        Assert.assertEquals(0, commonMapper.deleteByMap(map));
-        Assert.assertEquals(0, commonLogicMapper.deleteByMap(map));
+        Assertions.assertEquals(0, commonMapper.deleteByMap(map));
+        Assertions.assertEquals(0, commonLogicMapper.deleteByMap(map));
         Map<String, Object> map2 = new HashMap<>();
         map2.put("id", 2L);
         map2.put("\"group\"", 5);
         map2.put("\"pgInt\"", 5);
-        Assert.assertEquals(0, pgMapper.deleteByMap(map2));
+        Assertions.assertEquals(0, pgMapper.deleteByMap(map2));
     }
 
     @Test
-    public void b3_delete() {
-        Assert.assertEquals(1, commonMapper.delete(new QueryWrapper<CommonData>().lambda()
+    void b3_delete() {
+        Assertions.assertEquals(1, commonMapper.delete(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, 2L)
             .eq(CommonData::getTestInt, 2)));
-        Assert.assertEquals(1, commonLogicMapper.delete(new QueryWrapper<CommonLogicData>().lambda()
+        Assertions.assertEquals(1, commonLogicMapper.delete(new QueryWrapper<CommonLogicData>().lambda()
             .eq(CommonLogicData::getId, 2L)
             .eq(CommonLogicData::getTestInt, 2)));
-        Assert.assertEquals(1, pgMapper.delete(new QueryWrapper<PgData>().lambda()
+        Assertions.assertEquals(1, pgMapper.delete(new QueryWrapper<PgData>().lambda()
             .eq(PgData::getId, 2L)
             .eq(PgData::getGroup, 2).eq(PgData::getPgInt, 2)));
     }
 
     @Test
-    public void b4_deleteBatchIds() {
+    void b4_deleteBatchIds() {
         List<Long> ids = Arrays.asList(3L, 4L);
-        Assert.assertEquals(2, commonMapper.deleteBatchIds(ids));
-        Assert.assertEquals(2, commonLogicMapper.deleteBatchIds(ids));
-        Assert.assertEquals(2, pgMapper.deleteBatchIds(ids));
+        Assertions.assertEquals(2, commonMapper.deleteBatchIds(ids));
+        Assertions.assertEquals(2, commonLogicMapper.deleteBatchIds(ids));
+        Assertions.assertEquals(2, pgMapper.deleteBatchIds(ids));
     }
 
     @Test
-    public void c1_updateById() {
-        Assert.assertEquals(1, commonMapper.updateById(new CommonData().setId(5L).setTestInt(555)));
-        Assert.assertEquals(1, commonLogicMapper.updateById(new CommonLogicData().setId(5L).setTestInt(555)));
-        Assert.assertEquals(1, pgMapper.updateById(new PgData().setId(5L).setGroup(555).setPgInt(555)));
+    void c1_updateById() {
+        Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(5L).setTestInt(555)));
+        Assertions.assertEquals(1, commonLogicMapper.updateById(new CommonLogicData().setId(5L).setTestInt(555)));
+        Assertions.assertEquals(1, pgMapper.updateById(new PgData().setId(5L).setGroup(555).setPgInt(555)));
     }
 
     @Test
-    public void c2_optimisticUpdateById() {
-        Assert.assertEquals(1, commonMapper.updateById(new CommonData().setId(5L).setTestInt(556)
+    void c2_optimisticUpdateById() {
+        Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(5L).setTestInt(556)
             .setVersion(0)));
     }
 
     @Test
-    public void c3_update() {
-        Assert.assertEquals(1, commonMapper.update(
+    void c3_update() {
+        Assertions.assertEquals(1, commonMapper.update(
             new CommonData().setTestInt(666),
             new UpdateWrapper<CommonData>().lambda().eq(CommonData::getId, 6L)
                 .eq(CommonData::getTestInt, 6)));
-        Assert.assertEquals(1, commonLogicMapper.update(
+        Assertions.assertEquals(1, commonLogicMapper.update(
             new CommonLogicData().setTestInt(666),
             new UpdateWrapper<CommonLogicData>().lambda().eq(CommonLogicData::getId, 6L)
                 .eq(CommonLogicData::getTestInt, 6)));
-        Assert.assertEquals(1, pgMapper.update(
+        Assertions.assertEquals(1, pgMapper.update(
             new PgData().setGroup(666).setPgInt(555),
             new UpdateWrapper<PgData>().lambda().eq(PgData::getId, 6L)
                 .eq(PgData::getGroup, 6).eq(PgData::getPgInt, 6)));
     }
 
     @Test
-    public void d1_getAllNoTenant() {
+    void d1_getAllNoTenant() {
         commonMapper.getAllNoTenant();
     }
 
     @Test
-    public void d2_selectById() {
+    void d2_selectById() {
         long id = 6L;
-        Assert.assertNotNull(commonMapper.selectById(id).getTestEnum());
-        Assert.assertNotNull(commonLogicMapper.selectById(id));
-        Assert.assertNotNull(pgMapper.selectById(id));
+        Assertions.assertNotNull(commonMapper.selectById(id).getTestEnum());
+        Assertions.assertNotNull(commonLogicMapper.selectById(id));
+        Assertions.assertNotNull(pgMapper.selectById(id));
     }
 
     @Test
-    public void d3_selectBatchIds() {
+    void d3_selectBatchIds() {
         List<Long> ids = Arrays.asList(7L, 8L);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectBatchIds(ids)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectBatchIds(ids)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectBatchIds(ids)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectBatchIds(ids)));
     }
 
     @Test
-    public void d4_selectByMap() {
+    void d4_selectByMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("id", 9L);
         map.put("test_int", 9);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectByMap(map)));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectByMap(map)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectByMap(map)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectByMap(map)));
         Map<String, Object> map2 = new HashMap<>();
         map2.put("id", 9L);
         map2.put("\"group\"", 9);
         map2.put("\"pgInt\"", 9);
-        Assert.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectByMap(map2)));
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectByMap(map2)));
     }
 
     @Test
-    public void d5_selectOne() {
-        Assert.assertNotNull(commonMapper.selectOne(new QueryWrapper<CommonData>().lambda()
+    void d5_selectOne() {
+        Assertions.assertNotNull(commonMapper.selectOne(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, 10L).eq(CommonData::getTestInt, 10)));
-        Assert.assertNotNull(commonLogicMapper.selectOne(new QueryWrapper<CommonLogicData>().lambda()
+        Assertions.assertNotNull(commonLogicMapper.selectOne(new QueryWrapper<CommonLogicData>().lambda()
             .eq(CommonLogicData::getId, 10L).eq(CommonLogicData::getTestInt, 10)));
-        Assert.assertNotNull(pgMapper.selectOne(new QueryWrapper<PgData>().lambda()
+        Assertions.assertNotNull(pgMapper.selectOne(new QueryWrapper<PgData>().lambda()
             .eq(PgData::getId, 10L).eq(PgData::getGroup, 10).eq(PgData::getPgInt, 10)));
     }
 
     @Test
-    public void d6_selectList() {
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
+    void d6_selectList() {
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .lambda().eq(CommonData::getTestInt, 10))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
             .lambda().eq(CommonLogicData::getId, 10L).eq(CommonLogicData::getTestInt, 10))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectList(new QueryWrapper<PgData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectList(new QueryWrapper<PgData>()
             .lambda().eq(PgData::getId, 10L).eq(PgData::getGroup, 10).eq(PgData::getPgInt, 10))));
     }
 
     @Test
-    public void d7_selectPage() {
+    void d7_selectPage() {
         IPage<CommonData> page = new Page<>(1, 5);
         IPage<CommonData> dataPage = commonMapper.selectPage(page, null);
-        Assert.assertSame(dataPage, page);
-        Assert.assertNotEquals(null, dataPage.getTotal());
-        Assert.assertNotEquals(0, dataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
+        Assertions.assertSame(dataPage, page);
+        Assertions.assertNotEquals(null, dataPage.getTotal());
+        Assertions.assertNotEquals(0, dataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
         System.out.println(JSON.toJSONString(dataPage));
 
         IPage<CommonLogicData> logicPage = new Page<>(1, 5);
         IPage<CommonLogicData> logicDataPage = commonLogicMapper.selectPage(logicPage, null);
-        Assert.assertSame(logicDataPage, logicPage);
-        Assert.assertNotEquals(null, logicDataPage.getTotal());
-        Assert.assertNotEquals(0, logicDataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(logicDataPage.getRecords()));
+        Assertions.assertSame(logicDataPage, logicPage);
+        Assertions.assertNotEquals(null, logicDataPage.getTotal());
+        Assertions.assertNotEquals(0, logicDataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(logicDataPage.getRecords()));
         System.out.println(JSON.toJSONString(logicDataPage));
 
         IPage<PgData> pgPage = new Page<>(1, 5);
         page.setSize(5).setCurrent(1);
         IPage<PgData> pgDataPage = pgMapper.selectPage(pgPage, null);
-        Assert.assertSame(pgDataPage, pgPage);
-        Assert.assertNotEquals(null, pgDataPage.getTotal());
-        Assert.assertNotEquals(0, pgDataPage.getRecords().size());
-        Assert.assertTrue(CollectionUtils.isNotEmpty(pgDataPage.getRecords()));
+        Assertions.assertSame(pgDataPage, pgPage);
+        Assertions.assertNotEquals(null, pgDataPage.getTotal());
+        Assertions.assertNotEquals(0, pgDataPage.getRecords().size());
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(pgDataPage.getRecords()));
         System.out.println(JSON.toJSONString(pgDataPage));
     }
 
     @Test
-    public void d8_testApply() {
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
+    void d8_testApply() {
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .apply("test_int = 12"))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
             .apply("test_int = 12"))));
-        Assert.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectList(new QueryWrapper<PgData>()
+        Assertions.assertTrue(CollectionUtils.isNotEmpty(pgMapper.selectList(new QueryWrapper<PgData>()
             .apply("\"group\" = 12").apply("\"pgInt\" = 12"))));
     }
 }