Skip to content

meta: replace pingcap/check with testing #2559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xhebox merged 1 commit into from
Jul 24, 2025
Merged

meta: replace pingcap/check with testing #2559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions pkg/meta/err_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ import (
"errors"
"testing"

"github.com/pingcap/check"
"github.com/stretchr/testify/require"
)

func TestValidateErrIs(t *testing.T) {
var c *check.C
err0 := &ValidateErr{
Type: "dummy",
Target: "test",
Expand All @@ -30,16 +29,16 @@ func TestValidateErrIs(t *testing.T) {
Value: 1,
}
// identical errors are equal
c.Assert(errors.Is(err0, err0), check.IsTrue)
c.Assert(errors.Is(ErrValidate, ErrValidate), check.IsTrue)
c.Assert(errors.Is(ErrValidate, &ValidateErr{}), check.IsTrue)
c.Assert(errors.Is(&ValidateErr{}, ErrValidate), check.IsTrue)
require.True(t, errors.Is(err0, err0))
require.True(t, errors.Is(ErrValidate, ErrValidate))
require.True(t, errors.Is(ErrValidate, &ValidateErr{}))
require.True(t, errors.Is(&ValidateErr{}, ErrValidate))
// not equal for different error types
c.Assert(errors.Is(err0, errors.New("")), check.IsFalse)
require.False(t, errors.Is(err0, errors.New("")))
// default Value matches any error
c.Assert(errors.Is(err0, ErrValidate), check.IsTrue)
require.True(t, errors.Is(err0, ErrValidate))
// error with values are not matching default ones
c.Assert(errors.Is(ErrValidate, err0), check.IsFalse)
require.False(t, errors.Is(ErrValidate, err0))

err1 := &ValidateErr{
Type: TypeConflict,
Expand All @@ -48,15 +47,15 @@ func TestValidateErrIs(t *testing.T) {
RHS: "RHS",
Value: 2,
}
c.Assert(errors.Is(err1, ErrValidate), check.IsTrue)
require.True(t, errors.Is(err1, ErrValidate))
// errors with different values are not equal
c.Assert(errors.Is(err0, err1), check.IsFalse)
c.Assert(errors.Is(err1, err0), check.IsFalse)
require.False(t, errors.Is(err0, err1))
require.False(t, errors.Is(err1, err0))

// errors with different types are not equal
err0.Value = 2
c.Assert(errors.Is(err0, err1), check.IsFalse)
c.Assert(errors.Is(err1, err0), check.IsFalse)
require.False(t, errors.Is(err0, err1))
require.False(t, errors.Is(err1, err0))

err2 := &ValidateErr{
Type: TypeMismatch,
Expand All @@ -68,9 +67,9 @@ func TestValidateErrIs(t *testing.T) {
"key2": "2",
},
}
c.Assert(errors.Is(err2, ErrValidate), check.IsTrue)
c.Assert(errors.Is(err1, err2), check.IsFalse)
c.Assert(errors.Is(err2, err1), check.IsFalse)
require.True(t, errors.Is(err2, ErrValidate))
require.False(t, errors.Is(err1, err2))
require.False(t, errors.Is(err2, err1))

err3 := &ValidateErr{
Type: TypeMismatch,
Expand All @@ -79,10 +78,10 @@ func TestValidateErrIs(t *testing.T) {
RHS: "RHS",
Value: []float64{1.0, 2.0},
}
c.Assert(errors.Is(err3, ErrValidate), check.IsTrue)
require.True(t, errors.Is(err3, ErrValidate))
// different values are not equal
c.Assert(errors.Is(err2, err3), check.IsFalse)
c.Assert(errors.Is(err3, err2), check.IsFalse)
require.False(t, errors.Is(err2, err3))
require.False(t, errors.Is(err3, err2))

err4 := &ValidateErr{
Type: TypeMismatch,
Expand All @@ -91,13 +90,13 @@ func TestValidateErrIs(t *testing.T) {
RHS: "RHS",
Value: nil,
}
c.Assert(errors.Is(err4, ErrValidate), check.IsTrue)
require.True(t, errors.Is(err4, ErrValidate))
// nil Value matches any error if other fields are with the same values
c.Assert(errors.Is(err3, err4), check.IsTrue)
c.Assert(errors.Is(err4, err3), check.IsFalse)
require.True(t, errors.Is(err3, err4))
require.False(t, errors.Is(err4, err3))

err4.Value = 0
c.Assert(errors.Is(err4, ErrValidate), check.IsTrue)
c.Assert(errors.Is(err3, err4), check.IsFalse)
c.Assert(errors.Is(err4, err3), check.IsFalse)
require.True(t, errors.Is(err4, ErrValidate))
require.False(t, errors.Is(err3, err4))
require.False(t, errors.Is(err4, err3))
}
Loading