Przeglądaj źródła

单元测试调整.

nieqiurong 1 rok temu
rodzic
commit
d265456f47
14 zmienionych plików z 22 dodań i 13 usunięć
  1. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java
  2. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java
  3. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java
  4. 1 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java
  5. 0 0
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/parsers/DynamicTableNameParserTest.java
  6. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java
  7. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java
  8. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java
  9. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java
  10. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java
  11. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java
  12. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java
  13. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java
  14. 2 1
      mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/pagination/dialects/IDialectTest.java

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptor.java

@@ -78,7 +78,7 @@ public class DynamicTableNameInnerInterceptor implements InnerInterceptor {
         }
     }
 
-    protected String changeTable(String sql) {
+    public String changeTable(String sql) {
         ExceptionUtils.throwMpe(null == tableNameHandler, "Please implement TableNameHandler processing logic");
         TableNameParser parser = new TableNameParser(sql);
         List<TableNameParser.SqlToken> names = new ArrayList<>();

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java

@@ -256,7 +256,7 @@ public class PaginationInnerInterceptor implements InnerInterceptor {
      * @param sql  sql
      * @return countSql
      */
-    protected String autoCountSql(IPage<?> page, String sql) {
+    public String autoCountSql(IPage<?> page, String sql) {
         if (!page.optimizeCountSql()) {
             return lowLevelCountSql(sql);
         }

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/parser/JsqlParserSimpleSerialTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/parser/JsqlParserSimpleSerialTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.parser;
+package com.baomidou.mybatisplus.test.extension.parser;
 
 import com.baomidou.mybatisplus.extension.parser.cache.FstFactory;
 import net.sf.jsqlparser.JSQLParserException;

+ 1 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactoryTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/parser/cache/FstFactoryTest.java

@@ -1,4 +1,4 @@
-package com.baomidou.mybatisplus.extension.parser.cache;
+package com.baomidou.mybatisplus.test.extension.parser.cache;
 
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfo;

+ 0 - 0
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/parsers/DynamicTableNameParserTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/parsers/DynamicTableNameParserTest.java


+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/MybatisPlusInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/MybatisPlusInterceptorTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins;
+package com.baomidou.mybatisplus.test.extension.plugins;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.junit.jupiter.api.Test;

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/BlockAttackInnerInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/BlockAttackInnerInterceptorTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/DataPermissionInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DataPermissionInterceptorTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/DynamicTableNameInnerInterceptorTest.java

@@ -1,5 +1,6 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
+import com.baomidou.mybatisplus.extension.plugins.inner.DynamicTableNameInnerInterceptor;
 import org.intellij.lang.annotations.Language;
 import org.junit.jupiter.api.Test;
 

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/IllegalSQLInnerInterceptorTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.extension.plugins.inner.IllegalSQLInnerInterceptor;
 import org.apache.ibatis.jdbc.SqlRunner;
 import org.h2.jdbcx.JdbcDataSource;
 import org.junit.jupiter.api.Assertions;

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/MultiDataPermissionInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/MultiDataPermissionInterceptorTest.java

@@ -1,7 +1,8 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor;
 import com.google.common.collect.HashBasedTable;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/PaginationInnerInterceptorTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.junit.jupiter.api.Test;
 

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptorTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/inner/TenantLineInnerInterceptorTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.inner;
+package com.baomidou.mybatisplus.test.extension.plugins.inner;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import org.junit.jupiter.api.Test;

+ 2 - 1
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/IDialectTest.java → mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/test/extension/plugins/pagination/dialects/IDialectTest.java

@@ -1,6 +1,7 @@
-package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
+package com.baomidou.mybatisplus.test.extension.plugins.pagination.dialects;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
+import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;