From 3bb4108bf1e21cbdfe9b5f177b179dec01f0b388 Mon Sep 17 00:00:00 2001
From: Jingliu Xiong <928124786@qq.com>
Date: Sat, 26 Oct 2024 15:06:40 +0800
Subject: [PATCH] feat: test spring-seata-dubbo-saga e2e case

---
 saga-sample/spring-seata-dubbo-saga/seata-e2e1.yaml    |  6 +++---
 .../apache/seata/consumer/SagaTransactionStarter.java  | 10 +++++-----
 .../consumer/config/DubboConsumerConfiguration.java    |  2 +-
 .../provider/config/DubboProviderConfiguration.java    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/saga-sample/spring-seata-dubbo-saga/seata-e2e1.yaml b/saga-sample/spring-seata-dubbo-saga/seata-e2e1.yaml
index 10f29420f..13b88cfc4 100644
--- 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/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/SagaTransactionStarter.java b/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/SagaTransactionStarter.java
index 28bd331a5..366e3d4f2 100644
--- a/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/SagaTransactionStarter.java
+++ b/saga-sample/spring-seata-dubbo-saga/spring-seata-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/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/config/DubboConsumerConfiguration.java b/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/config/DubboConsumerConfiguration.java
index ddd2e98f2..879b092c0 100644
--- a/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-consumer/src/main/java/org/apache/seata/consumer/config/DubboConsumerConfiguration.java
+++ b/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-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/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-provider/src/main/java/org/apache/seata/provider/config/DubboProviderConfiguration.java b/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-provider/src/main/java/org/apache/seata/provider/config/DubboProviderConfiguration.java
index c23770c73..afeff596f 100644
--- a/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-provider/src/main/java/org/apache/seata/provider/config/DubboProviderConfiguration.java
+++ b/saga-sample/spring-seata-dubbo-saga/spring-seata-dubbo-saga-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");
         }