nieqiuqiu пре 6 година
родитељ
комит
dac7d2b080
43 измењених фајлова са 120 додато и 114 уклоњено
  1. 1 1
      build.gradle
  2. 12 0
      mybatis-plus-core/build.gradle
  3. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/IdWorkerTest.java
  4. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/RandomUtils.java
  5. 10 10
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/OptimisticLockerInterceptorTest.java
  6. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/DateVersionUser.java
  7. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/IntVersionFather.java
  8. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/IntVersionUser.java
  9. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/LogicVersionUser.java
  10. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/LongVersionUser.java
  11. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/TimestampVersionUser.java
  12. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/DateVersionUserMapper.java
  13. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/IntVersionUserMapper.java
  14. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/LogicVersionUserMapper.java
  15. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/LongVersionUserMapper.java
  16. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/TimestampVersionUserMapper.java
  17. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/tomcatjdbc/TomcatJdbcH2Test.java
  18. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/CircularLabelsTest.java
  19. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/CrudTest.java
  20. 2 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/GlobalConfigurationTest.java
  21. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/LogicDeleteTest.java
  22. 2 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/MybatisMapperRefreshTest.java
  23. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/NoXMLTest.java
  24. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/SqlRunnerTest.java
  25. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/TransactionalTest.java
  26. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/URPTest.java
  27. 0 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java
  28. 2 2
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/activerecord/ActiveRecordTest.java
  29. 5 5
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/PaginationInterceptorTest.java
  30. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/entity/PageUser.java
  31. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/mapper/PageUserMapper.java
  32. 8 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/service/PageUserService.java
  33. 13 0
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/service/impl/PageUserServiceImpl.java
  34. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/DateVersionUserMapper.java
  35. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/IntVersionUserMapper.java
  36. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/LogicVersionUserMapper.java
  37. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/LongVersionUserMapper.java
  38. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/TimestampVersionUserMapper.java
  39. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/mapper/PageUserMapper.java
  40. 0 8
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/service/PageUserService.java
  41. 0 13
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/service/impl/PageUserServiceImpl.java
  42. 4 4
      mybatis-plus-core/src/test/resources/plugins/optimisticLockerInterceptor.xml
  43. 3 3
      mybatis-plus-core/src/test/resources/plugins/paginationInterceptor.xml

+ 1 - 1
build.gradle

