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 2019/12/10 02:33:42 UTC
[servicecomb-pack] 09/13: SCB-1627 Revert "Update test cases for
compensation result events"
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 c3c3789c1d08b49fab36cbaa90986ae8cad32c0f
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Wed Dec 4 10:58:49 2019 +0800
SCB-1627 Revert "Update test cases for compensation result events"
---
.../resources/alpha_records_transaction_events.feature | 18 +++++++++---------
.../test/resources/pack_compensation_scenario.feature | 1 -
.../resources/pack_post_car_exception_scenario.feature | 1 -
.../src/test/resources/pack_timeout_scenario.feature | 2 --
.../test/resources/AExceptionWhenAb_scenario.feature | 1 -
.../test/resources/CExceptionWhenAbAc_scenario.feature | 1 -
.../test/resources/pack_compensation_scenario.feature | 1 -
.../resources/pack_post_car_exception_scenario.feature | 1 -
.../src/test/resources/pack_timeout_scenario.feature | 2 --
.../test/resources/pack_compensation_scenario.feature | 1 -
.../resources/pack_post_car_exception_scenario.feature | 1 -
.../src/test/resources/pack_timeout_scenario.feature | 2 --
.../test/resources/pack_compensation_scenario.feature | 1 -
.../resources/pack_post_car_exception_scenario.feature | 1 -
.../src/test/resources/pack_timeout_scenario.feature | 2 --
.../test/resources/pack_compensation_scenario.feature | 1 -
.../resources/pack_post_car_exception_scenario.feature | 1 -
.../src/test/resources/pack_timeout_scenario.feature | 2 --
.../servicecomb/pack/integration/tests/PackIT.java | 3 +--
.../omega/transaction/spring/TccInterceptorTest.java | 3 ---
.../spring/TransactionInterceptionTest.java | 2 --
21 files changed, 10 insertions(+), 38 deletions(-)
diff --git a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature
index 52b4d5b..1e914b5 100644
--- a/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature
+++ b/acceptance-tests/acceptance-pack-akka-spring-demo/src/test/resources/alpha_records_transaction_events.feature
@@ -77,15 +77,15 @@ Feature: Alpha records transaction events
When User Sean requests to book 1 cars and 1 rooms fail
Then Alpha records the following events
- | serviceName | type |
- | booking | SagaStartedEvent |
- | car | TxStartedEvent |
- | car | TxEndedEvent |
- | hotel | TxStartedEvent |
- | hotel | TxEndedEvent |
- | booking | SagaAbortedEvent |
- | hotel | TxCompensatedEvent |
- | car | TxCompensatedEvent |
+ | serviceName | type |
+ | booking | SagaStartedEvent |
+ | car | TxStartedEvent |
+ | car | TxEndedEvent |
+ | hotel | TxStartedEvent |
+ | hotel | TxEndedEvent |
+ | booking | SagaAbortedEvent |
+ | hotel | TxCompensatedEvent |
+ | car | TxCompensatedEvent |
Then Car Service contains the following booking orders
| id | name | amount | confirmed | cancelled |
diff --git a/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_compensation_scenario.feature b/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_compensation_scenario.feature
index 62547f3..daa086f 100644
--- a/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_compensation_scenario.feature
+++ b/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_compensation_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxAbortedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature b/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature
index 5ce291d..c5f3249 100644
--- a/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature
+++ b/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| car | TxStartedEvent |
| car | TxEndedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_timeout_scenario.feature b/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_timeout_scenario.feature
index c908610..1b545b1 100644
--- a/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_timeout_scenario.feature
+++ b/acceptance-tests/acceptance-pack-cluster-spring-demo/src/test/resources/pack_timeout_scenario.feature
@@ -33,9 +33,7 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxEndedEvent |
| booking | TxAbortedEvent |
- | hotel | TxCompensateAckSucceedEvent |
| hotel | TxCompensatedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/AExceptionWhenAb_scenario.feature b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/AExceptionWhenAb_scenario.feature
index 3182098..6778fd1 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/AExceptionWhenAb_scenario.feature
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/AExceptionWhenAb_scenario.feature
@@ -30,7 +30,6 @@ Feature: Alpha records transaction events
| serviceb | TxEndedEvent |
| servicea | TxAbortedEvent |
| servicea | TxAbortedEvent |
- | serviceb | TxCompensateAckSucceedEvent |
| serviceb | TxCompensatedEvent |
| * | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/CExceptionWhenAbAc_scenario.feature b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/CExceptionWhenAbAc_scenario.feature
index d3b4f3c..2a74f55 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/CExceptionWhenAbAc_scenario.feature
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/src/test/resources/CExceptionWhenAbAc_scenario.feature
@@ -33,7 +33,6 @@ Feature: Alpha records transaction events
| servicec | TxAbortedEvent |
| servicea | TxAbortedEvent |
| servicea | TxAbortedEvent |
- | serviceb | TxCompensateAckSucceedEvent |
| serviceb | TxCompensatedEvent |
| * | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_compensation_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_compensation_scenario.feature
index 62547f3..daa086f 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_compensation_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_compensation_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxAbortedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_post_car_exception_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_post_car_exception_scenario.feature
index 63ffe1d..968cf65 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_post_car_exception_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_post_car_exception_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| car | TxStartedEvent |
| car | TxEndedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_timeout_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_timeout_scenario.feature
index c908610..1b545b1 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_timeout_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-consul/src/test/resources/pack_timeout_scenario.feature
@@ -33,9 +33,7 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxEndedEvent |
| booking | TxAbortedEvent |
- | hotel | TxCompensateAckSucceedEvent |
| hotel | TxCompensatedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_compensation_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_compensation_scenario.feature
index 62547f3..daa086f 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_compensation_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_compensation_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxAbortedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_post_car_exception_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_post_car_exception_scenario.feature
index 63ffe1d..968cf65 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_post_car_exception_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_post_car_exception_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| car | TxStartedEvent |
| car | TxEndedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_timeout_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_timeout_scenario.feature
index c908610..1b545b1 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_timeout_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-nacos/src/test/resources/pack_timeout_scenario.feature
@@ -33,9 +33,7 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxEndedEvent |
| booking | TxAbortedEvent |
- | hotel | TxCompensateAckSucceedEvent |
| hotel | TxCompensatedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_compensation_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_compensation_scenario.feature
index 62547f3..daa086f 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_compensation_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_compensation_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxAbortedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_post_car_exception_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_post_car_exception_scenario.feature
index 63ffe1d..968cf65 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_post_car_exception_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_post_car_exception_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| car | TxStartedEvent |
| car | TxEndedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_timeout_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_timeout_scenario.feature
index c908610..1b545b1 100644
--- a/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_timeout_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/src/test/resources/pack_timeout_scenario.feature
@@ -33,9 +33,7 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxEndedEvent |
| booking | TxAbortedEvent |
- | hotel | TxCompensateAckSucceedEvent |
| hotel | TxCompensatedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_compensation_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_compensation_scenario.feature
index 62547f3..daa086f 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_compensation_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_compensation_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxAbortedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature
index 5ce291d..c5f3249 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_post_car_exception_scenario.feature
@@ -31,7 +31,6 @@ Feature: Alpha records transaction events
| car | TxStartedEvent |
| car | TxEndedEvent |
| booking | TxAbortedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_timeout_scenario.feature b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_timeout_scenario.feature
index c908610..1b545b1 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_timeout_scenario.feature
+++ b/acceptance-tests/acceptance-pack-spring-demo/src/test/resources/pack_timeout_scenario.feature
@@ -33,9 +33,7 @@ Feature: Alpha records transaction events
| hotel | TxStartedEvent |
| hotel | TxEndedEvent |
| booking | TxAbortedEvent |
- | hotel | TxCompensateAckSucceedEvent |
| hotel | TxCompensatedEvent |
- | car | TxCompensateAckSucceedEvent |
| car | TxCompensatedEvent |
| car | SagaEndedEvent |
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
index 4f60e06..0dfa35b 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/pack/integration/tests/PackIT.java
@@ -310,8 +310,7 @@ public class PackIT {
assertThat(events.get(8).type(), is("TxAbortedEvent"));
// This event is for the whole saga event
assertThat(events.get(9).type(), is("TxAbortedEvent"));
- assertThat(events.get(10).type(), is("TxCompensateAckSucceedEvent"));
- assertThat(events.get(11).type(), is("TxCompensatedEvent"));
+ assertThat(events.get(10).type(), is("TxCompensatedEvent"));
assertThat(compensatedMessages, Matchers.contains("Goodbye, " + GreetingController.TRESPASSER));
}
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
index 670ec89..0cefd6b 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TccInterceptorTest.java
@@ -112,9 +112,7 @@ public class TccInterceptorTest {
new ParticipationEndedEvent(globalTxId, anotherLocalTxId, globalTxId, confirmMethod, cancelMethod,
TransactionStatus.Succeed).toString(),
new TccEndedEvent(globalTxId, globalTxId, TransactionStatus.Succeed).toString(),
- new TxCompensateAckSucceedEvent(globalTxId, newLocalTxId, globalTxId).toString(),
new CoordinatedEvent(globalTxId, newLocalTxId, globalTxId, confirmMethod, TransactionStatus.Succeed).toString(),
- new TxCompensateAckSucceedEvent(globalTxId, anotherLocalTxId, globalTxId).toString(),
new CoordinatedEvent(globalTxId, anotherLocalTxId, globalTxId, confirmMethod, TransactionStatus.Succeed).toString()
},
toArray(messages)
@@ -149,7 +147,6 @@ public class TccInterceptorTest {
new ParticipationEndedEvent(globalTxId, anotherLocalTxId, globalTxId, confirmMethod, cancelMethod,
TransactionStatus.Failed).toString(),
new TccEndedEvent(globalTxId, globalTxId, TransactionStatus.Failed).toString(),
- new TxCompensateAckFailedEvent(globalTxId, newLocalTxId, globalTxId).toString(),
new CoordinatedEvent(globalTxId, newLocalTxId, globalTxId, cancelMethod, TransactionStatus.Succeed).toString()
},
toArray(messages)
diff --git a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
index f4224dd..a5f3abf 100644
--- a/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
+++ b/omega/omega-spring-tx/src/test/java/org/apache/servicecomb/pack/omega/transaction/spring/TransactionInterceptionTest.java
@@ -188,9 +188,7 @@ public class TransactionInterceptionTest {
new TxStartedEvent(globalTxId, anotherLocalTxId, localTxId, compensationMethod, 0, "", 0,
anotherUser).toString(),
new TxEndedEvent(globalTxId, anotherLocalTxId, localTxId, compensationMethod).toString(),
- new TxCompensateAckSucceedEvent(globalTxId, newLocalTxId, globalTxId).toString(),
new TxCompensatedEvent(globalTxId, newLocalTxId, globalTxId, compensationMethod).toString(),
- new TxCompensateAckSucceedEvent(globalTxId, anotherLocalTxId, globalTxId).toString(),
new TxCompensatedEvent(globalTxId, anotherLocalTxId, localTxId, compensationMethod).toString()
},
toArray(messages)