Forráskód Böngészése

mysql 测试重构

miemie 5 éve
szülő
commit
abb48034cc
23 módosított fájl, 144 hozzáadás és 720 törlés
  1. 2 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/SampleTest.java
  2. 0 386
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/BaseDbTest.java
  3. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MyBaseMapper.java
  4. 90 283
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlTestDataMapperTest.java
  5. 4 4
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/SelectCountDistinctTest.java
  6. 2 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/config/MybatisPlusConfig.java
  7. 2 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/CommonData.java
  8. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/CommonLogicData.java
  9. 4 4
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/ResultMapEntity.java
  10. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/enums/TestEnum.java
  11. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/MysqlDataMapper.java
  12. 3 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/children/CommonDataChildrenMapper.java
  13. 3 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/children/CommonLogicDataChildrenMapper.java
  14. 2 2
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/CommonDataCopyMapper.java
  15. 3 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/CommonDataMapper.java
  16. 3 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/CommonLogicDataMapper.java
  17. 3 3
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/ResultMapEntityMapper.java
  18. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/type/JsonTypeHandler.java
  19. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/type/ListTypeHandler.java
  20. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/type/MapTypeHandler.java
  21. 9 6
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresTestDataMapperTest.java
  22. 1 1
      mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/mapper/PgDataMapper.java
  23. 6 6
      mybatis-plus/src/test/resources/mapper/ResultMapEntityMapper.xml

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

@@ -19,8 +19,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.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.baomidou.mybatisplus.test.mysql.entity.CommonData;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonLogicData;
 import org.apache.ibatis.reflection.DefaultReflectorFactory;
 import org.apache.ibatis.reflection.MetaClass;
 import org.junit.jupiter.api.Test;

+ 0 - 386
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/BaseDbTest.java

