调整测试包名（除生成器）

mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/MetadataTest.java → mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/MetadataTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.starter;
+package com.baomidou.mybatisplus.test;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration;

mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/MybatisPlusPropertiesTest.java → mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/MybatisPlusPropertiesTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.starter;
+package com.baomidou.mybatisplus.test;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import org.junit.jupiter.api.Assertions;

mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/entity/Test.java → mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/entity/Test.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.starter.entity;
+package com.baomidou.mybatisplus.test.entity;
 
 import lombok.Data;
 

mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/mapper/TestMapper.java → mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/mapper/TestMapper.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.starter.mapper;
+package com.baomidou.mybatisplus.test.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.starter.entity.Test;
+import com.baomidou.mybatisplus.test.entity.Test;
 
 /**
  * @author nieqiurong 2019/5/4.

mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/pom/GeneratePomTest.java → mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.starter.pom;
+package com.baomidou.mybatisplus.test.pom;
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;

mybatis-plus-boot-starter/src/test/resources/mapper/modulea/testa.xml

@@ -1,5 +1,5 @@
 <?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.starter.mapper.TestMapper">
+<mapper namespace="com.baomidou.mybatisplus.test.mapper.TestMapper">
 
 </mapper>

mybatis-plus-boot-starter/src/test/resources/mapper/moduleb/testb.xml

@@ -1,5 +1,5 @@
 <?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.starter.mapper.TestMapper">
+<mapper namespace="com.baomidou.mybatisplus.test.mapper.TestMapper">
 
 </mapper>

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisDefaultParameterHandler.java

@@ -67,7 +67,7 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
      * @param parameterObject 插入数据库对象
      * @return ignore
      */
