You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/12/17 12:14:44 UTC

[servicecomb-pack] 10/13: SCB-976 Rename the package name of integration tests and accept tests

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git

commit cfeb5e00a6304cd595140be7ce794aa3ed3ba83a
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Fri Dec 14 16:27:09 2018 +0800

    SCB-976 Rename the package name of integration tests and accept tests
---
 acceptance-tests/acceptance-pack-dubbo-demo/pom.xml          |  2 +-
 .../acceptance/dubbodemo/DubboDemoStepdefs.java              |  2 +-
 .../{saga => pack}/acceptance/dubbodemo/RunCucumberIT.java   |  2 +-
 acceptance-tests/acceptance-pack-spring-demo/pom.xml         |  2 +-
 .../org/apache/servicecomb/{saga => pack}/PackStepdefs.java  |  2 +-
 .../org/apache/servicecomb/{saga => pack}/RunCucumberIT.java |  2 +-
 acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml     |  2 +-
 .../org/apache/servicecomb/{saga => pack}/PackStepdefs.java  |  2 +-
 .../org/apache/servicecomb/{saga => pack}/RunCucumberIT.java |  2 +-
 acceptance-tests/pom.xml                                     |  2 +-
 integration-tests/pack-tests/pom.xml                         |  2 +-
 .../integration}/tests/CommandEnvelopeRepository.java        |  2 +-
 .../pack => pack/integration}/tests/GreetingApplication.java |  4 ++--
 .../pack => pack/integration}/tests/GreetingController.java  |  2 +-
 .../pack => pack/integration}/tests/GreetingService.java     |  2 +-
 .../integration/pack => pack/integration}/tests/PackIT.java  | 12 ++++++------
 .../integration}/tests/TxEventEnvelopeRepository.java        |  2 +-
 17 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index e8d5868..f256fe3 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -25,7 +25,7 @@
     <version>0.3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Saga:Acceptance Tests::Pack::Dubbo</name>
+  <name>Pack:Acceptance Tests::Dubbo</name>
   <artifactId>acceptance-pack-dubbo</artifactId>
 
   <dependencies>
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
similarity index 99%
rename from acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
rename to acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
index af7b044..810073f 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/DubboDemoStepdefs.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.acceptance.dubbodemo;
+package org.apache.servicecomb.pack.acceptance.dubbodemo;
 
 import static io.restassured.RestAssured.given;
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/RunCucumberIT.java
similarity index 94%
rename from acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java
rename to acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/RunCucumberIT.java
index cab33be..d1131b7 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/saga/acceptance/dubbodemo/RunCucumberIT.java
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/java/org/apache/servicecomb/pack/acceptance/dubbodemo/RunCucumberIT.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.acceptance.dubbodemo;
+package org.apache.servicecomb.pack.acceptance.dubbodemo;
 
 import org.junit.runner.RunWith;
 
diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
index 389d10f..e81aab9 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>acceptance-pack-spring</artifactId>
-  <name>Saga:Acceptance Tests::Pack::Spring</name>
+  <name>Pack:Acceptance Tests::Spring</name>
 
   <dependencies>
     <dependency>
diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
similarity index 99%
rename from acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
rename to acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
index fd84819..711edd2 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import static io.restassured.RestAssured.given;
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
similarity index 96%
rename from acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
rename to acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
index d4fc9ee..c8415ce 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import org.junit.runner.RunWith;
 
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
index f752a36..2503b8a 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>acceptance-pack-tcc-spring-demo</artifactId>
-  <name>Saga:Acceptance Tests::Pack::TCC::Spring</name>
+  <name>Pack:Acceptance Tests::TCC::Spring</name>
 
   <dependencies>
     <dependency>
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
similarity index 99%
rename from acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
rename to acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
index 7c56eab..74493e9 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/PackStepdefs.java
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import static io.restassured.RestAssured.given;
 import static java.util.concurrent.TimeUnit.SECONDS;
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
similarity index 96%
rename from acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
rename to acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
index d4fc9ee..c8415ce 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/saga/RunCucumberIT.java
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga;
+package org.apache.servicecomb.pack;
 
 import org.junit.runner.RunWith;
 
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
index 7cd2078..dd3534a 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>acceptance-tests</artifactId>
-  <name>Saga:Acceptance Tests</name>
+  <name>Pack:Acceptance Tests</name>
   <packaging>pom</packaging>
   <modules>
     <module>acceptance-pack-dubbo-demo</module>