@@ -1,386 +0,0 @@
-/*
- * Copyright (c) 2011-2019, hubin (jobob@qq.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * https://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.baomidou.mybatisplus.test.base;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.test.base.entity.CommonData;
-import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
-import com.baomidou.mybatisplus.test.base.entity.ResultMapEntity;
-import com.baomidou.mybatisplus.test.base.enums.TestEnum;
-import com.baomidou.mybatisplus.test.base.mapper.children.CommonDataChildrenMapper;
-import com.baomidou.mybatisplus.test.base.mapper.children.CommonLogicDataChildrenMapper;
-import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataCopyMapper;
-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.commons.ResultMapEntityMapper;
-import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * @author miemie
- * @since 2019-03-06
- */
-@DirtiesContext
-@TestMethodOrder(MethodOrderer.Alphanumeric.class)
-@ExtendWith(SpringExtension.class)
-public abstract class BaseDbTest {
-    protected final int success = 1;
-    protected final int fail = 0;
-
-    protected final List<String> list = Arrays.asList("1", "2", "3");
-    protected final Map<String, Object> map = list.parallelStream().collect(toMap(identity(), identity()));
-    @Resource(name = "commonDataMapper")
-    protected CommonDataMapper commonDataMapper;
-    @Resource(name = "commonDataChildrenMapper")
-    protected CommonDataChildrenMapper commonDataChildrenMapper;
-    @Resource(name = "commonLogicDataMapper")
-    protected CommonLogicDataMapper commonLogicDataMapper;
-    @Resource(name = "commonLogicDataChildrenMapper")
-    protected CommonLogicDataChildrenMapper commonLogicDataChildrenMapper;
-    @Resource
-    protected CommonDataCopyMapper commonDataCopyMapper;
-    @Resource
-    protected ResultMapEntityMapper resultMapEntityMapper;
-    @Autowired
-    private SqlSessionFactory sqlSessionFactory;
-
-    @Test
-    void a00() {
-        Configuration configuration = sqlSessionFactory.getConfiguration();
-        assertThat(configuration).isInstanceOf(MybatisConfiguration.class);
-        MappedStatement mappedStatement = configuration.getMappedStatement("com.baomidou.mybatisplus.test.mysql.mapper.MysqlDataMapper.getRandomOne");
-        assertThat(mappedStatement).isNotNull();
-    }
-
-    @Test
-    void a01_insertForeach() {
-        for (int i = 1; i < 20; i++) {
-            Long id = (long) i;
-            String str = String.format("第%s条数据", i);
-            commonDataMapper.insert(new CommonData().setTestInt(i).setTestStr(str).setId(id)
-                .setTestEnum(TestEnum.ONE));
-            commonLogicDataMapper.insert(new CommonLogicData().setTestInt(i).setTestStr(str).setId(id));
-            resultMapEntityMapper.insert(new ResultMapEntity().setId(id).setList(list).setMap(map).setMapp(map));
-            this.insertForeach(id, i, str);
-        }
-    }
-
-    protected abstract void insertForeach(Long id, int index, String str);
-
-    @Test
-    void a02_insertBatch() {
-        int size = 9;
-        List<CommonData> commonDataList = new ArrayList<>();
-        List<CommonLogicData> commonLogicDataList = new ArrayList<>();
-        for (int i = 0; i < size; i++) {
-            String str = i + "条";
-            commonDataList.add(new CommonData().setTestInt(i).setTestEnum(TestEnum.TWO).setTestStr(str));
-            commonLogicDataList.add(new CommonLogicData().setTestInt(i).setTestStr(str));
-        }
-        assertEquals(size, commonDataMapper.insertBatchSomeColumn(commonDataList));
-        assertEquals(size, commonLogicDataMapper.insertBatchSomeColumn(commonLogicDataList));
-        this.insertBatch(size);
-    }
-
-    protected abstract void insertBatch(int size);
-
-    @Test
-    void a03_deleteById() {
-        long id = 1L;
-        assertEquals(success, commonDataMapper.deleteById(id));
-        assertEquals(success, commonLogicDataMapper.deleteById(id));
-        this.deleteById(id);
-    }
-
-    protected abstract void deleteById(long id);
-
-    @Test
-    void a04_deleteByMap() {
-        long id = 2L;
-        Map<String, Object> map = new HashMap<>();
-        map.put("id", id);
-        map.put("test_int", 5);
-        assertEquals(fail, commonDataMapper.deleteByMap(map));
-        assertEquals(fail, commonLogicDataMapper.deleteByMap(map));
-        this.deleteByMap_fail(id);
-    }
-
-    protected abstract void deleteByMap_fail(long id);
-
-    @Test
-    void a05_delete() {
-        long id = 2L;
-        assertEquals(success, commonDataMapper.delete(Wrappers.<CommonData>lambdaQuery()
-            .eq(CommonData::getId, id)
-            .eq(CommonData::getTestInt, 2)));
-        assertEquals(success, commonLogicDataMapper.delete(Wrappers.<CommonLogicData>lambdaQuery()
-            .eq(CommonLogicData::getId, id)
-            .eq(CommonLogicData::getTestInt, 2)));
-        this.delete(id);
-    }
-
-    protected abstract void delete(long id);
-
-    @Test
-    void a06_deleteBatchIds() {
-        List<Long> ids = Arrays.asList(3L, 4L);
-        assertEquals(ids.size(), commonDataMapper.deleteBatchIds(ids));
-        assertEquals(ids.size(), commonLogicDataMapper.deleteBatchIds(ids));
-        this.deleteBatchIds(ids);
-    }
-
-    protected abstract void deleteBatchIds(List<Long> ids);
-
-    //    @Test
-//    void b5_deleteByIdWithFill() {
-//        long id = 5L;
-//        // 真删
-//        Assertions.assertEquals(1, commonDataMapper.deleteByIdWithFill(new CommonData().setId(id)));
-//        // 逻辑删除带填充
-//        Assertions.assertEquals(1, commonLogicDataMapper.deleteByIdWithFill(new CommonLogicData().setId(id)));
-//        // 真删
-//        Assertions.assertEquals(1, mysqlMapper.deleteByIdWithFill(new MysqlData().setId(id)));
-//    }
-
-    @Test
-    void a07_updateById() {
-        long id = 6L;
-        assertEquals(success, commonDataMapper.updateById(new CommonData().setId(id).setTestInt(555).setVersion(0)
-            .setTestEnum(TestEnum.TWO)));
-        assertEquals(success, commonLogicDataMapper.updateById(new CommonLogicData().setId(id).setTestInt(555)));
-        assertEquals(success, resultMapEntityMapper.updateById(new ResultMapEntity().setId(id).setList(list).setMap(map)));
-        this.updateById(id);
-    }
-
-    protected abstract void updateById(long id);
-
-    @Test
-    void a08_updateWithEntity() {
-        long id = 8L;
-        assertEquals(success, commonDataMapper.update(new CommonData().setTestInt(888).setVersion(0),
-            Wrappers.<CommonData>lambdaUpdate().eq(CommonData::getId, id).eq(CommonData::getTestInt, 8)));
-        assertEquals(success, commonLogicDataMapper.update(new CommonLogicData().setTestInt(888),
-            Wrappers.<CommonLogicData>lambdaUpdate().eq(CommonLogicData::getId, id)
-                .eq(CommonLogicData::getTestInt, 8)));
-        this.updateWithEntity(id);
-    }
-
-    protected abstract void updateWithEntity(long id);
-
-    @Test
-    void a09_updateWithoutEntity() {
-        long id = 9L;
-        // todo
-        this.updateWithoutEntity(id);
-    }
-
-    protected abstract void updateWithoutEntity(long id);
-
-    @Test
-    void a10_selectById() {
-        long id = 6L;
-        assertNotNull(commonDataMapper.selectById(id).getTestEnum());
-        // todo
-        assertTrue(commonDataMapper.getById(id).isPresent());
-        assertThat(commonDataCopyMapper.selectById(id).isPresent()).isTrue();
-        assertNotNull(commonLogicDataMapper.selectById(id));
-        ResultMapEntity resultMapEntity = resultMapEntityMapper.selectById(id);
-        assertNotNull(resultMapEntity);
-        assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getMap()));
-        assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getMapp()));
-        assertTrue(CollectionUtils.isNotEmpty(resultMapEntity.getList()));
-        this.selectById(id);
-    }
-
-    protected abstract void selectById(long id);
-
-    @Test
-    void a11_selectBatchIds() {
-        List<Long> ids = Arrays.asList(7L, 8L);
-
-        List<CommonData> commonData = commonDataMapper.selectBatchIds(ids);
-        assertTrue(CollectionUtils.isNotEmpty(commonData));
-        assertEquals(ids.size(), commonData.size());
-
-        List<CommonLogicData> commonLogicData = commonLogicDataMapper.selectBatchIds(ids);
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicData));
-        assertEquals(ids.size(), commonLogicData.size());
-
-        List<ResultMapEntity> resultMapEntities = resultMapEntityMapper.selectBatchIds(ids);
-        assertTrue(CollectionUtils.isNotEmpty(resultMapEntities));
-        assertEquals(ids.size(), resultMapEntities.size());
-
-        this.selectBatchIds(ids);
-    }
-
-    protected abstract void selectBatchIds(List<Long> ids);
-
-    @Test
-    void a12_selectByMap() {
-        long id = 9L;
-        Map<String, Object> map = new HashMap<>();
-        map.put("id", id);
-        map.put("test_int", 9);
-        assertTrue(CollectionUtils.isNotEmpty(commonDataMapper.selectByMap(map)));
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectByMap(map)));
-        this.selectByMap(id);
-    }
-
-    protected abstract void selectByMap(long id);
-
-    @Test
-    void a13_selectOne() {
-        long id = 10L;
-        assertNotNull(commonDataMapper.selectOne(Wrappers.<CommonData>lambdaQuery()
-            .eq(CommonData::getId, id).eq(CommonData::getTestInt, 10)));
-        assertNotNull(commonLogicDataMapper.selectOne(Wrappers.<CommonLogicData>lambdaQuery()
-            .eq(CommonLogicData::getId, id).eq(CommonLogicData::getTestInt, 10)));
-        this.selectOne(id);
-    }
-
-    protected abstract void selectOne(long id);
-
-    @Test
-    void a14_selectList() {
-        long id = 10L;
-        List<CommonData> commonData = commonDataMapper.selectList(Wrappers.<CommonData>lambdaQuery()
-            .eq(CommonData::getTestInt, 10));
-        assertThat(commonData).isNotEmpty();
-        assertThat(commonData.get(0)).isNotNull();
-
-        List<CommonLogicData> commonLogicData = commonLogicDataMapper.selectList(Wrappers.<CommonLogicData>lambdaQuery()
-            .eq(CommonLogicData::getId, id).eq(CommonLogicData::getTestInt, 10));
-        assertThat(commonLogicData).isNotEmpty();
-        assertThat(commonLogicData.get(0)).isNotNull();
-
-        List<ResultMapEntity> resultMapEntities = resultMapEntityMapper.selectList(Wrappers.<ResultMapEntity>lambdaQuery()
-            .eq(ResultMapEntity::getId, id));
-        assertThat(resultMapEntities).isNotEmpty();
-        assertThat(resultMapEntities.get(0)).isNotNull();
-        assertThat(resultMapEntities.get(0).getList()).isNotEmpty();
-        assertThat(resultMapEntities.get(0).getMap()).isNotEmpty();
-        assertThat(resultMapEntities.get(0).getMapp()).isNotEmpty();
-
-        this.selectList(id);
-    }
-
-    protected abstract void selectList(long id);
-
-    @Test
-    void a15_selectMaps() {
-        List<Map<String, Object>> commonMaps = commonDataMapper.selectMaps(Wrappers.query());
-        assertThat(commonMaps).isNotEmpty();
-        assertThat(commonMaps.get(0)).isNotEmpty();
-
-        List<Map<String, Object>> commonLogicMaps = commonLogicDataMapper.selectMaps(Wrappers.query());
-        assertThat(commonLogicMaps).isNotEmpty();
-        assertThat(commonLogicMaps.get(0)).isNotEmpty();
-
-        List<Map<String, Object>> resultMapEntityMaps = resultMapEntityMapper.selectMaps(Wrappers.query());
-        assertThat(resultMapEntityMaps).isNotEmpty();
-        assertThat(resultMapEntityMaps.get(0)).isNotEmpty();
-
-        this.selectMaps();
-    }
-
-    protected abstract void selectMaps();
-
-    @Test
-    void a16_selectPage() {
-        Page<CommonData> page = new Page<>(1, 5);
-        page.addOrder(OrderItem.descs("c_time", "u_time"));
-        IPage<CommonData> dataPage = commonDataMapper.selectPage(page, null);
-        assertSame(dataPage, page);
-        assertNotEquals(0, dataPage.getRecords().size());
-        assertTrue(CollectionUtils.isNotEmpty(dataPage.getRecords()));
-        System.out.println(JSON.toJSONString(dataPage));
-        System.out.println(JSON.toJSON(dataPage.convert(CommonData::getId)));
-
-
-        Page<CommonLogicData> logicPage = new Page<>(1, 5);
-        IPage<CommonLogicData> logicDataPage = commonLogicDataMapper.selectPage(logicPage, null);
-        assertSame(logicDataPage, logicPage);
-        assertNotEquals(0, logicDataPage.getRecords().size());
-        assertTrue(CollectionUtils.isNotEmpty(logicDataPage.getRecords()));
-        System.out.println(JSON.toJSONString(logicDataPage));
-
-
-        Page<CommonData> commonDataPage = new Page<>(1, 5);
-        commonDataPage.addOrder(OrderItem.descs("c_time", "u_time"));
-        IPage<CommonData> commonDataDataPage = commonDataMapper.myPage(commonDataPage);
-        assertSame(commonDataDataPage, commonDataPage);
-        assertNotEquals(0, commonDataDataPage.getRecords().size());
-        assertTrue(CollectionUtils.isNotEmpty(commonDataDataPage.getRecords()));
-        System.out.println(JSON.toJSONString(commonDataDataPage));
-        System.out.println(JSON.toJSON(commonDataDataPage.convert(CommonData::getId)));
-
-
-        Page<ResultMapEntity> resultMapEntityPage = new Page<>(1, 5);
-        IPage<ResultMapEntity> resultMapEntityDataPage = resultMapEntityMapper.selectPage(resultMapEntityPage, null);
-        assertSame(resultMapEntityDataPage, resultMapEntityPage);
-        assertNotEquals(0, resultMapEntityDataPage.getRecords().size());
-        assertTrue(CollectionUtils.isNotEmpty(resultMapEntityDataPage.getRecords()));
-        System.out.println(JSON.toJSONString(resultMapEntityDataPage));
-
-        this.selectPage();
-    }
-
-    protected abstract void selectPage();
-
-    @Test
-    void a17_fatherAndChildren() {
-        long id = 6;
-        assertThat(commonDataMapper.getById(id).isPresent()).isTrue();
-        assertThat(commonDataChildrenMapper.getByIdChildren(id).isPresent()).isTrue();
-        assertNotNull(commonLogicDataMapper.selectById(id));
-        assertNotNull(commonLogicDataChildrenMapper.selectById(id));
-        commonLogicDataMapper.getByWrapper(Wrappers.lambdaQuery());
-        commonLogicDataChildrenMapper.getByWrapper(Wrappers.lambdaQuery());
-    }
-
-    @Test
-    void a18_groupByOrderBy() {
-        LambdaQueryWrapper<CommonData> wrapper = Wrappers.<CommonData>lambdaQuery().groupBy(true, CommonData::getCreateDatetime);
-        LambdaQueryWrapper<CommonData> wrapper2 = Wrappers.<CommonData>lambdaQuery().orderByAsc(CommonData::getCreateDatetime);
-        System.out.println(wrapper.getSqlSegment());
-        System.out.println(wrapper2.getSqlSegment());
-//        List<CommonData> commonData = commonDataMapper.selectList(wrapper);
-//        assertThat(commonData).isNotEmpty();
-    }
-}

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/MyBaseMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MyBaseMapper.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper;
+package com.baomidou.mybatisplus.test.mysql;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

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

