*: migrate test framework to testify (tikv#5193)

ref tikv#4813 Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
CabinfeverB · Jul 14, 2022 · c0a6b11 · c0a6b11
1 parent 2c5e434
commit c0a6b11
Show file tree

Hide file tree

Showing 11 changed files with 163 additions and 157 deletions.
diff --git a/pkg/assertutil/assertutil.go b/pkg/assertutil/assertutil.go
@@ -22,20 +22,14 @@ type Checker struct {
 }
 
 // NewChecker creates Checker with FailNow function.
-func NewChecker(failNow func()) *Checker {
-	return &Checker{
-		FailNow: failNow,
-	}
-}
-
-func (c *Checker) failNow() {
-	c.FailNow()
+func NewChecker() *Checker {
+	return &Checker{}
 }
 
 // AssertNil calls the injected IsNil assertion.
 func (c *Checker) AssertNil(obtained interface{}) {
 	if c.IsNil == nil {
-		c.failNow()
+		c.FailNow()
 		return
 	}
 	c.IsNil(obtained)

diff --git a/pkg/assertutil/assertutil_test.go b/pkg/assertutil/assertutil_test.go
@@ -25,9 +25,10 @@ func TestNilFail(t *testing.T) {
 	t.Parallel()
 	re := require.New(t)
 	var failErr error
-	checker := NewChecker(func() {
+	checker := NewChecker()
+	checker.FailNow = func() {
 		failErr = errors.New("called assert func not exist")
-	})
+	}
 	re.Nil(checker.IsNil)
 	checker.AssertNil(nil)
 	re.NotNil(failErr)

diff --git a/server/api/version_test.go b/server/api/version_test.go
@@ -33,7 +33,10 @@ import (
 var _ = Suite(&testVersionSuite{})
 
 func checkerWithNilAssert(c *C) *assertutil.Checker {
-	checker := assertutil.NewChecker(c.FailNow)
+	checker := assertutil.NewChecker()
+	checker.FailNow = func() {
+		c.FailNow()
+	}
 	checker.IsNil = func(obtained interface{}) {
 		c.Assert(obtained, IsNil)
 	}

diff --git a/server/join/join_test.go b/server/join/join_test.go
@@ -17,32 +17,28 @@ package join
 import (
 	"testing"
 
-	. "github.com/pingcap/check"
+	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/assertutil"
 	"github.com/tikv/pd/pkg/testutil"
 	"github.com/tikv/pd/server"
 )
 
-func TestJoin(t *testing.T) {
-	TestingT(t)
-}
-
-var _ = Suite(&testJoinServerSuite{})
-
-type testJoinServerSuite struct{}
-
-func checkerWithNilAssert(c *C) *assertutil.Checker {
-	checker := assertutil.NewChecker(c.FailNow)
+func checkerWithNilAssert(re *require.Assertions) *assertutil.Checker {
+	checker := assertutil.NewChecker()
+	checker.FailNow = func() {
+		re.FailNow("")
+	}
 	checker.IsNil = func(obtained interface{}) {
-		c.Assert(obtained, IsNil)
+		re.Nil(obtained)
 	}
 	return checker
 }
 
 // A PD joins itself.
-func (s *testJoinServerSuite) TestPDJoinsItself(c *C) {
-	cfg := server.NewTestSingleConfig(checkerWithNilAssert(c))
+func TestPDJoinsItself(t *testing.T) {
+	re := require.New(t)
+	cfg := server.NewTestSingleConfig(checkerWithNilAssert(re))
 	defer testutil.CleanServer(cfg.DataDir)
 	cfg.Join = cfg.AdvertiseClientUrls
-	c.Assert(PrepareJoinCluster(cfg), NotNil)
+	re.Error(PrepareJoinCluster(cfg))
 }