[servicecomb-pack] 22/38: SCB-1369 Test APIs adds prefix /test

[ningjiang]

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 e7a43a44b870ebffbd5e654884daf8c3c7540cee
Author: Lei Zhang <coolbee...@gmail.com>
AuthorDate: Fri Jul 26 19:45:03 2019 +0800

    SCB-1369 Test APIs adds prefix /test
---
 .../src/test/java/org/apache/servicecomb/pack/PackStepdefs.java     | 6 ++++--
 .../servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java    | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
 
b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
index 9c6a194..c66e46f 100644
--- 
a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
+++ 
b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
@@ -56,6 +56,8 @@ public class PackStepdefs implements En {
   private static final Map<String, Submit> submits = new HashMap<>();
 
   public PackStepdefs() {
+    String[] globalTxId = new String[1];
+
     Given("^Car Service is up and running$", () -> {
       probe(System.getProperty(CAR_SERVICE_ADDRESS));
     });
@@ -102,7 +104,7 @@ public class PackStepdefs implements En {
           map.keySet().retainAll(dataTable.topCells());
       };
 
-      dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + 
"/saga/akka/events/last", dataTable, columnStrippingConsumer);
+      dataMatches(System.getProperty(ALPHA_REST_ADDRESS) + 
"/test/saga/akka/events/last", dataTable, columnStrippingConsumer);
     });
 
     And("^Car Service contains the following booking orders$", (DataTable 
dataTable) -> {
@@ -127,7 +129,7 @@ public class PackStepdefs implements En {
 
     given()
         .when()
-        .delete(System.getProperty(ALPHA_REST_ADDRESS) + "/saga/akka/events")
+        .delete(System.getProperty(ALPHA_REST_ADDRESS) + 
"/test/saga/akka/events")
         .then()
         .statusCode(is(200));
 
diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
index 3e28e42..88a635c 100644
--- 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
+++ 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/FsmSagaDataController.java
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 @EnableKamon
 @Controller
-@RequestMapping("/saga/akka")
+@RequestMapping("/test/saga/akka")
 @Profile("test")
 @ConditionalOnProperty(name= "alpha.feature.akka.enabled", havingValue = 
"true")
 // Only export this Controller for test
@@ -59,7 +59,7 @@ class FsmSagaDataController {
   ResponseEntity<Collection<Map>> events() {
     LOG.info("Get the events request");
     List<Map> eventVos = new LinkedList<>();
-    SagaData data = 
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData();
+    SagaData data = 
SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaDate();
     data.getEvents().forEach(event -> {
       Map<String,String> obj = new HashMap();
       obj.put("serviceName",event.getServiceName());
@@ -75,7 +75,6 @@ class FsmSagaDataController {
   @Trace("deleteEvents")
   @DeleteMapping("/events")
   ResponseEntity<String> clear() {
-    SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).clearSagaData();
     return ResponseEntity.ok("All events deleted");
   }