@@ -15,26 +15,38 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.test.base.BaseDbTest;
-import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonData;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonLogicData;
 import com.baomidou.mybatisplus.test.mysql.entity.MysqlData;
+import com.baomidou.mybatisplus.test.mysql.entity.ResultMapEntity;
+import com.baomidou.mybatisplus.test.mysql.enums.TestEnum;
 import com.baomidou.mybatisplus.test.mysql.mapper.MysqlDataMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.children.CommonDataChildrenMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.children.CommonLogicDataChildrenMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonDataCopyMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonDataMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonLogicDataMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.ResultMapEntityMapper;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Mybatis Plus mysql Junit Test
@@ -42,296 +54,91 @@ import static org.junit.jupiter.api.Assertions.*;
  * @author hubin
  * @since 2018-06-05
  */
+@DirtiesContext
+@TestMethodOrder(MethodOrderer.Alphanumeric.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
-class MysqlTestDataMapperTest extends BaseDbTest {
+class MysqlTestDataMapperTest {
+
+    protected final List<String> list = Arrays.asList("1", "2", "3");
+    protected final Map<String, Object> map = list.parallelStream().collect(toMap(identity(), identity()));
+    private final int success = 1;
+    private final int fail = 0;
+    @Resource(name = "commonDataMapper")
+    protected CommonDataMapper commonDataMapper;
+    @Resource(name = "commonDataChildrenMapper")
+    protected CommonDataChildrenMapper commonDataChildrenMapper;
+    @Resource(name = "commonLogicDataMapper")
+    protected CommonLogicDataMapper commonLogicDataMapper;
+    @Resource(name = "commonLogicDataChildrenMapper")
+    protected CommonLogicDataChildrenMapper commonLogicDataChildrenMapper;
+    @Resource
+    protected CommonDataCopyMapper commonDataCopyMapper;
+    @Resource
+    protected ResultMapEntityMapper resultMapEntityMapper;
+    @Autowired
+    private SqlSessionFactory sqlSessionFactory;
 
     @Resource
     private MysqlDataMapper mysqlMapper;
 
-    @Override
-    protected void insertForeach(Long id, int index, String str) {
-        mysqlMapper.insert(new MysqlData().setOrder(index).setGroup(index).setId(id).setTestStr(str).setYaHoStr(str));
+    @Test
+    void a00() {
+        Configuration configuration = sqlSessionFactory.getConfiguration();
+        assertThat(configuration).isInstanceOf(MybatisConfiguration.class);
+        MappedStatement mappedStatement = configuration.getMappedStatement("com.baomidou.mybatisplus.test.mysql.mapper.MysqlDataMapper.getRandomOne");
+        assertThat(mappedStatement).isNotNull();
+    }
+
+    @Test
+    void a01_insertForeach() {
+        for (int i = 1; i < 20; i++) {
+            Long id = (long) i;
+            String str = String.format("第%s条数据", i);
+            commonDataMapper.insert(new CommonData().setTestInt(i).setTestStr(str).setId(id)
+                .setTestEnum(TestEnum.ONE));
+            commonLogicDataMapper.insert(new CommonLogicData().setTestInt(i).setTestStr(str).setId(id));
+            resultMapEntityMapper.insert(new ResultMapEntity().setId(id).setList(list).setMap(map).setMapp(map));
+            mysqlMapper.insert(new MysqlData().setOrder(i).setGroup(i).setId(id).setTestStr(str).setYaHoStr(str));
+        }
     }
 
-    @Override
-    protected void insertBatch(int size) {
+    @Test
+    void a02_insertBatch() {
+        int size = 9;
+        List<CommonData> commonDataList = new ArrayList<>();
+        List<CommonLogicData> commonLogicDataList = new ArrayList<>();
         List<MysqlData> mysqlDataList = new ArrayList<>();
         for (int i = 0; i < size; i++) {
             String str = i + "条";
+            commonDataList.add(new CommonData().setTestInt(i).setTestEnum(TestEnum.TWO).setTestStr(str));
+            commonLogicDataList.add(new CommonLogicData().setTestInt(i).setTestStr(str));
             mysqlDataList.add(new MysqlData().setOrder(i).setGroup(i).setTestStr(str).setYaHoStr(str));
         }
+        assertEquals(size, commonDataMapper.insertBatchSomeColumn(commonDataList));
+        assertEquals(size, commonLogicDataMapper.insertBatchSomeColumn(commonLogicDataList));
         assertEquals(size, mysqlMapper.insertBatchSomeColumn(mysqlDataList));
     }
 
-    @Override
-    protected void deleteById(long id) {
+    @Test
+    void a03_deleteById() {
+        long id = 1L;
+        assertEquals(success, commonDataMapper.deleteById(id));
+        assertEquals(success, commonLogicDataMapper.deleteById(id));
         assertEquals(success, mysqlMapper.deleteById(id));
     }
 
-    @Override
-    protected void deleteByMap_fail(long id) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("id", id);
-        map.put("`order`", 5);
-        assertEquals(fail, mysqlMapper.deleteByMap(map));
-    }
-
-    @Override
-    protected void delete(long id) {
-        assertEquals(success, mysqlMapper.delete(Wrappers.<MysqlData>lambdaQuery()
-            .eq(MysqlData::getId, id)
-            .eq(MysqlData::getOrder, 2)));
-    }
-
-    @Override
-    protected void deleteBatchIds(List<Long> ids) {
-        assertEquals(ids.size(), mysqlMapper.deleteBatchIds(ids));
-    }
-
-    @Override
-    protected void updateById(long id) {
-        assertEquals(success, mysqlMapper.updateById(new MysqlData().setId(id).setOrder(555)));
-    }
-
-    @Override
-    protected void updateWithEntity(long id) {
-        assertEquals(success, mysqlMapper.update(new MysqlData().setOrder(888),
-            Wrappers.<MysqlData>lambdaUpdate().eq(MysqlData::getId, id)
-                .eq(MysqlData::getOrder, 8)));
-    }
-
-    @Override
-    protected void updateWithoutEntity(long id) {
-        //todo
-    }
-
-    @Override
-    protected void selectById(long id) {
-        assertNotNull(mysqlMapper.selectById(id));
-    }
-
-    @Override
-    protected void selectBatchIds(List<Long> ids) {
-        List<MysqlData> mysqlData = mysqlMapper.selectBatchIds(ids);
-        assertTrue(CollectionUtils.isNotEmpty(mysqlData));
-        assertEquals(ids.size(), mysqlData.size());
-    }
-
-    @Override
-    protected void selectByMap(long id) {
+    @Test
+    void a04_deleteByMap() {
+        long id = 2L;
         Map<String, Object> map = new HashMap<>();
         map.put("id", id);
-        map.put("`order`", 9);
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectByMap(map)));
-    }
-
-    @Override
-    protected void selectOne(long id) {
-        assertNotNull(mysqlMapper.selectOne(Wrappers.<MysqlData>lambdaQuery()
-            .eq(MysqlData::getId, id).eq(MysqlData::getOrder, 10)));
-    }
-
-    @Override
-    protected void selectList(long id) {
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.<MysqlData>lambdaQuery()
-            .eq(MysqlData::getId, id).eq(MysqlData::getOrder, 10))));
-    }
-
-    @Override
-    protected void selectMaps() {
-        List<Map<String, Object>> mysqlMaps = mysqlMapper.selectMaps(Wrappers.query());
-        assertThat(mysqlMaps).isNotEmpty();
-        assertThat(mysqlMaps.get(0)).isNotEmpty();
-
-        Page<Map<String, Object>> mapPage = mysqlMapper.getMaps(new Page(1, 5));
-        assertThat(mapPage).isNotNull();
-        assertThat(mapPage.getRecords()).isNotEmpty();
-        assertThat(mapPage.getRecords().get(0)).isNotEmpty();
-    }
-
-    //    @Test
-//    void b5_deleteByIdWithFill() {
-//        long id = 5L;
-//        // 真删
-//        Assertions.assertEquals(1, commonMapper.deleteByIdWithFill(new CommonData().setId(id)));
-//        // 逻辑删除带填充
-//        Assertions.assertEquals(1, commonLogicDataMapper.deleteByIdWithFill(new CommonLogicData().setId(id)));
-//        // 真删
-//        Assertions.assertEquals(1, mysqlMapper.deleteByIdWithFill(new MysqlData().setId(id)));
-//    }
-//
-//    @Test
-//    void c2_optimisticUpdateById() {
-//        long id = 7L;
-//        Assertions.assertEquals(1, commonMapper.updateById(new CommonData().setId(id).setTestInt(778)
-//            .setVersion(0)));
-//    }
-//
-//    @Test
-//    void d1_getAllNoTenant() {
-//        commonMapper.getAllNoTenant();
-//    }
-//
-    @Test
-    void b01_selectListForNoLogic() {
-        MysqlData data = new MysqlData().setOrder(1);
-        // 1. 只有 entity
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data))));
-        // 2. 有 entity 也有 where 条件
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(data).eq(MysqlData::getGroup, 1))));
-        // 3. 有 entity 也有 where 条件 也有 last 条件
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(data).eq(MysqlData::getGroup, 1).last("limit 1"))));
-        // 4. 有 entity 也有 last 条件
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.query(data)
-            .last("limit 1"))));
-        // 5. 只有 order by 或者 last
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.<MysqlData>query()
-            .lambda().orderByDesc(MysqlData::getOrder).last("limit 1"))));
-        // 6. 什么都没有情况
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.emptyWrapper())));
-        // 7. 只有 where 条件
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1))));
-        // 8. 有 where 条件 也有 last 条件
-        assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1).last("limit 1"))));
-    }
-
-    @Test
-    void b02_selectListForLogic() {
-        // 1. 只有 entity
-        CommonLogicData data = new CommonLogicData().setTestInt(11);
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.query(data))));
-        // 2. 有 entity 也有 where 条件
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.lambdaQuery(data).eq(CommonLogicData::getId, 11))));
-        // 3. 有 entity 也有 where 条件 也有 last 条件
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.lambdaQuery(data).eq(CommonLogicData::getId, 11).last("limit 1"))));
-        // 4. 有 entity 也有 last 条件
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.query(data)
-            .last("limit 1"))));
-        // 5. 只有 order by 或者 last
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.<CommonLogicData>query()
-            .lambda().orderByAsc(CommonLogicData::getTestInt).last("limit 1"))));
-        // 6. 什么都没有情况
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.emptyWrapper())));
-        // 7. 只有 where 条件
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).eq(CommonLogicData::getId, 11))));
-        // 8. 有 where 条件 也有 last 条件
-        assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).eq(CommonLogicData::getId, 11).last("limit 1"))));
-    }
-
-    @Test
-    void b03_getRandomOne() {
-        Map<String, Object> randomOne = mysqlMapper.getRandomOne(null, null);
-        assertThat(randomOne).isNotEmpty();
-    }
-
-    @Override
-    protected void selectPage() {
-        Page<MysqlData> mysqlPage = new Page<>(1, 5);
-        IPage<MysqlData> mysqlDataPage = mysqlMapper.selectPage(mysqlPage, null);
-        assertSame(mysqlDataPage, mysqlPage);
-        assertNotEquals(0, mysqlDataPage.getRecords().size());
-        assertTrue(CollectionUtils.isNotEmpty(mysqlDataPage.getRecords()));
-        System.out.println(JSON.toJSONString(mysqlDataPage));
+        map.put("test_int", 5);
+        assertEquals(fail, commonDataMapper.deleteByMap(map));
+        assertEquals(fail, commonLogicDataMapper.deleteByMap(map));
+        Map<String, Object> map2 = new HashMap<>();
+        map2.put("id", id);
+        map2.put("`order`", 5);
+        assertEquals(fail, mysqlMapper.deleteByMap(map2));
     }
