:arrow_up: 预先使用 Junit5 的 RC 版本完成 JUnit 5 的升级

build.gradle

@@ -19,7 +19,7 @@ ext {
         mybatisVersion = '3.5.0',
         springVersion = '5.1.4.RELEASE',
         jsqlparserVersion = '1.3',
-        junitVersion = '5.3.2',
+        junitVersion = '5.4.0-RC1', // TODO 5.4.0 预计将与 2019-02-06 发布，届时应替换成正式版本
     ]
 
     lib = [

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

@@ -7,8 +7,7 @@ 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.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,11 +24,10 @@ import java.util.List;
  *
  * @author nieqiurong 2018/7/27.
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class ActiveRecordTest {
+class ActiveRecordTest {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ActiveRecordTest.class);
 
@@ -38,14 +36,16 @@ public class ActiveRecordTest {
 
     @Test
     @Transactional
-    public void testInsert() {
+    @Order(1)
+    void testInsert() {
         H2Student student = new H2Student(null, "测试学生", 2);
         Assertions.assertTrue(student.insert());
         Assertions.assertTrue(student.insert());
     }
 
     @Test
-    public void testUpdate() {
+    @Order(2)
+    void testUpdate() {
         H2Student student = new H2Student(1L, "Tom长大了", 2);
         Assertions.assertTrue(student.updateById());
         student.setName("不听话的学生");
@@ -53,7 +53,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testSelect() {
+    @Order(10)
+    void testSelect() {
         H2Student student = new H2Student();
         student.setId(1L);
         Assertions.assertNotNull(student.selectById());
@@ -61,7 +62,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testSelectList() {
+    @Order(10)
+    void testSelectList() {
         H2Student student = new H2Student();
         List<H2Student> students = student.selectList(new QueryWrapper<>(student));
         students.forEach($this -> LOGGER.info("用户信息:{}", $this));
@@ -69,7 +71,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testSelectPage() {
+    @Order(10)
+    void testSelectPage() {
         IPage<H2Student> page = new Page<>(1, 10);
         H2Student student = new H2Student();
         page = student.selectPage(page, new QueryWrapper<>(student));
@@ -80,7 +83,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testSelectCount() {
+    @Order(10)
+    void testSelectCount() {
         H2Student student = new H2Student();
         int count = new H2Student().selectCount(new QueryWrapper<>(student));
         LOGGER.info("count:{}", count);
@@ -88,7 +92,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testInsertOrUpdate() {
+    @Order(20)
+    void testInsertOrUpdate() {
         H2Student student = new H2Student(2L, "Jerry也长大了", 2);
         Assertions.assertTrue(student.insertOrUpdate());
         student.setId(null);
@@ -96,7 +101,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testSelectAll() {
+    @Order(21)
+    void testSelectAll() {
         H2Student student = new H2Student();
         List<H2Student> students = student.selectAll();
         Assertions.assertNotNull(students);
@@ -104,13 +110,15 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testSelectOne() {
+    @Order(21)
+    void testSelectOne() {
         H2Student student = new H2Student();
         Assertions.assertNotNull(student.selectOne(new QueryWrapper<>()));
     }
 
     @Test
-    public void testTransactional() {
+    @Order(21)
+    void testTransactional() {
         try {
             h2StudentService.testTransactional();
         } catch (MybatisPlusException e) {
@@ -120,7 +128,8 @@ public class ActiveRecordTest {
     }
 
     @Test
-    public void testDelete() {
+    @Order(Integer.MAX_VALUE)
+    void testDelete() {
         H2Student student = new H2Student();
         student.setId(2L);
         Assertions.assertTrue(student.deleteById());

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

@@ -1,18 +1,20 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import javax.annotation.Resource;
-
-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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.test.h2.entity.enums.AgeEnum;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2StudentMapper;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+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;
 
 /**
  * Mybatis Plus H2 Junit Test
@@ -20,8 +22,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
  * @author hubin
  * @since 2018-06-05
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 class H2Delete1Eq1Test extends BaseTest {
@@ -32,6 +33,7 @@ class H2Delete1Eq1Test extends BaseTest {
     protected H2StudentMapper defaultMapper;
 
     @Test
+    @Order(1)
     void crudTest() {
         for (int i = 0; i < 10; i++) {
             logicDeleteMapper.insert(new H2User("mp" + i, AgeEnum.ONE));
@@ -58,6 +60,7 @@ class H2Delete1Eq1Test extends BaseTest {
     }
 
     @Test
+    @Order(Integer.MAX_VALUE)
     void delete() {
         logicDeleteMapper.delete(new QueryWrapper<>());
         defaultMapper.delete(new QueryWrapper<>());

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

@@ -9,7 +9,10 @@ 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.MethodOrderer;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -24,8 +27,7 @@ import java.util.Objects;
  * @author hubin
  * @since 2018-06-05
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 class H2StudentMapperTest extends BaseTest {
@@ -34,6 +36,7 @@ class H2StudentMapperTest extends BaseTest {
     protected H2StudentMapper studentMapper;
 
     @Test
+    @Order(1)
     void crudTest() {
 //        H2Student stu = new H2Student();
 //        stu.setGrade(GradeEnum.HIGH);
@@ -66,6 +69,7 @@ class H2StudentMapperTest extends BaseTest {
     }
 
     @Test
+    @Order(Integer.MAX_VALUE)
     void pageCountZeroTest() {
         IPage page = studentMapper.selectPage(new Page<>(), Wrappers.<H2Student>query().eq("name", "无"));
         if (null != page) {

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

@@ -10,8 +10,7 @@ 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.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -29,8 +28,7 @@ import static java.util.stream.Collectors.toList;
  * @author hubin
  * @since 2018-06-05
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
 class H2UserMapperTest extends BaseTest {
@@ -39,6 +37,7 @@ class H2UserMapperTest extends BaseTest {
     protected H2UserMapper userMapper;
 
     @Test
+    @Order(1)
     void crudTest() {
         H2User h2User = new H2User();
         h2User.setName(NQQ);
@@ -132,6 +131,7 @@ class H2UserMapperTest extends BaseTest {
     }
 
     @Test
+    @Order(Integer.MAX_VALUE)
     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

@@ -6,8 +6,7 @@ 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.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -26,17 +25,17 @@ import java.util.Map;
  * @author Caratacus
  * @since 2017/4/1
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserTest extends BaseTest {
+class H2UserTest extends BaseTest {
 
     @Autowired
     protected IH2UserService userService;
 
 
     @Test
+    @Order(1)
     void testInsertMy() {
         String name = "自定义insert";
         int version = 1;
@@ -45,6 +44,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(2)
     void testInsertObjectWithParam() {
         String name = "自定义insert带Param注解";
         int version = 1;
@@ -53,6 +53,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(3)
     void testInsertObjectWithoutParam() {
         String name = "自定义insert带Param注解";
         int version = 1;
@@ -61,6 +62,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(10)
     void testEntityWrapperSelectSql() {
         QueryWrapper<H2User> ew = new QueryWrapper<>();
         ew.select("test_id as testId, name, age");
@@ -73,6 +75,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(10)
     void testQueryWithParamInSelectStatement() {
         Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
@@ -104,6 +107,7 @@ public class H2UserTest extends BaseTest {
 //    }
 
     @Test
+    @Order(10)
     void testSelectCountWithParamInSelectItems() {
         Map<String, Object> param = new HashMap<>();
         String nameParam = "selectStmtParam";
@@ -115,6 +119,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(15)
     void testUpdateByIdWithOptLock() {
         Long id = 991L;
         H2User user = new H2User();
@@ -140,6 +145,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(16)
     void testUpdateByEwWithOptLock() {
         H2User userInsert = new H2User();
         userInsert.setName("optLockerTest");
@@ -172,6 +178,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(17)
     void testOptLocker4WrapperIsNull() {
         H2User userInsert = new H2User();
         userInsert.setName("optLockerTest");
@@ -214,6 +221,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(18)
     void testBatchTransactional() {
         try {
             userService.testBatchTransactional();
@@ -224,6 +232,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(19)
     void testSimpleTransactional() {
         try {
             userService.testSimpleTransactional();
@@ -234,6 +243,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(20)
     void testSaveOrUpdateBatchTransactional() {
         try {
             userService.testSaveOrUpdateBatchTransactional();
@@ -244,30 +254,35 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(21)
     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
+    @Order(22)
     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
+    @Order(23)
     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
+    @Order(24)
     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
+    @Order(25)
     void testSimpleAndBatchTransactional() {
         try {
             userService.testSimpleAndBatchTransactional();
@@ -278,6 +293,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(26)
     void testServiceImplInnerLambdaQuery() {
         H2User tomcat = userService.lambdaQuery().eq(H2User::getName, "Tomcat").one();
         Assertions.assertNotNull(tomcat);
@@ -290,6 +306,7 @@ public class H2UserTest extends BaseTest {
     }
 
     @Test
+    @Order(27)
     void testServiceChainQuery() {
         H2User tomcat = userService.query().eq("name", "Tomcat").one();
         Assertions.assertNotNull(tomcat, "tomcat should not be null");

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

@@ -5,8 +5,7 @@ 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.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -19,16 +18,16 @@ import java.util.List;
  * SqlRunner测试
  * @author nieqiurong 2018/8/25 11:05.
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class SqlRunnerTest {
+class SqlRunnerTest {
 
     @Autowired
     private IH2StudentService studentService;
 
     @Test
+    @Order(1)
     void testSelectCount(){
         int count = SqlRunner.db().selectCount("select count(1) from h2student");
         Assertions.assertTrue(count > 0);
@@ -42,12 +41,14 @@ public class SqlRunnerTest {
 
     @Test
     @Transactional
+    @Order(2)
     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
+    @Order(3)
     void testTransactional(){
         try {
             studentService.testSqlRunnerTransactional();

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

@@ -21,9 +21,7 @@ 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.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -41,8 +39,7 @@ import static java.util.stream.Collectors.toMap;
  * @author hubin
  * @since 2018-06-05
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
 class MysqlTestDataMapperTest {
@@ -65,6 +62,7 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
+    @Order(1)
     void a1_insertForeach() {
         for (int i = 1; i < 20; i++) {
             Long id = (long) i;
@@ -78,6 +76,7 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
+    @Order(2)
     void a2_insertBatch() {
         List<MysqlData> mysqlDataList = new ArrayList<>();
         List<CommonData> commonDataList = new ArrayList<>();
@@ -94,6 +93,7 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
+    @Order(3)
     void b1_deleteById() {
         long id = 1L;
         Assertions.assertEquals(1, commonMapper.deleteById(id));
@@ -102,6 +102,7 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
+    @Order(4)
     void b2_deleteByMap() {
         long id = 2L;
         Map<String, Object> map = new HashMap<>();
@@ -116,7 +117,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void b3_delete() {
+    @Order(5)
+    void b3_delete() {
         long id = 2L;
         Assertions.assertEquals(1, commonMapper.delete(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, id)
@@ -130,7 +132,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void b4_deleteBatchIds() {
+    @Order(6)
+    void b4_deleteBatchIds() {
         List<Long> ids = Arrays.asList(3L, 4L);
         Assertions.assertEquals(2, commonMapper.deleteBatchIds(ids));
         Assertions.assertEquals(2, commonLogicMapper.deleteBatchIds(ids));
@@ -138,7 +141,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void b5_deleteByIdWithFill() {
+    @Order(7)
+    void b5_deleteByIdWithFill() {
         long id = 5L;
         // 真删
         Assertions.assertEquals(1, commonMapper.deleteByIdWithFill(new CommonData().setId(id)));
@@ -149,7 +153,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void c1_updateById() {
+    @Order(8)
+    void c1_updateById() {
         long id = 6L;
         Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(555).setVersion(0)
             .setTestEnum(TestEnum.TWO)));
@@ -159,14 +164,16 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void c2_optimisticUpdateById() {
+    @Order(9)
+    void c2_optimisticUpdateById() {
         long id = 7L;
         Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(778)
             .setVersion(0)));
     }
 
     @Test
-    public void c3_update() {
+    @Order(10)
+    void c3_update() {
         long id = 8L;
         Assertions.assertEquals(1, commonMapper.update(
             new CommonData().setTestInt(888).setVersion(0),
@@ -183,12 +190,14 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d1_getAllNoTenant() {
+    @Order(11)
+    void d1_getAllNoTenant() {
         commonMapper.getAllNoTenant();
     }
 
     @Test
-    public void d2_selectById() {
+    @Order(12)
+    void d2_selectById() {
         long id = 6L;
         Assertions.assertNotNull(commonMapper.selectById(id).getTestEnum());
         Assertions.assertTrue(commonMapper.getById(id).isPresent());
@@ -201,7 +210,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d3_selectBatchIds() {
+    @Order(13)
+    void d3_selectBatchIds() {
         List<Long> ids = Arrays.asList(7L, 8L);
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectBatchIds(ids)));
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectBatchIds(ids)));
@@ -210,7 +220,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d4_selectByMap() {
+    @Order(14)
+    void d4_selectByMap() {
         long id = 9L;
         Map<String, Object> map = new HashMap<>();
         map.put("id", id);
@@ -224,7 +235,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d5_selectOne() {
+    @Order(15)
+    void d5_selectOne() {
         long id = 10L;
         Assertions.assertNotNull(commonMapper.selectOne(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, id).eq(CommonData::getTestInt, 10)));
@@ -235,7 +247,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d6_selectList() {
+    @Order(16)
+    void d6_selectList() {
         long id = 10L;
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .lambda().eq(CommonData::getTestInt, 10))));
@@ -246,7 +259,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d7_1_selectListForNoLogic() {
+    @Order(17)
+    void d7_1_selectListForNoLogic() {
         MysqlData data = new MysqlData().setOrder(1);
         // 1. 只有 entity
         Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data))));
@@ -269,7 +283,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d7_2_selectListForLogic() {
+    @Order(18)
+    void d7_2_selectListForLogic() {
         // 1. 只有 entity
         CommonLogicData data = new CommonLogicData().setTestInt(11);
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(Wrappers.query(data))));
@@ -292,12 +307,12 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d7_selectPage() {
+    @Order(19)
+    void d7_selectPage() {
         Page<CommonData> page = new Page<>(1, 5);
         page.setDesc("c_time", "u_time");
         IPage<CommonData> dataPage = commonMapper.selectPage(page, null);
         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));
@@ -307,7 +322,6 @@ class MysqlTestDataMapperTest {
         commonDataPage.setDesc("c_time", "u_time");
         IPage<CommonData> commonDataDataPage = commonMapper.myPage(commonDataPage);
         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));
@@ -316,7 +330,6 @@ class MysqlTestDataMapperTest {
         Page<CommonLogicData> logicPage = new Page<>(1, 5);
         IPage<CommonLogicData> logicDataPage = commonLogicMapper.selectPage(logicPage, null);
         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));
@@ -324,7 +337,6 @@ class MysqlTestDataMapperTest {
         Page<MysqlData> mysqlPage = new Page<>(1, 5);
         IPage<MysqlData> mysqlDataPage = mysqlMapper.selectPage(mysqlPage, null);
         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));
@@ -332,26 +344,26 @@ class MysqlTestDataMapperTest {
         Page<ResultMapEntity> resultMapEntityPage = new Page<>(1, 5);
         IPage<ResultMapEntity> resultMapEntityDataPage = resultMapEntityMapper.selectPage(resultMapEntityPage, null);
         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));
     }
 
     @Test
-    public void d7_arLambdaSelectPage() {
+    @Order(20)
+    void d7_arLambdaSelectPage() {
         Page<CommonData> page = new Page<>(1, 5);
         page.setDesc("c_time", "u_time");
         IPage<CommonData> dataPage = new CommonData().selectPage(page, new QueryWrapper<CommonData>().lambda());
         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() {
+    @Order(21)
+    void d8_testApply() {
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .apply("test_int = 12"))));
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicMapper.selectList(new QueryWrapper<CommonLogicData>()
@@ -361,7 +373,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d9_testSetSelect() {
+    @Order(22)
+    void d9_testSetSelect() {
         commonMapper.selectList(new QueryWrapper<>(new CommonData()).select(TableFieldInfo::isCharSequence));
         commonMapper.selectList(new QueryWrapper<>(new CommonData().setTestStr("")));
         commonMapper.selectList(new QueryWrapper<>(new CommonData().setTestStr("")).orderByAsc("test_int"));
@@ -374,7 +387,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d10_testDel1eq1Then() {
+    @Order(23)
+    void d10_testDel1eq1Then() {
         // 有空对象,有 order by
         mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).select(i -> true).orderByAsc(MysqlData::getId));
         commonMapper.selectList(Wrappers.lambdaQuery(new CommonData()).orderByAsc(CommonData::getCreateDatetime));
@@ -386,7 +400,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void d11_testWrapperCustomSql() {
+    @Order(24)
+    void d11_testWrapperCustomSql() {
         // 1. 只有 order by 或者 last
         mysqlMapper.getAll(Wrappers.<MysqlData>lambdaQuery().orderByDesc(MysqlData::getOrder).last("limit 1"));
         // 2. 什么都没有情况
@@ -398,7 +413,8 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void e_1testNestPage() {
+    @Order(25)
+    void e_1testNestPage() {
         ArrayList<Object> list = new ArrayList<>();
         LambdaQueryWrapper<CommonData> wrapper = Wrappers.<CommonData>lambdaQuery()
             .isNotNull(CommonData::getId).and(i -> i.eq(CommonData::getId, 1)
@@ -413,19 +429,22 @@ class MysqlTestDataMapperTest {
     }
 
     @Test
-    public void e_2testLambdaColumnCache() {
+    @Order(26)
+    void e_2testLambdaColumnCache() {
         mysqlMapper.selectList(Wrappers.<MysqlData>lambdaQuery().select(MysqlData::getId, MysqlData::getYaHoStr))
             .forEach(System.out::println);
     }
 
     @Test
-    public void e_3testUpdateNotEntity() {
+    @Order(27)
+    void e_3testUpdateNotEntity() {
         mysqlMapper.update(null, Wrappers.<MysqlData>lambdaUpdate().set(MysqlData::getOrder, 1));
         commonLogicMapper.update(null, Wrappers.<CommonLogicData>lambdaUpdate().set(CommonLogicData::getTestInt, 1));
     }
 
     @Test
-    public void e_4testChain() {
+    @Order(28)
+    void e_4testChain() {
         new LambdaQueryChainWrapper<>(mysqlMapper).select(MysqlData::getId, MysqlData::getYaHoStr)
             .list().forEach(System.out::println);
 

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

@@ -9,9 +9,7 @@ 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.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -20,8 +18,7 @@ import javax.annotation.Resource;
 import java.sql.SQLException;
 import java.util.List;
 
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
 class SelectCountDistinctTest {
@@ -38,6 +35,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(1)
     void testCountDistinct() {
         QueryWrapper<CommonData> distinct = new QueryWrapper<>();
         distinct.select("distinct test_int");
@@ -47,6 +45,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(2)
     void testCountDistinctTwoColumn() {
         QueryWrapper<CommonData> distinct = new QueryWrapper<>();
         distinct.select("distinct test_int, test_str");
@@ -56,6 +55,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(3)
     void testLogicCountDistinct() {
         QueryWrapper<CommonLogicData> distinct = new QueryWrapper<>();
         distinct.select("distinct test_int");
@@ -65,6 +65,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(4)
     void testLogicSelectList() {
         QueryWrapper<CommonLogicData> commonQuery = new QueryWrapper<>();
         List<CommonLogicData> commonLogicDataList = commonLogicMapper.selectList(commonQuery);
@@ -74,6 +75,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(5)
     void testLogicCountDistinctUseLambda() {
         LambdaQueryWrapper<CommonLogicData> lambdaQueryWrapper =
             new QueryWrapper<CommonLogicData>().select("distinct test_int").lambda();
@@ -82,6 +84,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(6)
     void testCountDistinctUseLambda() {
         LambdaQueryWrapper<CommonData> lambdaQueryWrapper =
             new QueryWrapper<CommonData>().select("distinct test_int, test_str").lambda();
@@ -90,6 +93,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(7)
     void testLogicSelectCountWithoutDistinct() {
         QueryWrapper<CommonLogicData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
@@ -98,6 +102,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(8)
     void testCountDistinctWithoutDistinct() {
         QueryWrapper<CommonData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
@@ -106,6 +111,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(9)
     void testSelectPageWithoutDistinct() {
         QueryWrapper<CommonData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("test_int", 25).or().eq("test_str", "test");
@@ -116,6 +122,7 @@ class SelectCountDistinctTest {
     }
 
     @Test
+    @Order(10)
     void testSelectPageWithDistinct() {
         QueryWrapper<CommonData> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("distinct test_int, test_str");

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

@@ -14,9 +14,7 @@ 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.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -33,8 +31,7 @@ import java.util.Map;
  * @author hubin
  * @since 2018-06-05
  */
-// TODO junit 5.4 开始提供支持，预计 2019-02-06 发布，等这之后升级版本并使用 @TestMethodOrder 代替 @FixMethodOrder
-// @FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:postgres/spring-test-postgres.xml"})
 class PostgresTestDataMapperTest {
@@ -53,6 +50,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(1)
     void a_insertForeach() {
         for (int i = 1; i < 20; i++) {
             Long id = (long) i;
@@ -64,6 +62,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(2)
     void b1_deleteById() {
         Assertions.assertEquals(1, commonMapper.deleteById(1L));
         Assertions.assertEquals(1, commonLogicMapper.deleteById(1L));
@@ -71,6 +70,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(3)
     void b2_deleteByMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("id", 2L);
@@ -85,6 +85,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(4)
     void b3_delete() {
         Assertions.assertEquals(1, commonMapper.delete(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, 2L)
@@ -98,6 +99,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(5)
     void b4_deleteBatchIds() {
         List<Long> ids = Arrays.asList(3L, 4L);
         Assertions.assertEquals(2, commonMapper.deleteBatchIds(ids));
@@ -106,6 +108,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(6)
     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)));
@@ -113,12 +116,14 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(7)
     void c2_optimisticUpdateById() {
         Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(5L).setTestInt(556)
             .setVersion(0)));
     }
 
     @Test
+    @Order(8)
     void c3_update() {
         Assertions.assertEquals(1, commonMapper.update(
             new CommonData().setTestInt(666),
@@ -135,11 +140,13 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(9)
     void d1_getAllNoTenant() {
         commonMapper.getAllNoTenant();
     }
 
     @Test
+    @Order(10)
     void d2_selectById() {
         long id = 6L;
         Assertions.assertNotNull(commonMapper.selectById(id).getTestEnum());
@@ -148,6 +155,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(11)
     void d3_selectBatchIds() {
         List<Long> ids = Arrays.asList(7L, 8L);
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectBatchIds(ids)));
@@ -156,6 +164,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(12)
     void d4_selectByMap() {
         Map<String, Object> map = new HashMap<>();
         map.put("id", 9L);
@@ -170,6 +179,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(13)
     void d5_selectOne() {
         Assertions.assertNotNull(commonMapper.selectOne(new QueryWrapper<CommonData>().lambda()
             .eq(CommonData::getId, 10L).eq(CommonData::getTestInt, 10)));
@@ -180,6 +190,7 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(14)
     void d6_selectList() {
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .lambda().eq(CommonData::getTestInt, 10))));
@@ -190,11 +201,11 @@ class PostgresTestDataMapperTest {
     }
 
     @Test
+    @Order(15)
     void d7_selectPage() {
         IPage<CommonData> page = new Page<>(1, 5);
         IPage<CommonData> dataPage = commonMapper.selectPage(page, null);
         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));
@@ -202,7 +213,6 @@ class PostgresTestDataMapperTest {
         IPage<CommonLogicData> logicPage = new Page<>(1, 5);
         IPage<CommonLogicData> logicDataPage = commonLogicMapper.selectPage(logicPage, null);
         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));
@@ -211,13 +221,13 @@ class PostgresTestDataMapperTest {
         page.setSize(5).setCurrent(1);
         IPage<PgData> pgDataPage = pgMapper.selectPage(pgPage, null);
         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
+    @Order(16)
     void d8_testApply() {
         Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
             .apply("test_int = 12"))));