diff --git a/expression/column_test.go b/expression/column_test.go index 5251df2c9d563..da6eee5d6b0c2 100644 --- a/expression/column_test.go +++ b/expression/column_test.go @@ -71,7 +71,7 @@ func TestColumn(t *testing.T) { decimalCorCol := &CorrelatedColumn{Column: Column{RetType: types.NewFieldType(mysql.TypeNewDecimal)}, Data: &decimalDatum} decVal, isNull, err := decimalCorCol.EvalDecimal(ctx, chunk.Row{}) - require.Equal(t, 0, decVal.Compare(types.NewDecFromStringForTest("1.2"))) + require.Zero(t, decVal.Compare(types.NewDecFromStringForTest("1.2"))) require.False(t, isNull) require.NoError(t, err) @@ -86,7 +86,7 @@ func TestColumn(t *testing.T) { durationCorCol := &CorrelatedColumn{Column: Column{RetType: types.NewFieldType(mysql.TypeDuration)}, Data: &durationDatum} durationVal, isNull, err := durationCorCol.EvalDuration(ctx, chunk.Row{}) - require.Equal(t, 0, durationVal.Compare(duration)) + require.Zero(t, durationVal.Compare(duration)) require.False(t, isNull) require.NoError(t, err) @@ -94,7 +94,7 @@ func TestColumn(t *testing.T) { timeCorCol := &CorrelatedColumn{Column: Column{RetType: types.NewFieldType(mysql.TypeDatetime)}, Data: &timeDatum} timeVal, isNull, err := timeCorCol.EvalTime(ctx, chunk.Row{}) - require.Equal(t, 0, timeVal.Compare(tm)) + require.Zero(t, timeVal.Compare(tm)) require.False(t, isNull) require.NoError(t, err) } @@ -154,21 +154,21 @@ func TestIndexInfo2Cols(t *testing.T) { cols := []*Column{col0} colInfos := []*model.ColumnInfo{colInfo0} resCols, lengths := IndexInfo2PrefixCols(colInfos, cols, indexInfo) - require.Equal(t, 1, len(resCols)) - require.Equal(t, 1, len(lengths)) + require.Len(t, resCols, 1) + require.Len(t, lengths, 1) require.True(t, resCols[0].Equal(nil, col0)) cols = []*Column{col1} colInfos = []*model.ColumnInfo{colInfo1} resCols, lengths = IndexInfo2PrefixCols(colInfos, cols, indexInfo) - require.Equal(t, 0, len(resCols)) - require.Equal(t, 0, len(lengths)) + require.Len(t, resCols, 0) + require.Len(t, lengths, 0) cols = []*Column{col0, col1} colInfos = []*model.ColumnInfo{colInfo0, colInfo1} resCols, lengths = IndexInfo2PrefixCols(colInfos, cols, indexInfo) - require.Equal(t, 2, len(resCols)) - require.Equal(t, 2, len(lengths)) + require.Len(t, resCols, 2) + require.Len(t, lengths, 2) require.True(t, resCols[0].Equal(nil, col0)) require.True(t, resCols[1].Equal(nil, col1)) }