feat: test spring-seata-dubbo-saga e2e case

apache · Oct 26, 2024 · 3bb4108 · 3bb4108
1 parent 588af9e
commit 3bb4108
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/saga-sample/spring-seata-dubbo-saga/seata-e2e1.yaml b/saga-sample/spring-seata-dubbo-saga/seata-e2e1.yaml
@@ -23,7 +23,7 @@ e2e:
               condition: service_started
           environment:
             seata.address: seata
-            zookeeper.address: zookeeper
+            zookeeper.address: zookeeperAddress
             E2E_ENV: open
     # provider service
     providers:
@@ -38,7 +38,7 @@ e2e:
               condition: service_healthy
           environment:
             seata.address: seata
-            zookeeper.address: zookeeper
+            zookeeper.address: zookeeperAddress
             E2E_ENV: open
     # infrastructure services
     infrastructures:
@@ -54,7 +54,7 @@ e2e:
             STORE_MODE: file
       - name: zookeeper
         docker_service:
-          hostname: zookeeper
+          hostname: zookeeperAddress
           image: zookeeper:3.8.4
           #          ports:
           #            - "2181:2181"

diff --git a/...a-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/SagaTransactionStarter.java b/...a-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/SagaTransactionStarter.java
@@ -49,11 +49,11 @@ public static void main(String[] args) throws InterruptedException {
 
         AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(SagaTransactionStarter.class);
 
-//        StateMachineEngine stateMachineEngine = (StateMachineEngine) applicationContext.getBean("stateMachineEngine");
-//
-//        transactionCommittedDemo(stateMachineEngine);
-//
-//        transactionCompensatedDemo(stateMachineEngine);
+        StateMachineEngine stateMachineEngine = (StateMachineEngine) applicationContext.getBean("stateMachineEngine");
+
+        transactionCommittedDemo(stateMachineEngine);
+
+        transactionCompensatedDemo(stateMachineEngine);
         if (isInE2ETest()) {
             String res =  "{\"res\": \"commit\"}";
             writeE2EResFile(res, "commit.yaml");

diff --git a/...a-consumer/src/main/java/org/apache/seata/consumer/config/DubboConsumerConfiguration.java b/...a-consumer/src/main/java/org/apache/seata/consumer/config/DubboConsumerConfiguration.java
@@ -53,7 +53,7 @@ public ApplicationConfig applicationConfig() {
     public RegistryConfig registryConfig() {
         RegistryConfig registryConfig = new RegistryConfig();
         if (isInE2ETest()) {
-            registryConfig.setAddress("zookeeper://zookeeper:2181");
+            registryConfig.setAddress("zookeeper://zookeeperAddress:2181");
         } else {
             registryConfig.setAddress("zookeeper://localhost:2181");
         }

diff --git a/...a-provider/src/main/java/org/apache/seata/provider/config/DubboProviderConfiguration.java b/...a-provider/src/main/java/org/apache/seata/provider/config/DubboProviderConfiguration.java
@@ -44,7 +44,7 @@ public ApplicationConfig applicationConfig() {
     public RegistryConfig registryConfig() {
         RegistryConfig registryConfig = new RegistryConfig();
         if (isInE2ETest()) {
-            registryConfig.setAddress("zookeeper://zookeeper:2181");
+            registryConfig.setAddress("zookeeper://zookeeperAddress:2181");
         } else {
             registryConfig.setAddress("zookeeper://localhost:2181");
         }