diff --git a/test/saga_barrier_test.go b/test/saga_barrier_test.go index f89ffd4..58dd7bf 100644 --- a/test/saga_barrier_test.go +++ b/test/saga_barrier_test.go @@ -32,5 +32,4 @@ func genSagaBarrier(gid string, outFailed, inFailed bool) *dtmcli.Saga { return dtmcli.NewSaga(DtmServer, gid). Add(Busi+"/SagaBTransOut", Busi+"/SagaBTransOutCompensate", req). Add(Busi+"/SagaBTransIn", Busi+"/SagaBTransInCompensate", req) - } diff --git a/test/saga_grpc_barrier_test.go b/test/saga_grpc_barrier_test.go index 9b5506d..ddef2ca 100644 --- a/test/saga_grpc_barrier_test.go +++ b/test/saga_grpc_barrier_test.go @@ -10,24 +10,27 @@ import ( ) func TestSagaGrpcBarrierNormal(t *testing.T) { - req := examples.GenBusiReq(30, false, false) - saga := dtmgrpc.NewSagaGrpc(examples.DtmGrpcServer, dtmimp.GetFuncName()). - Add(examples.BusiGrpc+"/examples.Busi/TransOutBSaga", examples.BusiGrpc+"/examples.Busi/TransOutRevertBSaga", req). - Add(examples.BusiGrpc+"/examples.Busi/TransInBSaga", examples.BusiGrpc+"/examples.Busi/TransInRevertBSaga", req) + saga := genSagaGrpcBarrier(dtmimp.GetFuncName(), false, false) err := saga.Submit() - e2p(err) + assert.Nil(t, err) waitTransProcessed(saga.Gid) + assert.Equal(t, StatusSucceed, getTransStatus(saga.Gid)) assert.Equal(t, []string{StatusPrepared, StatusSucceed, StatusPrepared, StatusSucceed}, getBranchesStatus(saga.Gid)) } func TestSagaGrpcBarrierRollback(t *testing.T) { - req := examples.GenBusiReq(30, false, true) - saga := dtmgrpc.NewSagaGrpc(examples.DtmGrpcServer, dtmimp.GetFuncName()). - Add(examples.BusiGrpc+"/examples.Busi/TransOutBSaga", examples.BusiGrpc+"/examples.Busi/TransOutRevertBSaga", req). - Add(examples.BusiGrpc+"/examples.Busi/TransInBSaga", examples.BusiGrpc+"/examples.Busi/TransInRevertBSaga", req) + saga := genSagaGrpcBarrier(dtmimp.GetFuncName(), false, true) err := saga.Submit() - e2p(err) + assert.Nil(t, err) waitTransProcessed(saga.Gid) assert.Equal(t, StatusFailed, getTransStatus(saga.Gid)) assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid)) } + +func genSagaGrpcBarrier(gid string, outFailed bool, inFailed bool) *dtmgrpc.SagaGrpc { + saga := dtmgrpc.NewSagaGrpc(examples.DtmGrpcServer, gid) + req := examples.GenBusiReq(30, outFailed, inFailed) + saga.Add(examples.BusiGrpc+"/examples.Busi/TransOutBSaga", examples.BusiGrpc+"/examples.Busi/TransOutRevertBSaga", req) + saga.Add(examples.BusiGrpc+"/examples.Busi/TransInBSaga", examples.BusiGrpc+"/examples.Busi/TransInRevertBSaga", req) + return saga +} diff --git a/test/saga_grpc_test.go b/test/saga_grpc_test.go index f41a996..3f3160d 100644 --- a/test/saga_grpc_test.go +++ b/test/saga_grpc_test.go @@ -18,17 +18,6 @@ func TestSagaGrpcNormal(t *testing.T) { assert.Equal(t, StatusSucceed, getTransStatus(saga.Gid)) } -func TestSagaGrpcCommittedOngoing(t *testing.T) { - saga := genSagaGrpc(dtmimp.GetFuncName(), false, false) - examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing) - saga.Submit() - waitTransProcessed(saga.Gid) - assert.Equal(t, []string{StatusPrepared, StatusPrepared, StatusPrepared, StatusPrepared}, getBranchesStatus(saga.Gid)) - cronTransOnce() - assert.Equal(t, []string{StatusPrepared, StatusSucceed, StatusPrepared, StatusSucceed}, getBranchesStatus(saga.Gid)) - assert.Equal(t, StatusSucceed, getTransStatus(saga.Gid)) -} - func TestSagaGrpcRollback(t *testing.T) { saga := genSagaGrpc(dtmimp.GetFuncName(), false, true) examples.MainSwitch.TransOutRevertResult.SetOnce(dtmcli.ResultOngoing) @@ -40,8 +29,19 @@ func TestSagaGrpcRollback(t *testing.T) { assert.Equal(t, []string{StatusSucceed, StatusSucceed, StatusSucceed, StatusFailed}, getBranchesStatus(saga.Gid)) } +func TestSagaGrpcCommittedOngoing(t *testing.T) { + saga := genSagaGrpc(dtmimp.GetFuncName(), false, false) + examples.MainSwitch.TransOutResult.SetOnce(dtmcli.ResultOngoing) + saga.Submit() + waitTransProcessed(saga.Gid) + assert.Equal(t, StatusSubmitted, getTransStatus(saga.Gid)) + assert.Equal(t, []string{StatusPrepared, StatusPrepared, StatusPrepared, StatusPrepared}, getBranchesStatus(saga.Gid)) + cronTransOnce() + assert.Equal(t, StatusSucceed, getTransStatus(saga.Gid)) + assert.Equal(t, []string{StatusPrepared, StatusSucceed, StatusPrepared, StatusSucceed}, getBranchesStatus(saga.Gid)) +} + func genSagaGrpc(gid string, outFailed bool, inFailed bool) *dtmgrpc.SagaGrpc { - dtmimp.Logf("beginning a grpc saga test ---------------- %s", gid) saga := dtmgrpc.NewSagaGrpc(examples.DtmGrpcServer, gid) req := examples.GenBusiReq(30, outFailed, inFailed) saga.Add(examples.BusiGrpc+"/examples.Busi/TransOut", examples.BusiGrpc+"/examples.Busi/TransOutRevert", req)