Skip to content

assert: preserve zero-valued elements in collection comparisons #1998

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

Open
gdpu11 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

assert: preserve zero-valued elements in collection comparisons #1998

Show file tree
Hide file tree
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
22 changes: 11 additions & 11 deletions assert/assertions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,10 +1141,6 @@ func ElementsMatch(t TestingT, listA, listB interface{}, msgAndArgs ...interface
if h, ok := t.(tHelper); ok {
h.Helper()
}
if isEmpty(listA) && isEmpty(listB) {
return true
}

if !isList(t, listA, msgAndArgs...) || !isList(t, listB, msgAndArgs...) {
return false
}
Expand All @@ -1158,8 +1154,11 @@ func ElementsMatch(t TestingT, listA, listB interface{}, msgAndArgs ...interface
return Fail(t, formatListDiff(listA, listB, extraA, extraB), msgAndArgs...)
}

// isList checks that the provided value is array or slice.
// isList checks that the provided value is nil, an array, or a slice.
func isList(t TestingT, list interface{}, msgAndArgs ...interface{}) (ok bool) {
if list == nil {
return true
}
kind := reflect.TypeOf(list).Kind()
if kind != reflect.Array && kind != reflect.Slice {
return Fail(t, fmt.Sprintf("%q has an unsupported type %s, expecting array or slice", list, kind),
Expand All @@ -1175,8 +1174,13 @@ func diffLists(listA, listB interface{}) (extraA, extraB []interface{}) {
aValue := reflect.ValueOf(listA)
bValue := reflect.ValueOf(listB)

aLen := aValue.Len()
bLen := bValue.Len()
var aLen, bLen int
if aValue.IsValid() {
aLen = aValue.Len()
}
if bValue.IsValid() {
bLen = bValue.Len()
}

// Mark indexes in bValue that we already used
visited := make([]bool, bLen)
Expand Down Expand Up @@ -1242,10 +1246,6 @@ func NotElementsMatch(t TestingT, listA, listB interface{}, msgAndArgs ...interf
if h, ok := t.(tHelper); ok {
h.Helper()
}
if isEmpty(listA) && isEmpty(listB) {
return Fail(t, "listA and listB contain the same elements", msgAndArgs)
}

if !isList(t, listA, msgAndArgs...) {
return Fail(t, "listA is not a list type", msgAndArgs...)
}
Expand Down
12 changes: 12 additions & 0 deletions assert/assertions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,11 +1365,17 @@ func TestElementsMatch(t *testing.T) {
{[]string{"hello", "hello", "world"}, []string{"hello", "world", "hello"}, true},
{[3]string{"hello", "hello", "world"}, [3]string{"hello", "world", "hello"}, true},
{[]int{}, nil, true},
{[0]int{}, nil, true},
{[2]int{}, []int{0, 0}, true},

// not matching
{[]int{1}, []int{1, 1}, false},
{[]int{1, 2}, []int{2, 2}, false},
{[]string{"hello", "hello"}, []string{"hello"}, false},
{[2]int{}, []int{}, false},
{[2]int{}, [1]int{}, false},
{nil, []int{1}, false},
{[]int{1}, nil, false},
}

for _, c := range cases {
Expand Down Expand Up @@ -1490,6 +1496,10 @@ func TestNotElementsMatch(t *testing.T) {
{[]string{"hello"}, []string{"world"}, true},
{[]string{"hello", "hello"}, []string{"world", "world"}, true},
{[3]string{"hello", "hello", "hello"}, [3]string{"world", "world", "world"}, true},
{[2]int{}, []int{}, true},
{[2]int{}, [1]int{}, true},
{nil, []int{1}, true},
{[]int{1}, nil, true},

// matching
{nil, nil, false},
Expand All @@ -1504,6 +1514,8 @@ func TestNotElementsMatch(t *testing.T) {
{[]string{"hello", "hello"}, []string{"hello", "hello"}, false},
{[]string{"hello", "hello", "world"}, []string{"hello", "world", "hello"}, false},
{[3]string{"hello", "hello", "world"}, [3]string{"hello", "world", "hello"}, false},
{[0]int{}, nil, false},
{[2]int{}, []int{0, 0}, false},
}

for _, c := range cases {
Expand Down
Loading