-    protected static Object processParameter(MappedStatement ms, Object parameterObject) {
+    public static Object processParameter(MappedStatement ms, Object parameterObject) {
         /* 只处理插入或更新操作 */
         if (parameterObject != null
             && (SqlCommandType.INSERT == ms.getSqlCommandType() || SqlCommandType.UPDATE == ms.getSqlCommandType())) {

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

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2011-2020, baomidou (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.core.test;
-
-import java.time.LocalDate;
-
-public class Main {
-
-    public static void main(String[] args) {
-        query();
-    }
-
-    public static void query() {
-    }
-
-
-    public static class Test {
-
-        private Long id;
-        private String name;
-        private String age;
-        private LocalDate localDate;
-
-        public Long getId() {
-            return id;
-        }
-
-        public void setId(Long id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getAge() {
-            return age;
-        }
-
-        public void setAge(String age) {
-            this.age = age;
-        }
-
-        public LocalDate getLocalDate() {
-            return localDate;
-        }
-
-        public void setLocalDate(LocalDate localDate) {
-            this.localDate = localDate;
-        }
-    }
-}

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (c) 2011-2020, baomidou (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.
- */
-/**
- * 针对core的测试用例
- *
- * @author yuxiaobin
- * @since 2018/2/7
- */
-package com.baomidou.mybatisplus.core.test;

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

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

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.test;
+package com.baomidou.mybatisplus.test;
 
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;

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

@@ -13,8 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core;
+package com.baomidou.mybatisplus.test;
 
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
+import com.baomidou.mybatisplus.core.MybatisXMLLanguageDriver;
 import org.apache.ibatis.executor.loader.javassist.JavassistProxyFactory;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.session.AutoMappingBehavior;

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

@@ -1,9 +1,11 @@
-package com.baomidou.mybatisplus.core;
+package com.baomidou.mybatisplus.test;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.MybatisDefaultParameterHandler;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core;
+package com.baomidou.mybatisplus.test;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.MapKey;

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

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

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

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

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.test;
+package com.baomidou.mybatisplus.test;
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/metadata/TableInfoHelperTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/metadata/TableInfoHelperTest.java

@@ -1,12 +1,15 @@
-package com.baomidou.mybatisplus.core.metadata;
+package com.baomidou.mybatisplus.test.metadata;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -64,7 +67,7 @@ class TableInfoHelperTest {
 
     @Test
     void testIsExistTableId() {
-        assertThat(TableInfoHelper.isExistTableId(Arrays.asList(ModelOne.class.getDeclaredFields()))).isTrue();
+        Assertions.assertThat(TableInfoHelper.isExistTableId(Arrays.asList(ModelOne.class.getDeclaredFields()))).isTrue();
         assertThat(TableInfoHelper.isExistTableId(Arrays.asList(ModelTwo.class.getDeclaredFields()))).isFalse();
     }
 

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/override/MybatisMapperMethodTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/override/MybatisMapperMethodTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.override;
+package com.baomidou.mybatisplus.test.override;
 
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.binding.BindingException;

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/pom/GeneratePomTest.java → mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.pom;
+package com.baomidou.mybatisplus.test.pom;
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;

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

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
+import com.baomidou.mybatisplus.core.toolkit.AES;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

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

@@ -13,10 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import lombok.Getter;
 import lombok.Setter;
 import org.junit.jupiter.api.Assertions;

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

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
+import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

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

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
+import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
 import com.baomidou.mybatisplus.core.toolkit.support.SerializedLambda;
 import lombok.Getter;
 import org.apache.ibatis.reflection.property.PropertyNamer;

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

@@ -1,7 +1,9 @@
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.ParameterUtils;
 import org.apache.ibatis.binding.MapperMethod;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

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

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
+import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.junit.jupiter.api.Assertions;

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

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

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

@@ -13,9 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit;
+package com.baomidou.mybatisplus.test.toolkit;
 
 
+import com.baomidou.mybatisplus.core.toolkit.TableNameParser;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collection;
@@ -187,7 +189,7 @@ public class TableNameParserTest {
     @Test
     public void testSelectOneTable() {
         String sql = "SELECT name, age FROM table1 group by xyx";
-        assertThat(new TableNameParser(sql).tables()).isEqualTo(asSet("table1"));
+        Assertions.assertThat(new TableNameParser(sql).tables()).isEqualTo(asSet("table1"));
     }
 
     @Test

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 /**
  * 谨慎的传递泛型

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 /**
  * 条件定义，只提需求

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 /**
  * Create by HCL at 2018/05/29

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 /**
  * Create by HCL at 2018/05/29

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 /**
  * Create by HCL at 2018/05/29

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 /**
  * Create by HCL at 2018/05/29

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.core.toolkit.condition;
+package com.baomidou.mybatisplus.test.toolkit.condition;
 
 import lombok.Getter;
 import org.junit.jupiter.api.Test;

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/GBaseDialect.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2011-2020, baomidou (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.extension.plugins.pagination.dialects;
 
 /**

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/handlers/BaseTypeHandlerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/handlers/BaseTypeHandlerTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.handlers;
+package com.baomidou.mybatisplus.test.handlers;
 
 import org.mockito.Mock;
 

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/handlers/FastJsonTypeHandlerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/handlers/FastJsonTypeHandlerTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.handlers;
+package com.baomidou.mybatisplus.test.handlers;
 
-import com.baomidou.mybatisplus.extension.model.UserBean;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.baomidou.mybatisplus.test.model.UserBean;
 import org.apache.ibatis.type.JdbcType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/handlers/GsonTypeHandlerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/handlers/GsonTypeHandlerTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.handlers;
+package com.baomidou.mybatisplus.test.handlers;
 
-import com.baomidou.mybatisplus.extension.model.UserBean;
+import com.baomidou.mybatisplus.extension.handlers.GsonTypeHandler;
+import com.baomidou.mybatisplus.test.model.UserBean;
 import org.apache.ibatis.type.JdbcType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/handlers/JacksonTypeHandlerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/handlers/JacksonTypeHandlerTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.handlers;
+package com.baomidou.mybatisplus.test.handlers;
 
-import com.baomidou.mybatisplus.extension.model.UserBean;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.baomidou.mybatisplus.test.model.UserBean;
 import org.apache.ibatis.type.JdbcType;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/handlers/MybatisEnumTypeHandlerTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/handlers/MybatisEnumTypeHandlerTest.java

@@ -13,10 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.handlers;
+package com.baomidou.mybatisplus.test.handlers;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.baomidou.mybatisplus.core.enums.IEnum;
+import com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.apache.ibatis.type.JdbcType;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/handlers/MybatisMapWrapperTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/handlers/MybatisMapWrapperTest.java

@@ -13,8 +13,9 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.handlers;
+package com.baomidou.mybatisplus.test.handlers;
 
+import com.baomidou.mybatisplus.extension.handlers.MybatisMapWrapper;
 import org.junit.jupiter.api.Test;
 
 import java.util.Collections;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/model/UserBean.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/model/UserBean.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.model;
+package com.baomidou.mybatisplus.test.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectFactoryTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/DialectFactoryTest.java

@@ -13,10 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.pagination;
+package com.baomidou.mybatisplus.test.plugins.pagination;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
+import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.MySqlDialect;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/PaginationInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/PaginationInterceptorTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.plugins.pagination;
+package com.baomidou.mybatisplus.test.plugins.pagination;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/SelectBodyToPlainSelectTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/SelectBodyToPlainSelectTest.java

@@ -1,7 +1,8 @@
-package com.baomidou.mybatisplus.extension.plugins.pagination;
+package com.baomidou.mybatisplus.test.plugins.pagination;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.select.PlainSelect;

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
+package com.baomidou.mybatisplus.test.plugins.pagination.dialects;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.junit.jupiter.api.Test;

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

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
+package com.baomidou.mybatisplus.test.plugins.pagination.dialects;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/optimize/JsqlParserCountOptimizeTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/plugins/pagination/optimize/JsqlParserCountOptimizeTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.pagination.optimize;
+package com.baomidou.mybatisplus.test.plugins.pagination.optimize;
 
 import com.baomidou.mybatisplus.core.parser.SqlInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
 import com.github.pagehelper.parser.CountSqlParser;
 import org.apache.ibatis.reflection.MetaObject;
 import org.junit.jupiter.api.Test;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/tenant/TenantSqlParserTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/plugins/tenant/TenantSqlParserTest.java

@@ -1,5 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.tenant;
+package com.baomidou.mybatisplus.test.plugins.tenant;
 
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/pom/GeneratePomTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.pom;
+package com.baomidou.mybatisplus.test.pom;
 
 import jodd.io.FileUtil;
 import jodd.jerry.Jerry;

mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/extension/instance.kt → mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/test/instance.kt

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension
+package com.baomidou.mybatisplus.test
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper

mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/extension/kotlin/FixIssue1986.kt → mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/test/kotlin/FixIssue1986.kt

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.kotlin
+package com.baomidou.mybatisplus.test.kotlin
 
-import com.baomidou.mybatisplus.extension.initTableInfo
+import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
+import com.baomidou.mybatisplus.test.initTableInfo
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 

mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/extension/kotlin/User.kt → mybatis-plus-extension/src/test/kotlin/com/baomidou/mybatisplus/test/kotlin/User.kt

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.kotlin
+package com.baomidou.mybatisplus.test.kotlin
 
 import com.baomidou.mybatisplus.annotation.TableField
 import com.baomidou.mybatisplus.annotation.TableName

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

@@ -13,11 +13,13 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.kotlin
+package com.baomidou.mybatisplus.test.kotlin
 
 import com.baomidou.mybatisplus.core.MybatisConfiguration
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper
+import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
+import com.baomidou.mybatisplus.extension.kotlin.KtUpdateWrapper
 import org.apache.ibatis.builder.MapperBuilderAssistant
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test