Skip to content

fix(assert): check slice lengths in InDeltaSlice and fix argument ordering #1961

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
aoright wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −2
Open

fix(assert): check slice lengths in InDeltaSlice and fix argument ordering #1961

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
8 changes: 6 additions & 2 deletions assert/assertions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,8 +1497,12 @@ func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAn
actualSlice := reflect.ValueOf(actual)
expectedSlice := reflect.ValueOf(expected)

for i := 0; i < actualSlice.Len(); i++ {
result := InDelta(t, actualSlice.Index(i).Interface(), expectedSlice.Index(i).Interface(), delta, msgAndArgs...)
if actualSlice.Len() != expectedSlice.Len() {
return Fail(t, fmt.Sprintf("Lengths of slices must be equal: expected %d, got %d", expectedSlice.Len(), actualSlice.Len()), msgAndArgs...)
}

for i := 0; i < expectedSlice.Len(); i++ {
result := InDelta(t, expectedSlice.Index(i).Interface(), actualSlice.Index(i).Interface(), delta, msgAndArgs...)
if !result {
return result
}
Expand Down
2 changes: 2 additions & 0 deletions assert/assertions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2360,6 +2360,8 @@ func TestInDeltaSlice(t *testing.T) {
0.1), "{1, NaN, 2} is not element-wise close to {0, NaN, 3} in delta=0.1")

False(t, InDeltaSlice(mockT, "", nil, 1), "Expected non numeral slices to fail")
False(t, InDeltaSlice(mockT, []float64{1.0, 2.0, 3.0}, []float64{1.0, 2.0}, 0.1), "Expected different length slices to fail")
False(t, InDeltaSlice(mockT, []float64{1.0, 2.0}, []float64{1.0, 2.0, 3.0}, 0.1), "Expected different length slices to fail")
}

func TestInDeltaMapValues(t *testing.T) {
Expand Down