Skip to content

Commit cebbd4a

Browse files
committed
chore: rename Equal and NotEqual to DeepEqual and NotDeepEqual.
1 parent 2be05c2 commit cebbd4a

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

assertion.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ func New(t *testing.T) *Assertion {
1515
return a
1616
}
1717

18-
// Equal tests equality between actual and expect parameters.
19-
func (a *Assertion) Equal(actual, expect any, message ...string) error {
20-
return Equal(a.t, actual, expect, message...)
18+
// DeepEqual tests deeply equality between actual and expect parameters.
19+
func (a *Assertion) DeepEqual(actual, expect any, message ...string) error {
20+
return DeepEqual(a.t, actual, expect, message...)
2121
}
2222

23-
// NotEqual tests inequality between actual and expected parameters.
24-
func (a *Assertion) NotEqual(actual, expect any, message ...string) error {
25-
return NotEqual(a.t, actual, expect, message...)
23+
// NotDeepEqual tests deeply inequality between actual and expected parameters.
24+
func (a *Assertion) NotDeepEqual(actual, expect any, message ...string) error {
25+
return NotDeepEqual(a.t, actual, expect, message...)
2626
}
2727

2828
// Panic expects the function fn to panic.

equal.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
)
88

9-
// Equal tests equality between actual and expect parameters.
10-
func Equal(t *testing.T, actual, expect any, message ...string) error {
9+
// DeepEqual tests deeply equality between actual and expect parameters.
10+
func DeepEqual(t *testing.T, actual, expect any, message ...string) error {
1111
if reflect.DeepEqual(actual, expect) {
1212
return nil
1313
}
@@ -19,8 +19,8 @@ func Equal(t *testing.T, actual, expect any, message ...string) error {
1919
return err
2020
}
2121

22-
// NotEqual tests inequality between actual and expected parameters.
23-
func NotEqual(t *testing.T, actual, expect any, message ...string) error {
22+
// NotDeepEqual tests deeply inequality between actual and expected parameters.
23+
func NotDeepEqual(t *testing.T, actual, expect any, message ...string) error {
2424
if !reflect.DeepEqual(actual, expect) {
2525
return nil
2626
}

equal_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@ type testStruct struct {
66
v int
77
}
88

9-
func TestEqualAndNotEqual(t *testing.T) {
9+
func TestDeepEqualAndNotDeepEqual(t *testing.T) {
1010
mockT := new(testing.T)
1111
assertion := New(mockT)
1212

13-
testEqualAndNotEqual(t, assertion, 1, 1, true)
14-
testEqualAndNotEqual(t, assertion, 1, 2, false)
15-
testEqualAndNotEqual(t, assertion, 1, 1.0, false)
16-
testEqualAndNotEqual(t, assertion, 1, "1", false)
17-
testEqualAndNotEqual(t, assertion, 1, '1', false)
18-
testEqualAndNotEqual(t, assertion, 1, []int{1}, false)
19-
testEqualAndNotEqual(t, assertion, []int{1}, []int{1}, true)
13+
testDeepEqualAndNotDeepEqual(t, assertion, 1, 1, true)
14+
testDeepEqualAndNotDeepEqual(t, assertion, 1, 2, false)
15+
testDeepEqualAndNotDeepEqual(t, assertion, 1, 1.0, false)
16+
testDeepEqualAndNotDeepEqual(t, assertion, 1, "1", false)
17+
testDeepEqualAndNotDeepEqual(t, assertion, 1, '1', false)
18+
testDeepEqualAndNotDeepEqual(t, assertion, 1, []int{1}, false)
19+
testDeepEqualAndNotDeepEqual(t, assertion, []int{1}, []int{1}, true)
2020

2121
obj1 := testStruct{v: 1}
2222
obj2 := testStruct{v: 1}
2323

24-
testEqualAndNotEqual(t, assertion, obj1, obj2, true)
25-
testEqualAndNotEqual(t, assertion, obj1, &obj2, false)
26-
testEqualAndNotEqual(t, assertion, &obj1, &obj2, true)
24+
testDeepEqualAndNotDeepEqual(t, assertion, obj1, obj2, true)
25+
testDeepEqualAndNotDeepEqual(t, assertion, obj1, &obj2, false)
26+
testDeepEqualAndNotDeepEqual(t, assertion, &obj1, &obj2, true)
2727

2828
obj2.v = 2
29-
testEqualAndNotEqual(t, assertion, obj1, obj2, false)
30-
testEqualAndNotEqual(t, assertion, &obj1, &obj2, false)
29+
testDeepEqualAndNotDeepEqual(t, assertion, obj1, obj2, false)
30+
testDeepEqualAndNotDeepEqual(t, assertion, &obj1, &obj2, false)
3131
}
3232

33-
func testEqualAndNotEqual(t *testing.T, assertion *Assertion, v1, v2 any, isEqual bool) {
34-
err := assertion.Equal(v1, v2)
33+
func testDeepEqualAndNotDeepEqual(t *testing.T, assertion *Assertion, v1, v2 any, isEqual bool) {
34+
err := assertion.DeepEqual(v1, v2)
3535
if isEqual && err != nil {
3636
t.Errorf("Equal(%v, %v) = %v, want = nil", v1, v2, err)
3737
} else if !isEqual && err == nil {
3838
t.Errorf("Equal(%v, %v) = nil, want = error", v1, v2)
3939
}
4040

41-
err = assertion.NotEqual(v1, v2)
41+
err = assertion.NotDeepEqual(v1, v2)
4242
if isEqual && err == nil {
4343
t.Errorf("NotEqual(%v, %v) = nil, want = error", v1, v2)
4444
} else if !isEqual && err != nil {

0 commit comments

Comments
 (0)