From 9f171773acec5c5cbe24e9413a37114458a5bc16 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 14 Dec 2022 00:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86pom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {admin-test => admin-framework/admin-test}/pom.xml              | 2 +-
 .../java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest.java | 0
 .../java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java    | 0
 .../com/ibeetl/admin/test/config/RedisTestConfiguration.java    | 0
 .../admin/test/config/SqlInitializationTestConfiguration.java   | 0
 .../main/java/com/ibeetl/admin/test/util/test/AssertUtils.java  | 0
 .../main/java/com/ibeetl/admin/test/util/test/RandomUtils.java  | 0
 .../main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java  | 0
 admin-framework/pom.xml                                         | 1 +
 pom.xml                                                         | 1 -
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename {admin-test => admin-framework/admin-test}/pom.xml (97%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest.java (100%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java (100%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/config/RedisTestConfiguration.java (100%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/config/SqlInitializationTestConfiguration.java (100%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java (100%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java (100%)
 rename {admin-test => admin-framework/admin-test}/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java (100%)

diff --git a/admin-test/pom.xml b/admin-framework/admin-test/pom.xml
similarity index 97%
rename from admin-test/pom.xml
rename to admin-framework/admin-test/pom.xml
index ef71056f..3556b8e9 100644
--- a/admin-test/pom.xml
+++ b/admin-framework/admin-test/pom.xml
@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>admin</artifactId>
         <groupId>com.ibeetl</groupId>
+        <artifactId>admin-framwork</artifactId>
         <version>1.3.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseDbAndRedisUnitTest.java
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/base/BaseMockitoUnitTest.java
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/config/RedisTestConfiguration.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/config/RedisTestConfiguration.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/config/RedisTestConfiguration.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/config/RedisTestConfiguration.java
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/config/SqlInitializationTestConfiguration.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/config/SqlInitializationTestConfiguration.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/config/SqlInitializationTestConfiguration.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/config/SqlInitializationTestConfiguration.java
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/util/test/AssertUtils.java
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/util/test/RandomUtils.java
diff --git a/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java b/admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java
similarity index 100%
rename from admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java
rename to admin-framework/admin-test/src/main/java/com/ibeetl/admin/test/util/test/TestEnvUtil.java
diff --git a/admin-framework/pom.xml b/admin-framework/pom.xml
index 36e001f1..072ce70c 100644
--- a/admin-framework/pom.xml
+++ b/admin-framework/pom.xml
@@ -19,5 +19,6 @@
 
     <modules>
         <module>admin-convert-pdf</module>
+        <module>admin-test</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0a20caaa..73e2cd44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
         <module>admin-core</module>
         <module>admin-console</module>
         <module>web</module>
-        <module>admin-test</module>
         <module>admin-framework</module>
     </modules>