This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new e88738a7 Enhance test cases (#1016)
e88738a7 is described below
commit e88738a76115adf04027081c9349d8519116b91f
Author: Albumen Kevin <[email protected]>
AuthorDate: Tue Nov 14 21:06:57 2023 +0800
Enhance test cases (#1016)
---
.../case-configuration.yml | 14 +++++++-------
.../pom.xml | 2 +-
.../org/apache/dubbo/migration/api/GreeterService.java | 0
.../java/org/apache/dubbo/migration/api/HelloReply.java | 0
.../org/apache/dubbo/migration/api/HelloRequest.java | 0
.../pom.xml | 4 ++--
.../src/main/resources/log4j.properties | 0
.../apache/dubbo/migration/consumer/ApiConsumerIT.java | 2 +-
.../pom.xml | 4 ++--
.../org/apache/dubbo/migration/EmbeddedZooKeeper.java | 0
.../org/apache/dubbo/migration/GreeterServiceImpl.java | 0
.../apache/dubbo/migration/provider/ApiProvider.java | 2 +-
.../src/main/resources/log4j.properties | 0
.../dubbo-samples-migration-case-application/pom.xml | 12 ++++++------
.../case-configuration.yml | 14 +++++++-------
.../dubbo-samples-migration-case-default-api}/pom.xml | 2 +-
.../org/apache/dubbo/migration/api/GreeterService.java | 0
.../java/org/apache/dubbo/migration/api/HelloReply.java | 0
.../org/apache/dubbo/migration/api/HelloRequest.java | 0
.../pom.xml | 4 ++--
.../src/main/resources/log4j.properties | 0
.../apache/dubbo/migration/consumer/ApiConsumerIT.java | 2 +-
.../pom.xml | 4 ++--
.../org/apache/dubbo/migration/EmbeddedZooKeeper.java | 0
.../org/apache/dubbo/migration/GreeterServiceImpl.java | 0
.../apache/dubbo/migration/provider/ApiProvider.java | 2 +-
.../src/main/resources/log4j.properties | 0
.../dubbo-samples-migration-case-default/pom.xml | 12 ++++++------
2-advanced/dubbo-samples-migration/pom.xml | 9 ++++-----
test/run-tests.sh | 17 +++++++++++++++++
30 files changed, 61 insertions(+), 45 deletions(-)
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml
index 10450471..8edbdeaa 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/case-configuration.yml
@@ -15,16 +15,16 @@
# limitations under the License.
props:
- app_provider: dubbo-samples-migration-provider
+ app_provider: dubbo-samples-migration-case-application-provider
app_provider_main_class: org.apache.dubbo.migration.provider.ApiProvider
- app_consumer: dubbo-samples-migration-consumer
+ app_consumer: dubbo-samples-migration-case-application-consumer
zookeeper_port: 2181
dubbo_port: 50051
-
+
services:
${app_provider}:
type: app
- basedir: ../${app_provider}
+ basedir: ${app_provider}
mainClass: ${app_provider_main_class}
systemProps:
- dubbo.current.protocol=tri
@@ -34,10 +34,10 @@ services:
- ${zookeeper_port}
- ${dubbo_port}
checkLog: "dubbo service started"
-
+
${app_consumer}-test:
type: test
- basedir: ../${app_consumer}
+ basedir: ${app_consumer}
tests:
- "**/*IT.class"
systemProps:
@@ -48,4 +48,4 @@ services:
- ${app_provider}:${zookeeper_port}
- ${app_provider}:${dubbo_port}
depends_on:
- - ${app_provider}
\ No newline at end of file
+ - ${app_provider}
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/pom.xml
similarity index 95%
copy from 2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/pom.xml
index 5c6f223c..8c00528e 100644
--- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-api</artifactId>
+ <artifactId>dubbo-samples-migration-case-application-api</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml
similarity index 96%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/pom.xml
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml
index ab0f48f8..d784ac07 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.example</groupId>
- <artifactId>dubbo-samples-migration-consumer</artifactId>
+ <artifactId>dubbo-samples-migration-case-application-consumer</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-api</artifactId>
+
<artifactId>dubbo-samples-migration-case-application-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/main/resources/log4j.properties
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/src/main/resources/log4j.properties
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/main/resources/log4j.properties
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/src/main/resources/log4j.properties
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
similarity index 98%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
index 297e8a30..7bafc09c 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
@@ -48,7 +48,7 @@ public class ApiConsumerIT {
referenceConfig.setTimeout(100000);
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
- bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-consumer"))
+ bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-case-application-consumer"))
.registry(new RegistryConfig("zookeeper://" + zookeeperAddress
+ ":2181"))
.reference(referenceConfig)
.start();
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml
similarity index 96%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/pom.xml
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml
index 81ce6ff3..fc8a5eb7 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-provider</artifactId>
+ <artifactId>dubbo-samples-migration-case-application-provider</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-api</artifactId>
+
<artifactId>dubbo-samples-migration-case-application-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
similarity index 98%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
index 8312b5c6..bd96a9d4 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
@@ -38,7 +38,7 @@ public class ApiProvider {
serviceConfig.setRef(new GreeterServiceImpl());
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
- bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-provider"))
+ bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-case-application-provider"))
.registry(new RegistryConfig("zookeeper://" + zookeeperAddress
+ ":2181"))
.protocol(new ProtocolConfig(curProtocol))
.service(serviceConfig)
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/resources/log4j.properties
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/resources/log4j.properties
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/resources/log4j.properties
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/dubbo-samples-migration-case-application-provider/src/main/resources/log4j.properties
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml
index 4996e0f7..833ad37c 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-application/pom.xml
@@ -19,17 +19,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
-
+
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-samples-migration-case-application</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<modules>
- <module>../dubbo-samples-migration-api</module>
- <module>../dubbo-samples-migration-provider</module>
- <module>../dubbo-samples-migration-consumer</module>
+ <module>dubbo-samples-migration-case-application-api</module>
+ <module>dubbo-samples-migration-case-application-provider</module>
+ <module>dubbo-samples-migration-case-application-consumer</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-configuration.yml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-configuration.yml
index c87fe01f..7ea7647f 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-configuration.yml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/case-configuration.yml
@@ -15,16 +15,16 @@
# limitations under the License.
props:
- app_provider: dubbo-samples-migration-provider
+ app_provider: dubbo-samples-migration-case-default-provider
app_provider_main_class: org.apache.dubbo.migration.provider.ApiProvider
- app_consumer: dubbo-samples-migration-consumer
+ app_consumer: dubbo-samples-migration-case-default-consumer
zookeeper_port: 2181
dubbo_port: 20880
-
+
services:
${app_provider}:
type: app
- basedir: ../${app_provider}
+ basedir: ${app_provider}
mainClass: ${app_provider_main_class}
systemProps:
- dubbo.current.protocol=dubbo
@@ -34,10 +34,10 @@ services:
- ${zookeeper_port}
- ${dubbo_port}
checkLog: "dubbo service started"
-
+
${app_consumer}-test:
type: test
- basedir: ../${app_consumer}
+ basedir: ${app_consumer}
tests:
- "**/*IT.class"
systemProps:
@@ -47,4 +47,4 @@ services:
- ${app_provider}:${zookeeper_port}
- ${app_provider}:${dubbo_port}
depends_on:
- - ${app_provider}
\ No newline at end of file
+ - ${app_provider}
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/pom.xml
similarity index 95%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/pom.xml
index 5c6f223c..8105ee7b 100644
--- a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-api</artifactId>
+ <artifactId>dubbo-samples-migration-case-default-api</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/src/main/java/org/apache/dubbo/migration/api/GreeterService.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/src/main/java/org/apache/dubbo/migration/api/HelloReply.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-api/src/main/java/org/apache/dubbo/migration/api/HelloRequest.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml
similarity index 96%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/pom.xml
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml
index ab0f48f8..45b72455 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.example</groupId>
- <artifactId>dubbo-samples-migration-consumer</artifactId>
+ <artifactId>dubbo-samples-migration-case-default-consumer</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-api</artifactId>
+ <artifactId>dubbo-samples-migration-case-default-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/main/resources/log4j.properties
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/src/main/resources/log4j.properties
similarity index 100%
copy from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/main/resources/log4j.properties
copy to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/src/main/resources/log4j.properties
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
similarity index 98%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
index 297e8a30..b842f725 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-consumer/src/test/java/org/apache/dubbo/migration/consumer/ApiConsumerIT.java
@@ -48,7 +48,7 @@ public class ApiConsumerIT {
referenceConfig.setTimeout(100000);
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
- bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-consumer"))
+ bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-case-default-consumer"))
.registry(new RegistryConfig("zookeeper://" + zookeeperAddress
+ ":2181"))
.reference(referenceConfig)
.start();
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml
similarity index 96%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/pom.xml
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml
index 81ce6ff3..61b27313 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-provider</artifactId>
+ <artifactId>dubbo-samples-migration-case-default-provider</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-samples-migration-api</artifactId>
+ <artifactId>dubbo-samples-migration-case-default-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/EmbeddedZooKeeper.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/GreeterServiceImpl.java
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
similarity index 98%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
index 8312b5c6..55b71505 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/java/org/apache/dubbo/migration/provider/ApiProvider.java
@@ -38,7 +38,7 @@ public class ApiProvider {
serviceConfig.setRef(new GreeterServiceImpl());
DubboBootstrap bootstrap = DubboBootstrap.getInstance();
- bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-provider"))
+ bootstrap.application(new
ApplicationConfig("dubbo-samples-migration-case-default-provider"))
.registry(new RegistryConfig("zookeeper://" + zookeeperAddress
+ ":2181"))
.protocol(new ProtocolConfig(curProtocol))
.service(serviceConfig)
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/main/resources/log4j.properties
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/resources/log4j.properties
similarity index 100%
rename from
2-advanced/dubbo-samples-migration/dubbo-samples-migration-consumer/src/main/resources/log4j.properties
rename to
2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/dubbo-samples-migration-case-default-provider/src/main/resources/log4j.properties
diff --git
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/pom.xml
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/pom.xml
index 82011c45..29cfedce 100644
---
a/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/pom.xml
+++
b/2-advanced/dubbo-samples-migration/dubbo-samples-migration-case-default/pom.xml
@@ -19,17 +19,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
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";>
-
+
<modelVersion>4.0.0</modelVersion>
<artifactId>dubbo-samples-migration-case-default</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<modules>
- <module>../dubbo-samples-migration-api</module>
- <module>../dubbo-samples-migration-provider</module>
- <module>../dubbo-samples-migration-consumer</module>
+ <module>dubbo-samples-migration-case-default-api</module>
+ <module>dubbo-samples-migration-case-default-provider</module>
+ <module>dubbo-samples-migration-case-default-consumer</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/2-advanced/dubbo-samples-migration/pom.xml
b/2-advanced/dubbo-samples-migration/pom.xml
index c51b1d29..4f45c962 100644
--- a/2-advanced/dubbo-samples-migration/pom.xml
+++ b/2-advanced/dubbo-samples-migration/pom.xml
@@ -27,10 +27,9 @@
<version>1.0-SNAPSHOT</version>
<name>Dubbo Samples Migration</name>
<description>Dubbo Samples Migration</description>
-
+
<modules>
- <module>dubbo-samples-migration-api</module>
- <module>dubbo-samples-migration-provider</module>
- <module>dubbo-samples-migration-consumer</module>
+ <module>dubbo-samples-migration-case-application</module>
+ <module>dubbo-samples-migration-case-default</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/test/run-tests.sh b/test/run-tests.sh
index d84515d3..aff10457 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -450,4 +450,21 @@ else
echo "Test not completed"
fi
fi
+
+echo "Test finished. Start to clean up environment."
+echo "Killing scenario.sh .."
+ps -ef | grep scenario.sh | grep -v grep | awk '{ print $2 }' | xargs -I {}
kill {}
+
+echo "Killing docker logs procs .."
+ps -ef | grep "docker logs" | grep -v grep | awk '{ print $2 }' | xargs -I {}
kill {}
+
+echo "Killing docker-compose .."
+ps -ef | grep "docker-compose" | grep "dubbo-samples" | grep -v grep | awk '{
print $2 }' | xargs -I {} kill {}
+
+echo "Killing dubbo containers .."
+docker ps -a | grep dubbo | awk '{ print $1}' | xargs -I {} docker kill {}
+
+echo "Removing unused networks .."
+docker network prune -f
+
exit $test_result
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
