From 14b7269b22455a72a1dadacb971853bce57100c4 Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Wed, 11 Aug 2021 14:20:36 +0800
Subject: [PATCH] tests move to a dir

---
 dtmsvr/utils.go                               | 15 ++++++----
 dtmsvr/utils_test.go                          | 21 ++++++++++++++
 .../barrier_saga_test.go                      |  2 +-
 .../barrier_tcc_test.go                       |  2 +-
 {dtmsvr => test}/dtmsvr_test.go               | 22 ++++----------
 {dtmsvr => test}/examples_test.go             |  2 +-
 .../grpc_msg_test.go                          |  2 +-
 .../grpc_saga_test.go                         |  2 +-
 .../grpc_tcc_test.go                          |  2 +-
 .../grpc_xa_test.go                           |  2 +-
 dtmsvr/trans_msg_test.go => test/msg_test.go  |  2 +-
 .../trans_saga_test.go => test/saga_test.go   |  2 +-
 dtmsvr/trans_tcc_test.go => test/tcc_test.go  |  2 +-
 {dtmsvr => test}/trans_xa_test.go             |  2 +-
 test/types.go                                 | 29 +++++++++++++++++++
 .../wait_saga_test.go                         |  2 +-
 16 files changed, 77 insertions(+), 34 deletions(-)
 create mode 100644 dtmsvr/utils_test.go
 rename dtmsvr/trans_barrier_saga_test.go => test/barrier_saga_test.go (98%)
 rename dtmsvr/trans_barrier_tcc_test.go => test/barrier_tcc_test.go (99%)
 rename {dtmsvr => test}/dtmsvr_test.go (93%)
 rename {dtmsvr => test}/examples_test.go (97%)
 rename dtmsvr/trans_grpc_msg_test.go => test/grpc_msg_test.go (98%)
 rename dtmsvr/trans_grpc_saga_test.go => test/grpc_saga_test.go (99%)
 rename dtmsvr/trans_grpc_tcc_test.go => test/grpc_tcc_test.go (99%)
 rename dtmsvr/trans_grpc_xa_test.go => test/grpc_xa_test.go (99%)
 rename dtmsvr/trans_msg_test.go => test/msg_test.go (98%)
 rename dtmsvr/trans_saga_test.go => test/saga_test.go (99%)
 rename dtmsvr/trans_tcc_test.go => test/tcc_test.go (98%)
 rename {dtmsvr => test}/trans_xa_test.go (99%)
 create mode 100644 test/types.go
 rename dtmsvr/trans_wait_saga_test.go => test/wait_saga_test.go (98%)

diff --git a/dtmsvr/utils.go b/dtmsvr/utils.go
index 973581f..c56915e 100644
--- a/dtmsvr/utils.go
+++ b/dtmsvr/utils.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net"
 	"strings"
+	"time"
 
 	"github.com/bwmarrin/snowflake"
 	"github.com/yedf/dtm/common"
@@ -41,12 +42,16 @@ var TransProcessedTestChan chan string = nil
 // WaitTransProcessed only for test usage. wait for transaction processed once
 func WaitTransProcessed(gid string) {
 	dtmcli.Logf("waiting for gid %s", gid)
-	id := <-TransProcessedTestChan
-	for id != gid {
-		dtmcli.LogRedf("-------id %s not match gid %s", id, gid)
-		id = <-TransProcessedTestChan
+	select {
+	case id := <-TransProcessedTestChan:
+		for id != gid {
+			dtmcli.LogRedf("-------id %s not match gid %s", id, gid)
+			id = <-TransProcessedTestChan
+		}
+		dtmcli.Logf("finish for gid %s", gid)
+	case <-time.After(time.Duration(time.Second * 3)):
+		dtmcli.LogFatalf("Wait Trans timeout")
 	}
-	dtmcli.Logf("finish for gid %s", gid)
 }
 
 var gNode *snowflake.Node = nil
diff --git a/dtmsvr/utils_test.go b/dtmsvr/utils_test.go
new file mode 100644
index 0000000..57491d4
--- /dev/null
+++ b/dtmsvr/utils_test.go
@@ -0,0 +1,21 @@
+package dtmsvr
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/yedf/dtm/dtmcli"
+)
+
+func TestUtils(t *testing.T) {
+	db := dbGet()
+	db.NoMust()
+	CronTransOnce(0)
+	err := dtmcli.CatchP(func() {
+		checkAffected(db.DB)
+	})
+	assert.Error(t, err)
+
+	CronExpiredTrans(1)
+	go sleepCronTime()
+}
diff --git a/dtmsvr/trans_barrier_saga_test.go b/test/barrier_saga_test.go
similarity index 98%
rename from dtmsvr/trans_barrier_saga_test.go
rename to test/barrier_saga_test.go
index 073ae34..ab78739 100644
--- a/dtmsvr/trans_barrier_saga_test.go
+++ b/test/barrier_saga_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_barrier_tcc_test.go b/test/barrier_tcc_test.go
similarity index 99%
rename from dtmsvr/trans_barrier_tcc_test.go
rename to test/barrier_tcc_test.go
index 4d34ad0..54abcfe 100644
--- a/dtmsvr/trans_barrier_tcc_test.go
+++ b/test/barrier_tcc_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"fmt"
diff --git a/dtmsvr/dtmsvr_test.go b/test/dtmsvr_test.go
similarity index 93%
rename from dtmsvr/dtmsvr_test.go
rename to test/dtmsvr_test.go
index d65796f..8888334 100644
--- a/dtmsvr/dtmsvr_test.go
+++ b/test/dtmsvr_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"database/sql"
@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/yedf/dtm/common"
 	"github.com/yedf/dtm/dtmcli"
