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/09/21 06:09:32 UTC
[incubator-servicecomb-saga] 01/06: SCB-923 Clean up the
AlphaEventControl for testing
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/incubator-servicecomb-saga.git
commit 3ca061fb1c6940101954d0da8947d081b5888fb5
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Wed Sep 19 10:41:49 2018 +0800
SCB-923 Clean up the AlphaEventControl for testing
---
acceptance-tests/acceptance-pack-dubbo-demo/pom.xml | 2 +-
.../servicecomb/saga/acceptance/dubbodemo/DubboDemoStepdefs.java | 4 ++--
acceptance-tests/acceptance-pack-spring-demo/pom.xml | 2 +-
.../src/test/java/org/apache/servicecomb/saga/PackStepdefs.java | 4 ++--
acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml | 2 +-
.../apache/servicecomb/saga/alpha/server/AlphaEventController.java | 5 ++++-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index 1f16fdb..b64a0ba 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -94,7 +94,7 @@
<run>
<env>
<JAVA_OPTS>
- -Dspring.profiles.active=prd -Dspring.datasource.initialization-mode=always
+ -Dspring.profiles.active=prd,test -Dspring.datasource.initialization-mode=always
</JAVA_OPTS>
</env>
<links>
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/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
index bf2990a..af7b044 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/saga/acceptance/dubbodemo/DubboDemoStepdefs.java
@@ -94,7 +94,7 @@ public class DubboDemoStepdefs implements En {
}
};
- dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/events", dataTable, sortAndColumnStrippingConsumer);
+ dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events", dataTable, sortAndColumnStrippingConsumer);
});
And("^(service[a-c]+) success update status$", (String serviceName, DataTable dataTable) -> {
@@ -115,7 +115,7 @@ public class DubboDemoStepdefs implements En {
given()
.when()
- .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/events")
+ .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events")
.then()
.statusCode(is(200));
}
diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
index efa318a..87bfe9a 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -123,7 +123,7 @@
<run>
<env>
<JAVA_OPTS>
- -Dspring.profiles.active=prd -Dspring.datasource.initialization-mode=always
+ -Dspring.profiles.active=prd,test -Dspring.datasource.initialization-mode=always
</JAVA_OPTS>
</env>
<links>
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/saga/PackStepdefs.java
index 19651e7..fd84819 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/saga/PackStepdefs.java
@@ -102,7 +102,7 @@ public class PackStepdefs implements En {
map.keySet().retainAll(dataTable.topCells());
};
- dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/events", dataTable, columnStrippingConsumer);
+ dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events", dataTable, columnStrippingConsumer);
});
And("^Car Service contains the following booking orders$", (DataTable dataTable) -> {
@@ -127,7 +127,7 @@ public class PackStepdefs implements En {
given()
.when()
- .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/events")
+ .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/events")
.then()
.statusCode(is(200));
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
index 59bc1e1..1126e3c 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -118,7 +118,7 @@
<run>
<env>
<JAVA_OPTS>
- -Dspring.profiles.active=prd -Dspring.datasource.initialization-mode=always
+ -Dspring.profiles.active=prd,test -Dspring.datasource.initialization-mode=always
</JAVA_OPTS>
</env>
<links>
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
index 56167e0..8c73a57 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaEventController.java
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.servicecomb.saga.alpha.core.TxEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -39,7 +40,9 @@ import kamon.annotation.Trace;
@EnableKamon
@Controller
-@RequestMapping("/")
+@RequestMapping("/saga")
+@Profile("test")
+// Only export this Controller for test
class AlphaEventController {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());