From 6a4b9d5323a8e00f0966d1b03ef2e786a076aa1f Mon Sep 17 00:00:00 2001 From: yedongfu Date: Fri, 16 Jul 2021 14:10:44 +0800 Subject: [PATCH] update coverage --- README.md | 1 + dtmsvr/dtmsvr_test.go | 14 ++++++++++++++ examples/main_msg.go | 3 ++- examples/main_saga.go | 3 ++- examples/main_saga_barrier.go | 3 ++- examples/main_tcc.go | 5 +++-- examples/main_tcc_barrier.go | 5 +++-- examples/main_xa.go | 5 +++-- examples/quick_start.go | 11 +++++++---- 9 files changed, 37 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b742e6d..a31ee0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ![license](https://img.shields.io/github/license/yedf/dtm) [![Build Status](https://travis-ci.com/yedf/dtm.svg?branch=main)](https://travis-ci.com/yedf/dtm) +[![Coverage Status](https://coveralls.io/repos/github/yedf/dtm/badge.svg?branch=main)](https://coveralls.io/github/yedf/dtm?branch=main) [![Go Report Card](https://goreportcard.com/badge/github.com/yedf/dtm)](https://goreportcard.com/report/github.com/yedf/dtm) [![Go Reference](https://pkg.go.dev/badge/github.com/yedf/dtm.svg)](https://pkg.go.dev/github.com/yedf/dtm) diff --git a/dtmsvr/dtmsvr_test.go b/dtmsvr/dtmsvr_test.go index 49ec3f0..2d136ae 100644 --- a/dtmsvr/dtmsvr_test.go +++ b/dtmsvr/dtmsvr_test.go @@ -54,6 +54,15 @@ func TestDtmSvr(t *testing.T) { sagaCommittedPending(t) sagaRollback(t) + // for coverage + examples.QsStartSvr() + assertSucceed(t, examples.QsFireRequest()) + assertSucceed(t, examples.MsgFireRequest()) + assertSucceed(t, examples.SagaBarrierFireRequest()) + assertSucceed(t, examples.SagaFireRequest()) + assertSucceed(t, examples.TccBarrierFireRequest()) + assertSucceed(t, examples.TccFireRequest()) + assertSucceed(t, examples.XaFireRequest()) } func TestCover(t *testing.T) { @@ -220,6 +229,11 @@ func sagaCommittedPending(t *testing.T) { assert.Equal(t, "succeed", getTransStatus(saga.Gid)) } +func assertSucceed(t *testing.T, gid string) { + WaitTransProcessed(gid) + assert.Equal(t, "succeed", getTransStatus(gid)) +} + func genMsg(gid string) *dtmcli.Msg { logrus.Printf("beginning a msg test ---------------- %s", gid) msg := dtmcli.NewMsg(examples.DtmServer) diff --git a/examples/main_msg.go b/examples/main_msg.go index 6394c45..ae635b3 100644 --- a/examples/main_msg.go +++ b/examples/main_msg.go @@ -11,7 +11,7 @@ func MsgSetup(app *gin.Engine) { } // MsgFireRequest 1 -func MsgFireRequest() { +func MsgFireRequest() string { logrus.Printf("a busi transaction begin") req := &TransReq{ Amount: 30, @@ -26,4 +26,5 @@ func MsgFireRequest() { logrus.Printf("busi trans submit") err = msg.Submit() e2p(err) + return msg.Gid } diff --git a/examples/main_saga.go b/examples/main_saga.go index 4375137..b6fc8d8 100644 --- a/examples/main_saga.go +++ b/examples/main_saga.go @@ -11,7 +11,7 @@ func SagaSetup(app *gin.Engine) { } // SagaFireRequest 1 -func SagaFireRequest() { +func SagaFireRequest() string { logrus.Printf("a saga busi transaction begin") req := &TransReq{ Amount: 30, @@ -25,4 +25,5 @@ func SagaFireRequest() { err := saga.Submit() logrus.Printf("result gid is: %s", saga.Gid) e2p(err) + return saga.Gid } diff --git a/examples/main_saga_barrier.go b/examples/main_saga_barrier.go index f4641f9..3683eb0 100644 --- a/examples/main_saga_barrier.go +++ b/examples/main_saga_barrier.go @@ -11,7 +11,7 @@ import ( ) // SagaBarrierFireRequest 1 -func SagaBarrierFireRequest() { +func SagaBarrierFireRequest() string { logrus.Printf("a busi transaction begin") req := &TransReq{Amount: 30} saga := dtmcli.NewSaga(DtmServer). @@ -20,6 +20,7 @@ func SagaBarrierFireRequest() { logrus.Printf("busi trans submit") err := saga.Submit() e2p(err) + return saga.Gid } // SagaBarrierAddRoute 1 diff --git a/examples/main_tcc.go b/examples/main_tcc.go index 2164dc6..2352650 100644 --- a/examples/main_tcc.go +++ b/examples/main_tcc.go @@ -27,9 +27,9 @@ func TccSetup(app *gin.Engine) { } // TccFireRequest 1 -func TccFireRequest() { +func TccFireRequest() string { logrus.Printf("tcc transaction begin") - _, err := dtmcli.TccGlobalTransaction(DtmServer, func(tcc *dtmcli.Tcc) (rerr error) { + gid, err := dtmcli.TccGlobalTransaction(DtmServer, func(tcc *dtmcli.Tcc) (rerr error) { res1, rerr := tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TransOut", Busi+"/TransOutConfirm", Busi+"/TransOutRevert") if rerr != nil { return @@ -42,4 +42,5 @@ func TccFireRequest() { return }) e2p(err) + return gid } diff --git a/examples/main_tcc_barrier.go b/examples/main_tcc_barrier.go index 1757e00..e68f268 100644 --- a/examples/main_tcc_barrier.go +++ b/examples/main_tcc_barrier.go @@ -11,9 +11,9 @@ import ( ) // TccBarrierFireRequest 1 -func TccBarrierFireRequest() { +func TccBarrierFireRequest() string { logrus.Printf("tcc transaction begin") - _, err := dtmcli.TccGlobalTransaction(DtmServer, func(tcc *dtmcli.Tcc) (rerr error) { + gid, err := dtmcli.TccGlobalTransaction(DtmServer, func(tcc *dtmcli.Tcc) (rerr error) { res1, rerr := tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TccBTransOutTry", Busi+"/TccBTransOutConfirm", Busi+"/TccBTransOutRevert") if rerr != nil { return @@ -32,6 +32,7 @@ func TccBarrierFireRequest() { return }) e2p(err) + return gid } // TccBarrierAddRoute 1 diff --git a/examples/main_xa.go b/examples/main_xa.go index 707aae5..af9e87e 100644 --- a/examples/main_xa.go +++ b/examples/main_xa.go @@ -37,8 +37,8 @@ func dbGet() *common.DB { } // XaFireRequest 1 -func XaFireRequest() { - _, err := XaClient.XaGlobalTransaction(func(xa *dtmcli.Xa) (rerr error) { +func XaFireRequest() string { + gid, err := XaClient.XaGlobalTransaction(func(xa *dtmcli.Xa) (rerr error) { defer common.P2E(&rerr) req := GenTransReq(30, false, false) resp, err := xa.CallBranch(req, Busi+"/TransOutXa") @@ -48,6 +48,7 @@ func XaFireRequest() { return nil }) e2p(err) + return gid } // XaSetup 1 diff --git a/examples/quick_start.go b/examples/quick_start.go index ca4efab..3dc06c2 100644 --- a/examples/quick_start.go +++ b/examples/quick_start.go @@ -20,11 +20,12 @@ var qsBusi = fmt.Sprintf("http://localhost:%d%s", qsBusiPort, qsBusiAPI) // QuickStarMain called by app/main.go func QuickStarMain() { - qsStartSvr() - qsFireRequest() + QsStartSvr() + QsFireRequest() } -func qsStartSvr() { +// QsStartSvr 1 +func QsStartSvr() { app := common.GetGinApp() qsAddRoute(app) logrus.Printf("quick qs examples listening at %d", qsBusiPort) @@ -32,7 +33,8 @@ func qsStartSvr() { time.Sleep(100 * time.Millisecond) } -func qsFireRequest() { +// QsFireRequest 1 +func QsFireRequest() string { req := &gin.H{"amount": 30} // 微服务的载荷 // DtmServer为DTM服务的地址 saga := dtmcli.NewSaga(DtmServer). @@ -43,6 +45,7 @@ func qsFireRequest() { // 提交saga事务，dtm会完成所有的子事务/回滚所有的子事务 err := saga.Submit() e2p(err) + return saga.Gid } func qsAddRoute(app *gin.Engine) {