+	"github.com/yedf/dtm/dtmsvr"
 	"github.com/yedf/dtm/examples"
 )
 
@@ -41,11 +42,11 @@ func resetXaData() {
 }
 
 func TestMain(m *testing.M) {
-	TransProcessedTestChan = make(chan string, 1)
-	PopulateDB(false)
+	dtmsvr.TransProcessedTestChan = make(chan string, 1)
+	dtmsvr.PopulateDB(false)
 	examples.PopulateDB(false)
 	// 启动组件
-	go StartSvr()
+	go dtmsvr.StartSvr()
 	examples.GrpcStartup()
 	app = examples.BaseAppStartup()
 
@@ -53,19 +54,6 @@ func TestMain(m *testing.M) {
 	m.Run()
 }
 
-func TestCover(t *testing.T) {
-	db := dbGet()
-	db.NoMust()
-	CronTransOnce(0)
-	err := dtmcli.CatchP(func() {
-		checkAffected(db.DB)
-	})
-	assert.Error(t, err)
-
-	CronExpiredTrans(1)
-	go sleepCronTime()
-}
-
 func getTransStatus(gid string) string {
 	sm := TransGlobal{}
 	dbr := dbGet().Model(&sm).Where("gid=?", gid).First(&sm)
diff --git a/dtmsvr/examples_test.go b/test/examples_test.go
similarity index 97%
rename from dtmsvr/examples_test.go
rename to test/examples_test.go
index e31d33e..51fffb5 100644
--- a/dtmsvr/examples_test.go
+++ b/test/examples_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_grpc_msg_test.go b/test/grpc_msg_test.go
similarity index 98%
rename from dtmsvr/trans_grpc_msg_test.go
rename to test/grpc_msg_test.go
index 007e433..0f09349 100644
--- a/dtmsvr/trans_grpc_msg_test.go
+++ b/test/grpc_msg_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"fmt"
diff --git a/dtmsvr/trans_grpc_saga_test.go b/test/grpc_saga_test.go
similarity index 99%
rename from dtmsvr/trans_grpc_saga_test.go
rename to test/grpc_saga_test.go
index e1522e7..968ec8b 100644
--- a/dtmsvr/trans_grpc_saga_test.go
+++ b/test/grpc_saga_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_grpc_tcc_test.go b/test/grpc_tcc_test.go
similarity index 99%
rename from dtmsvr/trans_grpc_tcc_test.go
rename to test/grpc_tcc_test.go
index 80381ac..3671838 100644
--- a/dtmsvr/trans_grpc_tcc_test.go
+++ b/test/grpc_tcc_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_grpc_xa_test.go b/test/grpc_xa_test.go
similarity index 99%
rename from dtmsvr/trans_grpc_xa_test.go
rename to test/grpc_xa_test.go
index 7aec602..2b28488 100644
--- a/dtmsvr/trans_grpc_xa_test.go
+++ b/test/grpc_xa_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"fmt"
diff --git a/dtmsvr/trans_msg_test.go b/test/msg_test.go
similarity index 98%
rename from dtmsvr/trans_msg_test.go
rename to test/msg_test.go
index fd0c1bb..d15ba7d 100644
--- a/dtmsvr/trans_msg_test.go
+++ b/test/msg_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_saga_test.go b/test/saga_test.go
similarity index 99%
rename from dtmsvr/trans_saga_test.go
rename to test/saga_test.go
index 1cda3a2..e99888b 100644
--- a/dtmsvr/trans_saga_test.go
+++ b/test/saga_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_tcc_test.go b/test/tcc_test.go
similarity index 98%
rename from dtmsvr/trans_tcc_test.go
rename to test/tcc_test.go
index d5383df..0e9fe91 100644
--- a/dtmsvr/trans_tcc_test.go
+++ b/test/tcc_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"
diff --git a/dtmsvr/trans_xa_test.go b/test/trans_xa_test.go
similarity index 99%
rename from dtmsvr/trans_xa_test.go
rename to test/trans_xa_test.go
index 5dee503..35ac8ee 100644
--- a/dtmsvr/trans_xa_test.go
+++ b/test/trans_xa_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"fmt"
diff --git a/test/types.go b/test/types.go
new file mode 100644
index 0000000..f069a89
--- /dev/null
+++ b/test/types.go
@@ -0,0 +1,29 @@
+package test
+
+import (
+	"github.com/yedf/dtm/common"
+	"github.com/yedf/dtm/dtmcli"
+	"github.com/yedf/dtm/dtmsvr"
+)
+
+var config = common.DtmConfig
+
+func dbGet() *common.DB {
+	return common.DbGet(config.DB)
+}
+
+// WaitTransProcessed alias
+var WaitTransProcessed = dtmsvr.WaitTransProcessed
+
+// CronTransOnce alias
+var CronTransOnce = dtmsvr.CronTransOnce
+var e2p = dtmcli.E2P
+
+// TransGlobal alias
+type TransGlobal = dtmsvr.TransGlobal
+
+// TransBranch alias
+type TransBranch = dtmsvr.TransBranch
+
+// M alias
+type M = dtmcli.M
diff --git a/dtmsvr/trans_wait_saga_test.go b/test/wait_saga_test.go
similarity index 98%
rename from dtmsvr/trans_wait_saga_test.go
rename to test/wait_saga_test.go
index 7e294f9..ff09bea 100644
--- a/dtmsvr/trans_wait_saga_test.go
+++ b/test/wait_saga_test.go
@@ -1,4 +1,4 @@
-package dtmsvr
+package test
 
 import (
 	"testing"