test-调整测试class的包名

ximatai · Sep 12, 2024 · 2f08087 · 2f08087
1 parent a99a122
commit 2f08087
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 31 deletions.
diff --git a/...net/ximatai/muyun/GreetingResourceIT.java → ...imatai/muyun/test/GreetingResourceIT.java b/...net/ximatai/muyun/GreetingResourceIT.java → ...imatai/muyun/test/GreetingResourceIT.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun;
+package net.ximatai.muyun.test;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
 

diff --git a/...t/ximatai/muyun/GreetingResourceTest.java → ...atai/muyun/test/GreetingResourceTest.java b/...t/ximatai/muyun/GreetingResourceTest.java → ...atai/muyun/test/GreetingResourceTest.java
@@ -1,8 +1,8 @@
-package net.ximatai.muyun;
+package net.ximatai.muyun.test;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;

diff --git a/my-boot/src/test/java/JdbiTest.java → ...java/net/ximatai/muyun/test/JdbiTest.java b/my-boot/src/test/java/JdbiTest.java → ...java/net/ximatai/muyun/test/JdbiTest.java
@@ -1,3 +1,5 @@
+package net.ximatai.muyun.test;
+
 import net.ximatai.muyun.database.std.argument.List2JsonArgumentFactory;
 import net.ximatai.muyun.database.std.argument.Map2JsonArgumentFactory;
 import net.ximatai.muyun.database.std.mapper.MyPgMapMapper;

diff --git a/...net/ximatai/muyun/core/TestBasicCURD.java → ...imatai/muyun/test/core/TestBasicCURD.java b/...net/ximatai/muyun/core/TestBasicCURD.java → ...imatai/muyun/test/core/TestBasicCURD.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -7,12 +7,13 @@
 import jakarta.ws.rs.Path;
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.database.exception.MyDatabaseException;
 import net.ximatai.muyun.model.PageResult;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...imatai/muyun/core/TestCommonBusiness.java → ...i/muyun/test/core/TestCommonBusiness.java b/...imatai/muyun/core/TestCommonBusiness.java → ...i/muyun/test/core/TestCommonBusiness.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -9,10 +9,11 @@
 import net.ximatai.muyun.ability.ISoftDeleteAbility;
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;

diff --git a/...atai/muyun/core/TestComplexityCreate.java → ...muyun/test/core/TestComplexityCreate.java b/...atai/muyun/core/TestComplexityCreate.java → ...muyun/test/core/TestComplexityCreate.java
@@ -1,14 +1,15 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.common.mapper.TypeRef;
 import jakarta.ws.rs.Path;
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;

diff --git a/...matai/muyun/core/TestMainAndChildren.java → .../muyun/test/core/TestMainAndChildren.java b/...matai/muyun/core/TestMainAndChildren.java → .../muyun/test/core/TestMainAndChildren.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -10,13 +10,14 @@
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
 import net.ximatai.muyun.ability.curd.std.IQueryAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.model.BatchResult;
 import net.ximatai.muyun.model.ChildTableInfo;
 import net.ximatai.muyun.model.QueryItem;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ava/net/ximatai/muyun/core/TestQuery.java → ...et/ximatai/muyun/test/core/TestQuery.java b/...ava/net/ximatai/muyun/core/TestQuery.java → ...et/ximatai/muyun/test/core/TestQuery.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -8,12 +8,13 @@
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
 import net.ximatai.muyun.ability.curd.std.IQueryAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.model.PageResult;
 import net.ximatai.muyun.model.QueryItem;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...net/ximatai/muyun/core/TestReference.java → ...imatai/muyun/test/core/TestReference.java b/...net/ximatai/muyun/core/TestReference.java → ...imatai/muyun/test/core/TestReference.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -10,13 +10,14 @@
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
 import net.ximatai.muyun.ability.curd.std.IQueryAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.model.PageResult;
 import net.ximatai.muyun.model.QueryItem;
 import net.ximatai.muyun.model.ReferenceInfo;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...et/ximatai/muyun/core/TestSoftDelete.java → ...matai/muyun/test/core/TestSoftDelete.java b/...et/ximatai/muyun/core/TestSoftDelete.java → ...matai/muyun/test/core/TestSoftDelete.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -8,11 +8,12 @@
 import net.ximatai.muyun.ability.ISoftDeleteAbility;
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.model.PageResult;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;

diff --git a/...t/ximatai/muyun/core/TestTreeAbility.java → ...atai/muyun/test/core/TestTreeAbility.java b/...t/ximatai/muyun/core/TestTreeAbility.java → ...atai/muyun/test/core/TestTreeAbility.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.core;
+package net.ximatai.muyun.test.core;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
@@ -8,11 +8,12 @@
 import net.ximatai.muyun.ability.ITableCreateAbility;
 import net.ximatai.muyun.ability.ITreeAbility;
 import net.ximatai.muyun.ability.curd.std.ICURDAbility;
+import net.ximatai.muyun.core.Scaffold;
 import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableWrapper;
 import net.ximatai.muyun.model.TreeNode;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...atai/muyun/database/TableBuilderTest.java → ...muyun/test/database/TableBuilderTest.java b/...atai/muyun/database/TableBuilderTest.java → ...muyun/test/database/TableBuilderTest.java
@@ -1,12 +1,13 @@
-package net.ximatai.muyun.database;
+package net.ximatai.muyun.test.database;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
+import net.ximatai.muyun.database.IDatabaseAccess;
 import net.ximatai.muyun.database.builder.Column;
 import net.ximatai.muyun.database.builder.TableBuilder;
 import net.ximatai.muyun.database.builder.TableWrapper;
-import net.ximatai.muyun.testcontainers.PostgresTestResource;
+import net.ximatai.muyun.test.testcontainers.PostgresTestResource;
 import org.jdbi.v3.core.Jdbi;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;

diff --git a/.../testcontainers/PostgresTestResource.java → .../testcontainers/PostgresTestResource.java b/.../testcontainers/PostgresTestResource.java → .../testcontainers/PostgresTestResource.java
@@ -1,4 +1,4 @@
-package net.ximatai.muyun.testcontainers;
+package net.ximatai.muyun.test.testcontainers;
 
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 import org.testcontainers.containers.PostgreSQLContainer;

diff --git a/...t/ximatai/muyun/util/TreeBuilderTest.java → ...atai/muyun/test/util/TreeBuilderTest.java b/...t/ximatai/muyun/util/TreeBuilderTest.java → ...atai/muyun/test/util/TreeBuilderTest.java
@@ -1,6 +1,7 @@
-package net.ximatai.muyun.util;
+package net.ximatai.muyun.test.util;
 
 import net.ximatai.muyun.model.TreeNode;
+import net.ximatai.muyun.util.TreeBuilder;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
@@ -12,14 +13,14 @@
 class TreeBuilderTest {
 
     static List list = List.of(
-        buildNode("A", null),
-        buildNode("B", null),
-        buildNode("C", null),
-        buildNode("A.a", "A"),
-        buildNode("A.b", "A"),
-        buildNode("A.a.1", "A.a"),
-        buildNode("C.a.1", "C.a"),
-        buildNode("B.a", "B")
+            buildNode("A", null),
+            buildNode("B", null),
+            buildNode("C", null),
+            buildNode("A.a", "A"),
+            buildNode("A.b", "A"),
+            buildNode("A.a.1", "A.a"),
+            buildNode("C.a.1", "C.a"),
+            buildNode("B.a", "B")
     );
 
     @Test