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 28dc088c9a9 Add shardingsphere-test-e2e-agent-fixture module (#32218)
28dc088c9a9 is described below
commit 28dc088c9a96e837abaf0f8d4d62d8ab755722b7
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 21 22:37:57 2024 +0800
Add shardingsphere-test-e2e-agent-fixture module (#32218)
* Add shardingsphere-test-e2e-agent-fixture module
* Add shardingsphere-test-e2e-agent-fixture module
---
test/e2e/agent/{ => fixture}/jdbc-project/pom.xml | 2 +-
.../e2e/agent/jdbc/project/JdbcProjectApplication.java | 0
.../agent/jdbc/project/controller/OrderController.java | 0
.../test/e2e/agent/jdbc/project/entity/OrderEntity.java | 0
.../e2e/agent/jdbc/project/enums/StatementType.java | 0
.../e2e/agent/jdbc/project/service/OrderService.java | 0
.../jdbc/project/service/impl/OrderServiceImpl.java | 0
.../jdbc-project/src/main/resources/bin/start.sh | 0
.../jdbc-project/src/main/resources/config.yaml | 0
test/e2e/agent/{ => fixture}/pom.xml | 17 ++---------------
test/e2e/agent/plugins/common/pom.xml | 2 +-
test/e2e/agent/pom.xml | 2 +-
12 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/test/e2e/agent/jdbc-project/pom.xml
b/test/e2e/agent/fixture/jdbc-project/pom.xml
similarity index 98%
rename from test/e2e/agent/jdbc-project/pom.xml
rename to test/e2e/agent/fixture/jdbc-project/pom.xml
index 56777ac5b9e..d5ddfc68866 100644
--- a/test/e2e/agent/jdbc-project/pom.xml
+++ b/test/e2e/agent/fixture/jdbc-project/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-e2e-agent</artifactId>
+ <artifactId>shardingsphere-test-e2e-agent-fixture</artifactId>
<version>5.5.1-SNAPSHOT</version>
</parent>
<artifactId>shardingsphere-test-e2e-agent-jdbc-project</artifactId>
diff --git
a/test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/JdbcProjectApplication.java
b/test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/JdbcProjectApplication.java
similarity index 100%
rename from
test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/JdbcProjectApplication.java
rename to
test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/JdbcProjectApplication.java
diff --git
a/test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/controller/OrderController.java
b/test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/controller/OrderController.java
similarity index 100%
rename from
test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/controller/OrderController.java
rename to
test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/controller/OrderController.java
diff --git
a/test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/entity/OrderEntity.java
b/test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/entity/OrderEntity.java
similarity index 100%
rename from
test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/entity/OrderEntity.java
rename to
test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/entity/OrderEntity.java
diff --git
a/test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/enums/StatementType.java
b/test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/enums/StatementType.java
similarity index 100%
rename from
test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/enums/StatementType.java
rename to
test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/enums/StatementType.java
diff --git
a/test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/OrderService.java
b/test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/OrderService.java
similarity index 100%
rename from
test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/OrderService.java
rename to
test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/OrderService.java
diff --git
a/test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/impl/OrderServiceImpl.java
b/test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/impl/OrderServiceImpl.java
similarity index 100%
rename from
test/e2e/agent/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/impl/OrderServiceImpl.java
rename to
test/e2e/agent/fixture/jdbc-project/src/main/java/org/apache/shardingsphere/test/e2e/agent/jdbc/project/service/impl/OrderServiceImpl.java
diff --git a/test/e2e/agent/jdbc-project/src/main/resources/bin/start.sh
b/test/e2e/agent/fixture/jdbc-project/src/main/resources/bin/start.sh
similarity index 100%
rename from test/e2e/agent/jdbc-project/src/main/resources/bin/start.sh
rename to test/e2e/agent/fixture/jdbc-project/src/main/resources/bin/start.sh
diff --git a/test/e2e/agent/jdbc-project/src/main/resources/config.yaml
b/test/e2e/agent/fixture/jdbc-project/src/main/resources/config.yaml
similarity index 100%
rename from test/e2e/agent/jdbc-project/src/main/resources/config.yaml
rename to test/e2e/agent/fixture/jdbc-project/src/main/resources/config.yaml
diff --git a/test/e2e/agent/pom.xml b/test/e2e/agent/fixture/pom.xml
similarity index 71%
copy from test/e2e/agent/pom.xml
copy to test/e2e/agent/fixture/pom.xml
index 5a159609e72..f0348c414a1 100644
--- a/test/e2e/agent/pom.xml
+++ b/test/e2e/agent/fixture/pom.xml
@@ -20,27 +20,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-e2e</artifactId>
+ <artifactId>shardingsphere-test-e2e-agent</artifactId>
<version>5.5.1-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-test-e2e-agent</artifactId>
+ <artifactId>shardingsphere-test-e2e-agent-fixture</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<modules>
- <module>plugins</module>
<module>jdbc-project</module>
</modules>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
-
<docker.proxy.distribution.name>apache-shardingsphere-${project.version}-shardingsphere-proxy-bin</docker.proxy.distribution.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- </dependency>
- </dependencies>
</project>
diff --git a/test/e2e/agent/plugins/common/pom.xml
b/test/e2e/agent/plugins/common/pom.xml
index 89558ec1f11..bd3fba0dc0b 100644
--- a/test/e2e/agent/plugins/common/pom.xml
+++ b/test/e2e/agent/plugins/common/pom.xml
@@ -174,7 +174,7 @@
<outputDirectory>${docker.jdbc.context.directory}/shardingsphere-jdbc-app</outputDirectory>
<resources>
<resource>
-
<directory>${project.basedir}/../../jdbc-project/target/app</directory>
+
<directory>${project.basedir}/../../fixture/jdbc-project/target/app</directory>
</resource>
<resource>
<directory>${project.basedir}/../../../../../distribution/agent/target/apache-shardingsphere-${project.version}-shardingsphere-agent-bin/</directory>
diff --git a/test/e2e/agent/pom.xml b/test/e2e/agent/pom.xml
index 5a159609e72..b02c9ef46aa 100644
--- a/test/e2e/agent/pom.xml
+++ b/test/e2e/agent/pom.xml
@@ -29,7 +29,7 @@
<modules>
<module>plugins</module>
- <module>jdbc-project</module>
+ <module>fixture</module>
</modules>
<properties>