diff --git a/integration-tests/pack-tests/pom.xml b/integration-tests/pack-tests/pom.xml
index 2f2ca9c..dc7d1d9 100644
--- a/integration-tests/pack-tests/pom.xml
+++ b/integration-tests/pack-tests/pom.xml
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>pack-tests</artifactId>
-  <name>Pack::Integration Tests::Pack Tests</name>
+  <name>Pack::Integration Tests</name>
 
 
   <dependencyManagement>
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
similarity index 94%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
index 778665f..b8733d9 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/CommandEnvelopeRepository.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/CommandEnvelopeRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
 
 import org.apache.servicecomb.pack.alpha.core.Command;
 import org.springframework.data.repository.CrudRepository;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
similarity index 92%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
index 1cbfa8e..7bae0b4 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingApplication.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingApplication.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Bean;
 
 @EnableOmega
 @SpringBootApplication
-@EntityScan(basePackages = "org.apache.servicecomb.saga.alpha")
+@EntityScan(basePackages = "org.apache.servicecomb.pack.alpha")
 public class GreetingApplication {
   public static void main(String[] args) {
     SpringApplication.run(GreetingApplication.class, args);
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
similarity index 98%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
index 27b6938..e4f2612 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingController.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingController.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
 
 import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
 import org.apache.servicecomb.pack.omega.transaction.annotations.Compensable;
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
similarity index 97%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
index c96c766..07e0d61 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/GreetingService.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/GreetingService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
 
 import java.util.Queue;
 
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
similarity index 97%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
index 84eedf9..5422ce2 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.servicecomb.saga.integration.pack.tests.GreetingController.TRESPASSER;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -33,6 +32,7 @@ import java.util.Queue;
 
 import org.apache.servicecomb.pack.alpha.core.TxEvent;
 import org.apache.servicecomb.pack.omega.context.OmegaContext;
+import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -141,7 +141,7 @@ public class PackIT {
   public void compensatesFailedGlobalTransaction() throws Exception {
     ResponseEntity<String> entity = restTemplate.getForEntity("/greet?name={name}",
         String.class,
-        TRESPASSER);
+        GreetingController.TRESPASSER);
 
     assertThat(entity.getStatusCode(), is(INTERNAL_SERVER_ERROR));
 
@@ -178,7 +178,7 @@ public class PackIT {
     event = events.get(6);
     checkedLastTwoEvents(globalTxId, txStartedEvent1, event);
 
-    assertThat(compensatedMessages, contains("Goodbye, " + TRESPASSER));
+    assertThat(compensatedMessages, Matchers.contains("Goodbye, " + GreetingController.TRESPASSER));
   }
 
   private void checkedLastTwoEvents(String globalTxId, TxEvent txStartedEvent1, TxEvent event) {
@@ -285,7 +285,7 @@ public class PackIT {
     // retries 3 times and then compensate
     ResponseEntity<String> entity = restTemplate.getForEntity("/open?name={name}&retries={retries}",
         String.class,
-        TRESPASSER,
+        GreetingController.TRESPASSER,
         5);
 
     assertThat(entity.getStatusCode(), is(INTERNAL_SERVER_ERROR));
@@ -312,6 +312,6 @@ public class PackIT {
     assertThat(events.get(9).type(), is("TxAbortedEvent"));
     assertThat(events.get(10).type(), is("TxCompensatedEvent"));
     
-    assertThat(compensatedMessages, contains("Goodbye, " + TRESPASSER));
+    assertThat(compensatedMessages, Matchers.contains("Goodbye, " + GreetingController.TRESPASSER));
   }
 }
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
similarity index 95%
rename from integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
rename to integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
index 432fc63..6484e2f 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/TxEventEnvelopeRepository.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/TxEventEnvelopeRepository.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.servicecomb.saga.integration.pack.tests;
+package org.apache.servicecomb.pack.integration.tests;
 
 import java.util.List;