*: some misc modify for testify (tikv#5299)

ref tikv#4813

Signed-off-by: lhy1024 <admin@liudos.us>

pkg/assertutil/assertutil_test.go

@@ -31,5 +31,5 @@ func TestNilFail(t *testing.T) {
 	}
 	re.Nil(checker.IsNil)
 	checker.AssertNil(nil)
-	re.NotNil(failErr)
+	re.Error(failErr)
 }

pkg/testutil/operator_check.go

@@ -22,7 +22,7 @@ import (
 // CheckTransferLeader checks if the operator is to transfer leader between the specified source and target stores.
 func CheckTransferLeader(re *require.Assertions, op *operator.Operator, kind operator.OpKind, sourceID, targetID uint64) {
 	re.NotNil(op)
-	re.Equal(op.Len(), 1)
+	re.Equal(1, op.Len())
 	re.Equal(operator.TransferLeader{FromStore: sourceID, ToStore: targetID}, op.Step(0))
 	kind |= operator.OpLeader
 	re.Equal(kind, op.Kind()&kind)
@@ -31,7 +31,7 @@ func CheckTransferLeader(re *require.Assertions, op *operator.Operator, kind ope
 // CheckTransferLeaderFrom checks if the operator is to transfer leader out of the specified store.
 func CheckTransferLeaderFrom(re *require.Assertions, op *operator.Operator, kind operator.OpKind, sourceID uint64) {
 	re.NotNil(op)
-	re.Equal(op.Len(), 1)
+	re.Equal(1, op.Len())
 	re.Equal(sourceID, op.Step(0).(operator.TransferLeader).FromStore)
 	kind |= operator.OpLeader
 	re.Equal(kind, op.Kind()&kind)
@@ -40,7 +40,7 @@ func CheckTransferLeaderFrom(re *require.Assertions, op *operator.Operator, kind
 // CheckMultiTargetTransferLeader checks if the operator is to transfer leader from the specified source to one of the target stores.
 func CheckMultiTargetTransferLeader(re *require.Assertions, op *operator.Operator, kind operator.OpKind, sourceID uint64, targetIDs []uint64) {
 	re.NotNil(op)
-	re.Equal(op.Len(), 1)
+	re.Equal(1, op.Len())
 	expectedOps := make([]interface{}, 0, len(targetIDs))
 	for _, targetID := range targetIDs {
 		expectedOps = append(expectedOps, operator.TransferLeader{FromStore: sourceID, ToStore: targetID, ToStores: targetIDs})
@@ -138,28 +138,6 @@ func CheckRemovePeer(re *require.Assertions, op *operator.Operator, storeID uint
 	}
 }
 
-// CheckTransferLeaderWithTestify checks if the operator is to transfer leader between the specified source and target stores.
-func CheckTransferLeaderWithTestify(re *require.Assertions, op *operator.Operator, kind operator.OpKind, sourceID, targetID uint64) {
-	re.NotNil(op)
-	re.Equal(1, op.Len())
-	re.Equal(operator.TransferLeader{FromStore: sourceID, ToStore: targetID}, op.Step(0))
-	kind |= operator.OpLeader
-	re.Equal(kind, op.Kind()&kind)
-}
-
-// CheckTransferPeerWithTestify checks if the operator is to transfer peer between the specified source and target stores.
-func CheckTransferPeerWithTestify(re *require.Assertions, op *operator.Operator, kind operator.OpKind, sourceID, targetID uint64) {
-	re.NotNil(op)
-
-	steps, _ := trimTransferLeaders(op)
-	re.Len(steps, 3)
-	re.Equal(targetID, steps[0].(operator.AddLearner).ToStore)
-	re.IsType(operator.PromoteLearner{}, steps[1])
-	re.Equal(sourceID, steps[2].(operator.RemovePeer).FromStore)
-	kind |= operator.OpRegion
-	re.Equal(kind, op.Kind()&kind)
-}
-
 // CheckSteps checks if the operator matches the given steps.
 func CheckSteps(re *require.Assertions, op *operator.Operator, steps []operator.OpStep) {
 	re.NotZero(op.Kind() & operator.OpMerge)

server/api/checker_test.go

@@ -57,7 +57,7 @@ func (suite *checkerTestSuite) TearDownSuite() {
 func (suite *checkerTestSuite) TestAPI() {
 	suite.testErrCases()
 
-	cases := []struct {
+	testCases := []struct {
 		name string
 	}{
 		{name: "learner"},
@@ -67,9 +67,9 @@ func (suite *checkerTestSuite) TestAPI() {
 		{name: "merge"},
 		{name: "joint-state"},
 	}
-	for _, ca := range cases {
-		suite.testGetStatus(ca.name)
-		suite.testPauseOrResume(ca.name)
+	for _, testCase := range testCases {
+		suite.testGetStatus(testCase.name)
+		suite.testPauseOrResume(testCase.name)
 	}
 }
 

server/api/scheduler_test.go

@@ -120,7 +120,7 @@ func (suite *scheduleTestSuite) TestAPI() {
 		opt   string
 		value interface{}
 	}
-	cases := []struct {
+	testCases := []struct {
 		name          string
 		createdName   string
 		args          []arg
@@ -321,25 +321,25 @@ func (suite *scheduleTestSuite) TestAPI() {
 			},
 		},
 	}
-	for _, ca := range cases {
+	for _, testCase := range testCases {
 		input := make(map[string]interface{})
-		input["name"] = ca.name
-		for _, a := range ca.args {
+		input["name"] = testCase.name
+		for _, a := range testCase.args {
 			input[a.opt] = a.value
 		}
 		body, err := json.Marshal(input)
 		suite.NoError(err)
-		suite.testPauseOrResume(ca.name, ca.createdName, body)
+		suite.testPauseOrResume(testCase.name, testCase.createdName, body)
 	}
 
 	// test pause and resume all schedulers.
 
 	// add schedulers.
-	cases = cases[:3]
-	for _, ca := range cases {
+	testCases = testCases[:3]
+	for _, testCase := range testCases {
 		input := make(map[string]interface{})
-		input["name"] = ca.name
-		for _, a := range ca.args {
+		input["name"] = testCase.name
+		for _, a := range testCase.args {
 			input[a.opt] = a.value
 		}
 		body, err := json.Marshal(input)
@@ -355,10 +355,10 @@ func (suite *scheduleTestSuite) TestAPI() {
 	err = tu.CheckPostJSON(testDialClient, suite.urlPrefix+"/all", pauseArgs, tu.StatusOK(re))
 	suite.NoError(err)
 	handler := suite.svr.GetHandler()
-	for _, ca := range cases {
-		createdName := ca.createdName
+	for _, testCase := range testCases {
+		createdName := testCase.createdName
 		if createdName == "" {
-			createdName = ca.name
+			createdName = testCase.name
 		}
 		isPaused, err := handler.IsSchedulerPaused(createdName)
 		suite.NoError(err)
@@ -370,10 +370,10 @@ func (suite *scheduleTestSuite) TestAPI() {
 	err = tu.CheckPostJSON(testDialClient, suite.urlPrefix+"/all", pauseArgs, tu.StatusOK(re))
 	suite.NoError(err)
 	time.Sleep(time.Second)
-	for _, ca := range cases {
-		createdName := ca.createdName
+	for _, testCase := range testCases {
+		createdName := testCase.createdName
 		if createdName == "" {
-			createdName = ca.name
+			createdName = testCase.name
 		}
 		isPaused, err := handler.IsSchedulerPaused(createdName)
 		suite.NoError(err)
@@ -391,21 +391,21 @@ func (suite *scheduleTestSuite) TestAPI() {
 	suite.NoError(err)
 	err = tu.CheckPostJSON(testDialClient, suite.urlPrefix+"/all", pauseArgs, tu.StatusOK(re))
 	suite.NoError(err)
-	for _, ca := range cases {
-		createdName := ca.createdName
+	for _, testCase := range testCases {
+		createdName := testCase.createdName
 		if createdName == "" {
-			createdName = ca.name
+			createdName = testCase.name
 		}
 		isPaused, err := handler.IsSchedulerPaused(createdName)
 		suite.NoError(err)
 		suite.False(isPaused)
 	}
 
 	// delete schedulers.
-	for _, ca := range cases {
-		createdName := ca.createdName
+	for _, testCase := range testCases {
+		createdName := testCase.createdName
 		if createdName == "" {
-			createdName = ca.name
+			createdName = testCase.name
 		}
 		suite.deleteScheduler(createdName)
 	}

server/cluster/cluster_test.go

@@ -137,7 +137,7 @@ func TestStoreHeartbeat(t *testing.T) {
 	re.NoError(cluster.HandleStoreHeartbeat(coldHeartBeat))
 	time.Sleep(20 * time.Millisecond)
 	storeStats = cluster.hotStat.RegionStats(statistics.Read, 1)
-	re.Len(storeStats[1], 0)
+	re.Empty(storeStats[1])
 	// After hot heartbeat, we can find region 1 peer again
 	re.NoError(cluster.HandleStoreHeartbeat(hotHeartBeat))
 	time.Sleep(20 * time.Millisecond)
@@ -150,14 +150,14 @@ func TestStoreHeartbeat(t *testing.T) {
 	re.NoError(cluster.HandleStoreHeartbeat(coldHeartBeat))
 	time.Sleep(20 * time.Millisecond)
 	storeStats = cluster.hotStat.RegionStats(statistics.Read, 0)
-	re.Len(storeStats[1], 0)
+	re.Empty(storeStats[1])
 	re.Nil(cluster.HandleStoreHeartbeat(hotHeartBeat))
 	time.Sleep(20 * time.Millisecond)
 	storeStats = cluster.hotStat.RegionStats(statistics.Read, 1)
 	re.Len(storeStats[1], 1)
 	re.Equal(uint64(1), storeStats[1][0].RegionID)
 	storeStats = cluster.hotStat.RegionStats(statistics.Read, 3)
-	re.Len(storeStats[1], 0)
+	re.Empty(storeStats[1])
 	// after 2 hot heartbeats, wo can find region 1 peer again
 	re.NoError(cluster.HandleStoreHeartbeat(hotHeartBeat))
 	re.NoError(cluster.HandleStoreHeartbeat(hotHeartBeat))
@@ -614,7 +614,7 @@ func TestRegionHeartbeatHotStat(t *testing.T) {
 	time.Sleep(1 * time.Second)
 	stats = cluster.hotStat.RegionStats(statistics.Write, 0)
 	re.Len(stats[1], 1)
-	re.Len(stats[2], 0)
+	re.Empty(stats[2])
 	re.Len(stats[3], 1)
 	re.Len(stats[4], 1)
 }
@@ -675,7 +675,7 @@ func TestBucketHeartbeat(t *testing.T) {
 	newRegion2 := regions[1].Clone(core.WithIncConfVer(), core.SetBuckets(nil))
 	re.NoError(cluster.processRegionHeartbeat(newRegion2))
 	re.Nil(cluster.GetRegion(uint64(1)).GetBuckets())
-	re.Len(cluster.GetRegion(uint64(1)).GetBuckets().GetKeys(), 0)
+	re.Empty(cluster.GetRegion(uint64(1)).GetBuckets().GetKeys())
 }
 
 func TestRegionHeartbeat(t *testing.T) {

server/cluster/coordinator_test.go

@@ -200,10 +200,10 @@ func TestDispatch(t *testing.T) {
 
 	// Wait for schedule and turn off balance.
 	waitOperator(re, co, 1)
-	testutil.CheckTransferPeerWithTestify(re, co.opController.GetOperator(1), operator.OpKind(0), 4, 1)
+	testutil.CheckTransferPeer(re, co.opController.GetOperator(1), operator.OpKind(0), 4, 1)
 	re.NoError(co.removeScheduler(schedulers.BalanceRegionName))
 	waitOperator(re, co, 2)
-	testutil.CheckTransferLeaderWithTestify(re, co.opController.GetOperator(2), operator.OpKind(0), 4, 2)
+	testutil.CheckTransferLeader(re, co.opController.GetOperator(2), operator.OpKind(0), 4, 2)
 	re.NoError(co.removeScheduler(schedulers.BalanceLeaderName))
 
 	stream := mockhbstream.NewHeartbeatStream()
@@ -502,7 +502,7 @@ func TestCheckCache(t *testing.T) {
 	co.patrolRegions()
 	oc := co.opController
 	re.Len(oc.GetOperators(), 1)
-	re.Len(co.checkers.GetWaitingRegions(), 0)
+	re.Empty(co.checkers.GetWaitingRegions())
 
 	// case 2: operator cannot be created due to store limit restriction
 	oc.RemoveOperator(oc.GetOperator(1))
@@ -517,7 +517,7 @@ func TestCheckCache(t *testing.T) {
 	co.wg.Add(1)
 	co.patrolRegions()
 	re.Len(oc.GetOperators(), 1)
-	re.Len(co.checkers.GetWaitingRegions(), 0)
+	re.Empty(co.checkers.GetWaitingRegions())
 
 	co.wg.Wait()
 	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/break-patrol"))
@@ -540,7 +540,7 @@ func TestPeerState(t *testing.T) {
 
 	// Wait for schedule.
 	waitOperator(re, co, 1)
-	testutil.CheckTransferPeerWithTestify(re, co.opController.GetOperator(1), operator.OpKind(0), 4, 1)
+	testutil.CheckTransferPeer(re, co.opController.GetOperator(1), operator.OpKind(0), 4, 1)
 
 	region := tc.GetRegion(1).Clone()
 
@@ -671,7 +671,7 @@ func TestAddScheduler(t *testing.T) {
 	re.NoError(co.removeScheduler(schedulers.BalanceRegionName))
 	re.NoError(co.removeScheduler(schedulers.HotRegionName))
 	re.NoError(co.removeScheduler(schedulers.SplitBucketName))
-	re.Len(co.schedulers, 0)
+	re.Empty(co.schedulers)
 
 	stream := mockhbstream.NewHeartbeatStream()
 
@@ -861,8 +861,8 @@ func TestRemoveScheduler(t *testing.T) {
 	// all removed
 	sches, _, err = storage.LoadAllScheduleConfig()
 	re.NoError(err)
-	re.Len(sches, 0)
-	re.Len(co.schedulers, 0)
+	re.Empty(sches)
+	re.Empty(co.schedulers)
 	re.NoError(co.cluster.opt.Persist(co.cluster.storage))
 	co.stop()
 	co.wg.Wait()
@@ -874,7 +874,7 @@ func TestRemoveScheduler(t *testing.T) {
 	tc.RaftCluster.opt = newOpt
 	co = newCoordinator(ctx, tc.RaftCluster, hbStreams)
 	co.run()
-	re.Len(co.schedulers, 0)
+	re.Empty(co.schedulers)
 	// the option remains default scheduler
 	re.Len(co.cluster.opt.GetSchedulers(), 4)
 	co.stop()
@@ -1053,7 +1053,7 @@ func TestStoreOverloaded(t *testing.T) {
 		if time.Since(start) > time.Second {
 			break
 		}
-		re.Len(ops, 0)
+		re.Empty(ops)
 	}
 
 	// reset all stores' limit
@@ -1103,7 +1103,7 @@ func TestStoreOverloadedWithReplace(t *testing.T) {
 	op3 := newTestOperator(1, tc.GetRegion(2).GetRegionEpoch(), operator.OpRegion, operator.AddPeer{ToStore: 1, PeerID: 3})
 	re.False(oc.AddOperator(op3))
 	ops, _ := lb.Schedule(tc, false /* dryRun */)
-	re.Len(ops, 0)
+	re.Empty(ops)
 	// sleep 2 seconds to make sure that token is filled up
 	time.Sleep(2 * time.Second)
 	ops, _ = lb.Schedule(tc, false /* dryRun */)
@@ -1186,7 +1186,7 @@ func TestController(t *testing.T) {
 
 	for i := schedulers.MinScheduleInterval; sc.GetInterval() != schedulers.MaxScheduleInterval; i = sc.GetNextInterval(i) {
 		re.Equal(i, sc.GetInterval())
-		re.Len(sc.Schedule(), 0)
+		re.Empty(sc.Schedule())
 	}
 	// limit = 2
 	lb.limit = 2
@@ -1269,7 +1269,7 @@ func TestInterval(t *testing.T) {
 	for _, n := range idleSeconds {
 		sc.nextInterval = schedulers.MinScheduleInterval
 		for totalSleep := time.Duration(0); totalSleep <= time.Second*time.Duration(n); totalSleep += sc.GetInterval() {
-			re.Len(sc.Schedule(), 0)
+			re.Empty(sc.Schedule())
 		}
 		re.Less(sc.GetInterval(), time.Second*time.Duration(n/2))
 	}

server/cluster/unsafe_recovery_controller_test.go

@@ -195,7 +195,7 @@ func TestFinished(t *testing.T) {
 		recoveryController.HandleStoreHeartbeat(req, resp)
 		re.NotNil(resp.RecoveryPlan)
 		re.NotNil(resp.RecoveryPlan.ForceLeader)
-		re.Equal(1, len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders))
+		re.Len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders, 1)
 		re.NotNil(resp.RecoveryPlan.ForceLeader.FailedStores)
 		applyRecoveryPlan(re, storeID, reports, resp)
 	}
@@ -207,7 +207,7 @@ func TestFinished(t *testing.T) {
 		resp := &pdpb.StoreHeartbeatResponse{}
 		recoveryController.HandleStoreHeartbeat(req, resp)
 		re.NotNil(resp.RecoveryPlan)
-		re.Equal(1, len(resp.RecoveryPlan.Demotes))
+		re.Len(resp.RecoveryPlan.Demotes, 1)
 		applyRecoveryPlan(re, storeID, reports, resp)
 	}
 	re.Equal(demoteFailedVoter, recoveryController.GetStage())
@@ -274,7 +274,7 @@ func TestFailed(t *testing.T) {
 		recoveryController.HandleStoreHeartbeat(req, resp)
 		re.NotNil(resp.RecoveryPlan)
 		re.NotNil(resp.RecoveryPlan.ForceLeader)
-		re.Equal(1, len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders))
+		re.Len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders, 1)
 		re.NotNil(resp.RecoveryPlan.ForceLeader.FailedStores)
 		applyRecoveryPlan(re, storeID, reports, resp)
 	}
@@ -286,7 +286,7 @@ func TestFailed(t *testing.T) {
 		resp := &pdpb.StoreHeartbeatResponse{}
 		recoveryController.HandleStoreHeartbeat(req, resp)
 		re.NotNil(resp.RecoveryPlan)
-		re.Equal(1, len(resp.RecoveryPlan.Demotes))
+		re.Len(resp.RecoveryPlan.Demotes, 1)
 		applyRecoveryPlan(re, storeID, reports, resp)
 	}
 	re.Equal(demoteFailedVoter, recoveryController.GetStage())
@@ -433,7 +433,7 @@ func TestAffectedTableID(t *testing.T) {
 
 	advanceUntilFinished(re, recoveryController, reports)
 
-	re.Equal(1, len(recoveryController.affectedTableIDs))
+	re.Len(recoveryController.affectedTableIDs, 1)
 	_, exists := recoveryController.affectedTableIDs[6]
 	re.True(exists)
 }
@@ -494,7 +494,7 @@ func TestForceLeaderForCommitMerge(t *testing.T) {
 	// force leader on regions of commit merge first
 	re.NotNil(resp.RecoveryPlan)
 	re.NotNil(resp.RecoveryPlan.ForceLeader)
-	re.Equal(1, len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders))
+	re.Len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders, 1)
 	re.Equal(uint64(1002), resp.RecoveryPlan.ForceLeader.EnterForceLeaders[0])
 	re.NotNil(resp.RecoveryPlan.ForceLeader.FailedStores)
 	applyRecoveryPlan(re, 1, reports, resp)
@@ -505,7 +505,7 @@ func TestForceLeaderForCommitMerge(t *testing.T) {
 	// force leader on the rest regions
 	re.NotNil(resp.RecoveryPlan)
 	re.NotNil(resp.RecoveryPlan.ForceLeader)
-	re.Equal(1, len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders))
+	re.Len(resp.RecoveryPlan.ForceLeader.EnterForceLeaders, 1)
 	re.Equal(uint64(1001), resp.RecoveryPlan.ForceLeader.EnterForceLeaders[0])
 	re.NotNil(resp.RecoveryPlan.ForceLeader.FailedStores)
 	applyRecoveryPlan(re, 1, reports, resp)