This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new d5f6b8822e6 Rename test-runner module (#22460)
d5f6b8822e6 is described below
commit d5f6b8822e6222ada23b209a399cb0504044a930
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 27 22:17:25 2022 +0800
Rename test-runner module (#22460)
* For code format
* Rename test-runner module
---
test/integration-test/fixture/pom.xml | 2 +-
test/integration-test/test-suite/pom.xml | 2 +-
test/parser/pom.xml | 2 +-
test/pipeline/pom.xml | 2 +-
test/pom.xml | 2 +-
test/rewrite/pom.xml | 2 +-
test/{common => runner}/pom.xml | 7 +------
.../test/runner/ShardingSphereParallelTestParameterized.java | 0
.../test/runner/parallel/DefaultParallelRunnerExecutorFactory.java | 0
.../test/runner/parallel/ParallelRunnerExecutor.java | 0
.../test/runner/parallel/ParallelRunnerExecutorFactory.java | 0
.../test/runner/parallel/ParallelRunnerScheduler.java | 0
.../test/runner/parallel/annotaion/ParallelLevel.java | 0
.../test/runner/parallel/annotaion/ParallelRuntimeStrategy.java | 0
.../test/runner/parallel/impl/DefaultParallelRunnerExecutor.java | 0
15 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/test/integration-test/fixture/pom.xml
b/test/integration-test/fixture/pom.xml
index 6774e5729b4..820d2e5774d 100644
--- a/test/integration-test/fixture/pom.xml
+++ b/test/integration-test/fixture/pom.xml
@@ -49,7 +49,7 @@
</dependency>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-runner</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/test/integration-test/test-suite/pom.xml
b/test/integration-test/test-suite/pom.xml
index a55c391bafd..829a395945f 100644
--- a/test/integration-test/test-suite/pom.xml
+++ b/test/integration-test/test-suite/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-runner</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
diff --git a/test/parser/pom.xml b/test/parser/pom.xml
index 5980c1940dc..1fa0a652cc7 100644
--- a/test/parser/pom.xml
+++ b/test/parser/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-runner</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/test/pipeline/pom.xml b/test/pipeline/pom.xml
index beabe3c7a97..4ab0895c660 100644
--- a/test/pipeline/pom.xml
+++ b/test/pipeline/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-runner</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/test/pom.xml b/test/pom.xml
index 6682006728e..5c21f3e235b 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,8 +29,8 @@
<name>${project.artifactId}</name>
<modules>
- <module>common</module>
<module>fixture</module>
+ <module>runner</module>
<module>integration-test</module>
<module>integration-driver-test</module>
<module>integration-agent-test</module>
diff --git a/test/rewrite/pom.xml b/test/rewrite/pom.xml
index 1c15c092437..0c8b7280b92 100644
--- a/test/rewrite/pom.xml
+++ b/test/rewrite/pom.xml
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-runner</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/test/common/pom.xml b/test/runner/pom.xml
similarity index 88%
rename from test/common/pom.xml
rename to test/runner/pom.xml
index f99670dd8a2..8eb14aaead3 100644
--- a/test/common/pom.xml
+++ b/test/runner/pom.xml
@@ -24,7 +24,7 @@
<artifactId>shardingsphere-test</artifactId>
<version>5.2.2-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-test-common</artifactId>
+ <artifactId>shardingsphere-test-runner</artifactId>
<name>${project.artifactId}</name>
<properties>
@@ -42,10 +42,5 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/ShardingSphereParallelTestParameterized.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/DefaultParallelRunnerExecutorFactory.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/DefaultParallelRunnerExecutorFactory.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/DefaultParallelRunnerExecutorFactory.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/DefaultParallelRunnerExecutorFactory.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutor.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutor.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutor.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutor.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutorFactory.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutorFactory.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutorFactory.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerExecutorFactory.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/ParallelRunnerScheduler.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelLevel.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelLevel.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelLevel.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelLevel.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/annotaion/ParallelRuntimeStrategy.java
diff --git
a/test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/impl/DefaultParallelRunnerExecutor.java
b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/impl/DefaultParallelRunnerExecutor.java
similarity index 100%
rename from
test/common/src/main/java/org/apache/shardingsphere/test/runner/parallel/impl/DefaultParallelRunnerExecutor.java
rename to
test/runner/src/main/java/org/apache/shardingsphere/test/runner/parallel/impl/DefaultParallelRunnerExecutor.java