-//
-//    @Test
-//    void d8_testApply() {
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonMapper.selectList(new QueryWrapper<CommonData>()
-//            .apply("test_int = 12"))));
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(commonLogicDataMapper.selectList(new QueryWrapper<CommonLogicData>()
-//            .apply("test_int = 12"))));
-//        Assertions.assertTrue(CollectionUtils.isNotEmpty(mysqlMapper.selectList(new QueryWrapper<MysqlData>()
-//            .apply("`order` = 12"))));
-//    }
-//
-//    @Test
-//    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"));
-//        commonMapper.selectList(new QueryWrapper<>(new CommonData().setTestStr("").setTestInt(12)).orderByAsc("test_int"));
-//
-//        mysqlMapper.selectList(Wrappers.query(new MysqlData().setTestStr("")));
-//
-//        mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData().setTestStr("")).orderByAsc(MysqlData::getGroup));
-//        mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData().setTestStr("").setGroup(1)).orderByAsc(MysqlData::getGroup));
-//    }
-//
-//    @Test
-//    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));
-//        commonLogicDataMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData()).orderByAsc(CommonLogicData::getCreateDatetime));
-//        // 对象有值,有 order by
-//        mysqlMapper.selectList(Wrappers.lambdaQuery(new MysqlData().setOrder(12)).select(i -> true).orderByAsc(MysqlData::getId));
-//        commonMapper.selectList(Wrappers.lambdaQuery(new CommonData().setTestInt(12)).orderByAsc(CommonData::getCreateDatetime));
-//        commonLogicDataMapper.selectList(Wrappers.lambdaQuery(new CommonLogicData().setTestInt(12)).orderByAsc(CommonLogicData::getCreateDatetime));
-//    }
-//
-//    @Test
-//    void d11_testWrapperCustomSql() {
-//        // 1. 只有 order by 或者 last
-//        mysqlMapper.getAll(Wrappers.<MysqlData>lambdaQuery().orderByDesc(MysqlData::getOrder).last("limit 1"));
-//        // 2. 什么都没有情况
-//        mysqlMapper.getAll(Wrappers.emptyWrapper());
-//        // 3. 只有 where 条件
-//        mysqlMapper.getAll(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1));
-//        // 4. 有 where 条件 也有 last 条件
-//        mysqlMapper.getAll(Wrappers.lambdaQuery(new MysqlData()).eq(MysqlData::getGroup, 1).last("limit 1"));
-//    }
-//
-//    @Test
-//    void e_1testNest() {
-//        ArrayList<Object> list = new ArrayList<>();
-//        list.add(1);
-//        LambdaQueryWrapper<CommonData> wrapper = Wrappers.<CommonData>lambdaQuery()
-//            .isNotNull(CommonData::getId).and(i -> i.eq(CommonData::getId, 1)
-//                .or().in(CommonData::getTestInt, list));
-//        System.out.println(wrapper.getSqlSegment());
-//        System.out.println(wrapper.getSqlSegment());
-//        System.out.println(wrapper.getSqlSegment());
-//        System.out.println(wrapper.getSqlSegment());
-//        System.out.println(wrapper.getSqlSegment());
-//        commonMapper.selectList(wrapper);
-//    }
-//
-//    @Test
-//    void e_2testLambdaColumnCache() {
-//        mysqlMapper.selectList(Wrappers.<MysqlData>lambdaQuery().select(MysqlData::getId, MysqlData::getYaHoStr))
-//            .forEach(System.out::println);
-//    }
-//
-//    @Test
-//    void e_3testUpdateNotEntity() {
-//        mysqlMapper.update(null, Wrappers.<MysqlData>lambdaUpdate().set(MysqlData::getOrder, 1));
-//        commonLogicDataMapper.update(null, Wrappers.<CommonLogicData>lambdaUpdate().set(CommonLogicData::getTestInt, 1));
-//    }
-//
-//    @Test
-//    void e_4testChainQuery() {
-//        new LambdaQueryChainWrapper<>(mysqlMapper).select(MysqlData::getId, MysqlData::getYaHoStr)
-//            .list().forEach(System.out::println);
-//
-//        new LambdaQueryChainWrapper<>(mysqlMapper).select(MysqlData::getId, MysqlData::getYaHoStr)
-//            .eq(MysqlData::getId, 19).one();
-//
-//        new LambdaQueryChainWrapper<>(mysqlMapper).count();
-//
-//        new LambdaQueryChainWrapper<>(mysqlMapper).select(MysqlData::getId, MysqlData::getYaHoStr)
-//            .page(new Page<>(1, 2));
-//    }
-//
-//    @Test
-//    void e_5testChainUpdate() {
-//        new LambdaUpdateChainWrapper<>(mysqlMapper).set(MysqlData::getYaHoStr, "123456").update();
-//
-//        new LambdaUpdateChainWrapper<>(mysqlMapper).eq(MysqlData::getYaHoStr, "111").remove();
-//    }
-//
-//    @Test
-//    void e_6getByWrapper() {
-//        commonMapper.getByWrapper(Wrappers.<CommonData>lambdaQuery().isNotNull(CommonData::getId));
-//        commonLogicDataMapper.getByWrapper(Wrappers.<CommonLogicData>lambdaQuery().isNotNull(CommonLogicData::getId));
-//    }
 }

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

@@ -19,10 +19,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.test.base.entity.CommonData;
-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.entity.CommonData;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonLogicData;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonDataMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonLogicDataMapper;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.annotation.DirtiesContext;

+ 2 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/config/MybatisPlusConfig.java

@@ -51,7 +51,7 @@ import java.util.List;
  * @since 2017/4/1
  */
 @Configuration
-@MapperScan({"com.baomidou.mybatisplus.test.base.mapper.children", "com.baomidou.mybatisplus.test.base.mapper.commons", "com.baomidou.mybatisplus.test.mysql.mapper"})
+@MapperScan("com.baomidou.mybatisplus.test.mysql.mapper")
 public class MybatisPlusConfig {
 
     @Bean("mybatisSqlSession")
@@ -61,7 +61,7 @@ public class MybatisPlusConfig {
         /* 数据源 */
         sqlSessionFactory.setDataSource(dataSource);
         /* 枚举扫描 */
-        sqlSessionFactory.setTypeEnumsPackage("com.baomidou.mybatisplus.test.base.enums");
+        sqlSessionFactory.setTypeEnumsPackage("com.baomidou.mybatisplus.test.mysql.enums");
         /* xml扫描 */
         sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
             .getResources("classpath:/mapper/*.xml"));

+ 2 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/CommonData.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/CommonData.java

@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.entity;
+package com.baomidou.mybatisplus.test.mysql.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.test.base.enums.TestEnum;
+import com.baomidou.mybatisplus.test.mysql.enums.TestEnum;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/CommonLogicData.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/CommonLogicData.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.entity;
+package com.baomidou.mybatisplus.test.mysql.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 4 - 4
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/ResultMapEntity.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/ResultMapEntity.java

@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.entity;
+package com.baomidou.mybatisplus.test.mysql.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.test.base.type.JsonTypeHandler;
-import com.baomidou.mybatisplus.test.base.type.ListTypeHandler;
-import com.baomidou.mybatisplus.test.base.type.MapTypeHandler;
+import com.baomidou.mybatisplus.test.mysql.type.JsonTypeHandler;
+import com.baomidou.mybatisplus.test.mysql.type.ListTypeHandler;
+import com.baomidou.mybatisplus.test.mysql.type.MapTypeHandler;
 import lombok.Data;
 import lombok.experimental.Accessors;
 

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/enums/TestEnum.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/enums/TestEnum.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.enums;
+package com.baomidou.mybatisplus.test.mysql.enums;
 
 import com.baomidou.mybatisplus.core.enums.IEnum;
 import lombok.Getter;

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/MysqlDataMapper.java

@@ -18,7 +18,7 @@ package com.baomidou.mybatisplus.test.mysql.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.MyBaseMapper;
 import com.baomidou.mybatisplus.test.mysql.entity.MysqlData;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/children/CommonDataChildrenMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/children/CommonDataChildrenMapper.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper.children;
+package com.baomidou.mybatisplus.test.mysql.mapper.children;
 
-import com.baomidou.mybatisplus.test.base.entity.CommonData;
-import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonData;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonDataMapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.Optional;

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/children/CommonLogicDataChildrenMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/children/CommonLogicDataChildrenMapper.java

@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper.children;
+package com.baomidou.mybatisplus.test.mysql.mapper.children;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
-import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonLogicData;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonLogicDataMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

+ 2 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/commons/CommonDataCopyMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/CommonDataCopyMapper.java

@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper.commons;
+package com.baomidou.mybatisplus.test.mysql.mapper.commons;
 
-import com.baomidou.mybatisplus.test.base.entity.CommonData;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonData;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.Optional;

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/commons/CommonDataMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/CommonDataMapper.java

@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper.commons;
+package com.baomidou.mybatisplus.test.mysql.mapper.commons;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.test.base.entity.CommonData;
-import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonData;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/commons/CommonLogicDataMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/CommonLogicDataMapper.java

@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper.commons;
+package com.baomidou.mybatisplus.test.mysql.mapper.commons;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
-import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonLogicData;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

+ 3 - 3
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/commons/ResultMapEntityMapper.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/mapper/commons/ResultMapEntityMapper.java

@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.mapper.commons;
+package com.baomidou.mybatisplus.test.mysql.mapper.commons;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.baomidou.mybatisplus.test.base.entity.ResultMapEntity;
-import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.MyBaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.ResultMapEntity;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/type/JsonTypeHandler.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/type/JsonTypeHandler.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.type;
+package com.baomidou.mybatisplus.test.mysql.type;
 
 import com.alibaba.fastjson.JSON;
 import org.apache.ibatis.type.BaseTypeHandler;

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/type/ListTypeHandler.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/type/ListTypeHandler.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.type;
+package com.baomidou.mybatisplus.test.mysql.type;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/type/MapTypeHandler.java → mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/type/MapTypeHandler.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.base.type;
+package com.baomidou.mybatisplus.test.mysql.type;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;

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

@@ -21,14 +21,17 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.test.base.entity.CommonData;
-import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonData;
+import com.baomidou.mybatisplus.test.mysql.entity.CommonLogicData;
+import com.baomidou.mybatisplus.test.mysql.enums.TestEnum;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonDataMapper;
+import com.baomidou.mybatisplus.test.mysql.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.postgres.entity.PgData;
-import com.baomidou.mybatisplus.test.base.enums.TestEnum;
-import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
-import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.postgres.mapper.PgDataMapper;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
+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;

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/mapper/PgDataMapper.java

@@ -15,8 +15,8 @@
  */
 package com.baomidou.mybatisplus.test.postgres.mapper;
 
+import com.baomidou.mybatisplus.test.mysql.MyBaseMapper;
 import com.baomidou.mybatisplus.test.postgres.entity.PgData;
-import com.baomidou.mybatisplus.test.base.mapper.MyBaseMapper;
 
 /**
  * @author miemie

+ 6 - 6
mybatis-plus/src/test/resources/mapper/ResultMapEntityMapper.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.baomidou.mybatisplus.test.base.mapper.commons.ResultMapEntityMapper">
+<mapper namespace="com.baomidou.mybatisplus.test.mysql.mapper.commons.ResultMapEntityMapper">
 
-    <resultMap id="baseResult" type="com.baomidou.mybatisplus.test.base.entity.ResultMapEntity">
+    <resultMap id="baseResult" type="com.baomidou.mybatisplus.test.mysql.entity.ResultMapEntity">
         <id column="id" property="id"/>
         <result column="column1" property="column1"/>
         <result column="column2" property="column2"/>
         <result column="column3" property="column3"/>
     </resultMap>
 
-    <resultMap id="resultChildren1" type="com.baomidou.mybatisplus.test.base.entity.ResultMapEntity"
+    <resultMap id="resultChildren1" type="com.baomidou.mybatisplus.test.mysql.entity.ResultMapEntity"
                extends="baseResult">
         <result column="column4" property="column4"/>
-        <result column="list" property="list" typeHandler="com.baomidou.mybatisplus.test.base.type.ListTypeHandler"/>
-        <result column="map" property="map" typeHandler="com.baomidou.mybatisplus.test.base.type.MapTypeHandler"/>
-        <result column="map" property="mapp" typeHandler="com.baomidou.mybatisplus.test.base.type.JsonTypeHandler"/>
+        <result column="list" property="list" typeHandler="com.baomidou.mybatisplus.test.mysql.type.ListTypeHandler"/>
+        <result column="map" property="map" typeHandler="com.baomidou.mybatisplus.test.mysql.type.MapTypeHandler"/>
+        <result column="map" property="mapp" typeHandler="com.baomidou.mybatisplus.test.mysql.type.JsonTypeHandler"/>
     </resultMap>
 </mapper>