@@ -29,7 +29,7 @@ ext {
         "aspectjweaver":"org.aspectj:aspectjweaver:1.8.9",
         "servlet-api":"javax.servlet:servlet-api:2.5",
         "lombok":"org.projectlombok:lombok:1.16.16",
-        "hikaricp":"com.zaxxer:HikariCP:2.7.0",
+        "hikaricp":"com.zaxxer:HikariCP-java7:2.4.13",
         "spring-test":"org.springframework:spring-test:${springVersion}",
         "spring-webmvc":"org.springframework:spring-webmvc:${springVersion}",
         "spring-context-support":"org.springframework:spring-context-support:${springVersion}",

+ 12 - 0
mybatis-plus-core/build.gradle

@@ -1,3 +1,15 @@
+test {
+    filter {
+        includeTestsMatching "com.baomidou.mybatisplus.test"
+        includeTestsMatching "com.baomidou.mybatisplus.test.proxy.*"
+        includeTestsMatching "com.baomidou.mybatisplus.test.sql.*"
+        includeTestsMatching "com.baomidou.mybatisplus.test.h2.*"
+        //默认只跑H2测试用例,下面的看需求自行打开
+//        includeTestsMatching "com.baomidou.mybatisplus.test.mysql.*"
+//        includeTestsMatching "com.baomidou.mybatisplus.test.oracle.*"
+    }
+}
+
 dependencies {
     compile project(":mybatis-plus-support")
     compile rootProject.ext.dependencies["jsqlparser"]

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/IdWorkerTest.java

@@ -27,7 +27,6 @@ import java.util.concurrent.Future;
 
 import org.junit.Assert;
 
-import com.baomidou.mybatisplus.test.plugins.RandomUtils;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 
 /**

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/RandomUtils.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/RandomUtils.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins;
+package com.baomidou.mybatisplus.test;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Random;

+ 10 - 10
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/OptimisticLockerInterceptorTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/OptimisticLockerInterceptorTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker;
 
 import java.io.Reader;
 import java.sql.Connection;
@@ -19,15 +19,15 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.DateVersionUser;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.IntVersionUser;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.LongVersionUser;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.TimestampVersionUser;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.DateVersionUserMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.IntVersionUserMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.LogicVersionUserMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.LongVersionUserMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper.TimestampVersionUserMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.DateVersionUser;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.IntVersionUser;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.LongVersionUser;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.TimestampVersionUser;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper.DateVersionUserMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper.IntVersionUserMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper.LogicVersionUserMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper.LongVersionUserMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper.TimestampVersionUserMapper;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/plugins/optimisticLockerInterceptor.xml"})

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/DateVersionUser.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/DateVersionUser.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/IntVersionFather.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/IntVersionFather.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.entity;
 
 import com.baomidou.mybatisplus.annotations.Version;
 

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/IntVersionUser.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/IntVersionUser.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/LogicVersionUser.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/LogicVersionUser.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/LongVersionUser.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/LongVersionUser.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.entity;
 
 import java.io.Serializable;
 

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/entity/TimestampVersionUser.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/entity/TimestampVersionUser.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity;
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.entity;
 
 import java.io.Serializable;
 import java.sql.Timestamp;

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/DateVersionUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.DateVersionUser;
+
+public interface DateVersionUserMapper extends BaseMapper<DateVersionUser> {
+
+}

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/IntVersionUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.IntVersionUser;
+
+public interface IntVersionUserMapper extends BaseMapper<IntVersionUser> {
+
+}

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/LogicVersionUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.LogicVersionUser;
+
+public interface LogicVersionUserMapper extends BaseMapper<LogicVersionUser> {
+
+}

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/LongVersionUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.LongVersionUser;
+
+public interface LongVersionUserMapper extends BaseMapper<LongVersionUser> {
+
+}

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/optimisticLocker/mapper/TimestampVersionUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.h2.optimisticLocker.entity.TimestampVersionUser;
+
+public interface TimestampVersionUserMapper extends BaseMapper<TimestampVersionUser> {
+
+}

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/tomcatjdbc/TomcatJdbcH2Test.java

@@ -51,7 +51,7 @@ public class TomcatJdbcH2Test extends H2Test {
     H2UserVersionAndLogicDeleteMapper userMapper;
 
     @Test
-    public void testPerformanceInteceptor() {
+    public void testPerformanceInterceptor() {
         userMapper.selectList(new EntityWrapper<H2UserVersionAndLogicDeleteEntity>());
     }
 }

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/CircularLabelsTest.java

@@ -22,7 +22,6 @@ import java.util.List;
 import org.apache.ibatis.session.SqlSession;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
 import com.baomidou.mybatisplus.test.mysql.mapper.TestMapper;

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/CrudTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/CrudTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test;
+package com.baomidou.mybatisplus.test.mysql;
 
 import java.io.InputStream;
 

+ 2 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/GlobalConfigurationTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/GlobalConfigurationTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test;
+package com.baomidou.mybatisplus.test.mysql;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
 
+import com.baomidou.mybatisplus.test.mysql.CrudTest;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
 import org.junit.Assert;

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/LogicDeleteTest.java

@@ -24,7 +24,6 @@ import org.junit.Test;
 
 import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.mapper.Condition;
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
 import com.baomidou.mybatisplus.toolkit.IdWorker;

+ 2 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/MybatisMapperRefreshTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/MybatisMapperRefreshTest.java

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test;
+package com.baomidou.mybatisplus.test.mysql;
 
+import com.baomidou.mybatisplus.test.mysql.CrudTest;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.core.io.ClassPathResource;

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/NoXMLTest.java

@@ -23,7 +23,6 @@ import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 import com.baomidou.mybatisplus.test.mysql.mapper.TestMapper;
 import com.baomidou.mybatisplus.toolkit.IdWorker;

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/SqlRunnerTest.java

@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import com.baomidou.mybatisplus.mapper.SqlRunner;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
 

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/TransactionalTest.java

@@ -18,7 +18,6 @@ package com.baomidou.mybatisplus.test.mysql;
 import org.apache.ibatis.session.SqlSession;
 import org.junit.Test;
 
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
 import com.baomidou.mybatisplus.toolkit.IdWorker;

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/URPTest.java

@@ -22,7 +22,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.PhoneNumber;
 import com.baomidou.mybatisplus.test.mysql.entity.Role;
 import com.baomidou.mybatisplus.test.mysql.entity.User;

+ 0 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java

@@ -27,7 +27,6 @@ import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-import com.baomidou.mybatisplus.test.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.Role;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;

+ 2 - 2
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/activerecord/ActiveRecordTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/activerecord/ActiveRecordTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.test.activerecord;
+package com.baomidou.mybatisplus.test.mysql.activerecord;
 
 import java.util.List;
 import java.util.Map;
@@ -21,7 +21,7 @@ import java.util.Map;
 import org.apache.ibatis.jdbc.SQL;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.CrudTest;
+import com.baomidou.mybatisplus.test.mysql.CrudTest;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.baomidou.mybatisplus.toolkit.TableInfoHelper;

+ 5 - 5
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/PaginationInterceptorTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/PaginationInterceptorTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.paginationInterceptor;
+package com.baomidou.mybatisplus.test.mysql.paginationInterceptor;
 
 import java.io.Reader;
 import java.sql.Connection;
@@ -18,10 +18,10 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.plugins.RandomUtils;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity.PageUser;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.mapper.PageUserMapper;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.service.PageUserService;
+import com.baomidou.mybatisplus.test.RandomUtils;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.entity.PageUser;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.mapper.PageUserMapper;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.service.PageUserService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/plugins/paginationInterceptor.xml"})

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/entity/PageUser.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/entity/PageUser.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity;
+package com.baomidou.mybatisplus.test.mysql.paginationInterceptor.entity;
 
 import java.io.Serializable;
 

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/mapper/PageUserMapper.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.mysql.paginationInterceptor.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.entity.PageUser;
+
+public interface PageUserMapper extends BaseMapper<PageUser> {
+
+}

+ 8 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/service/PageUserService.java

@@ -0,0 +1,8 @@
+package com.baomidou.mybatisplus.test.mysql.paginationInterceptor.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.entity.PageUser;
+
+public interface PageUserService extends IService<PageUser> {
+
+}

+ 13 - 0
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/mysql/paginationInterceptor/service/impl/PageUserServiceImpl.java

@@ -0,0 +1,13 @@
+package com.baomidou.mybatisplus.test.mysql.paginationInterceptor.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.entity.PageUser;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.mapper.PageUserMapper;
+import com.baomidou.mybatisplus.test.mysql.paginationInterceptor.service.PageUserService;
+
+@Service
+public class PageUserServiceImpl extends ServiceImpl<PageUserMapper, PageUser> implements PageUserService {
+
+}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/DateVersionUserMapper.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.DateVersionUser;
-
-public interface DateVersionUserMapper extends BaseMapper<DateVersionUser> {
-
-}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/IntVersionUserMapper.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.IntVersionUser;
-
-public interface IntVersionUserMapper extends BaseMapper<IntVersionUser> {
-
-}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/LogicVersionUserMapper.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.LogicVersionUser;
-
-public interface LogicVersionUserMapper extends BaseMapper<LogicVersionUser> {
-
-}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/LongVersionUserMapper.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.LongVersionUser;
-
-public interface LongVersionUserMapper extends BaseMapper<LongVersionUser> {
-
-}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/optimisticLocker/mapper/TimestampVersionUserMapper.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity.TimestampVersionUser;
-
-public interface TimestampVersionUserMapper extends BaseMapper<TimestampVersionUser> {
-
-}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/mapper/PageUserMapper.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.paginationInterceptor.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity.PageUser;
-
-public interface PageUserMapper extends BaseMapper<PageUser> {
-
-}

+ 0 - 8
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/service/PageUserService.java

@@ -1,8 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.paginationInterceptor.service;
-
-import com.baomidou.mybatisplus.service.IService;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity.PageUser;
-
-public interface PageUserService extends IService<PageUser> {
-
-}

+ 0 - 13
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/plugins/paginationInterceptor/service/impl/PageUserServiceImpl.java

@@ -1,13 +0,0 @@
-package com.baomidou.mybatisplus.test.plugins.paginationInterceptor.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity.PageUser;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.mapper.PageUserMapper;
-import com.baomidou.mybatisplus.test.plugins.paginationInterceptor.service.PageUserService;
-
-@Service
-public class PageUserServiceImpl extends ServiceImpl<PageUserMapper, PageUser> implements PageUserService {
-
-}

+ 4 - 4
mybatis-plus-core/src/test/resources/plugins/optimisticLockerInterceptor.xml

@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-	<context:component-scan base-package="com.baomidou.mybatisplus.test.plugins.optimisticLocker" />
+	<context:component-scan base-package="com.baomidou.mybatisplus.test.h2.optimisticLocker" />
 
 	<import resource="classpath:h2/spring-jdbc.xml" />
 
@@ -13,7 +13,7 @@
 	<bean id="sqlSessionFactory"
 		class="com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.entity" />
+		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.h2.optimisticLocker.entity" />
 		<property name="plugins">
 			<array>
 				<bean class="com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor"/>
@@ -28,7 +28,7 @@
 	</bean>
 
 	<bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.baomidou.mybatisplus.test.plugins.optimisticLocker.mapper" />
+		<property name="basePackage" value="com.baomidou.mybatisplus.test.h2.optimisticLocker.mapper" />
 	</bean>
 
 	<bean id="globalConfig" class="com.baomidou.mybatisplus.entity.GlobalConfiguration">
@@ -36,4 +36,4 @@
 			<bean class="com.baomidou.mybatisplus.mapper.LogicSqlInjector" />
 		</property>
 	</bean>
-</beans>
+</beans>

+ 3 - 3
mybatis-plus-core/src/test/resources/plugins/paginationInterceptor.xml

@@ -13,7 +13,7 @@
 	<bean id="sqlSessionFactory"
 		class="com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.plugins.paginationInterceptor.entity" />
+		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.mysql.paginationInterceptor.entity" />
 		<property name="plugins">
 			<array>
 				<bean class="com.baomidou.mybatisplus.plugins.PerformanceInterceptor" />
@@ -27,6 +27,6 @@
 	</bean>
 
 	<bean id="mapperScannerConfigurer" class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.baomidou.mybatisplus.test.plugins.paginationInterceptor.mapper" />
+		<property name="basePackage" value="com.baomidou.mybatisplus.test.mysql.paginationInterceptor.mapper" />
 	</bean>
-</beans>
+</beans>