Skip to content
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

Jump to bottom

Fix #1083 (Nil-pointer dereference) #1084

Merged
merged 5 commits into from
Aug 24, 2021
Merged

Fix #1083 (Nil-pointer dereference) #1084

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
087e873
fix potential nil-pointer dereference
mvrahden May 30, 2021
8a3a710
fix funtion name
mvrahden Jul 4, 2021
41a52e4
fix linting errors in /assert package
mvrahden Jul 4, 2021
243b42b
Merge branch 'stretchr:master' into fix-1083
mvrahden Jul 8, 2021
25e03a7
Merge branch 'stretchr:master' into fix-1083
mvrahden Jul 9, 2021
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
6 changes: 5 additions & 1 deletion assert/assertions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,11 @@ func NotEqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...inte
func includeElement(list interface{}, element interface{}) (ok, found bool) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something seems wrong with the docstring of this function... Do you mind updating the function name in line 717?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, they are not synced. I fixed that and fixed further linting issues in the assert package.


listValue := reflect.ValueOf(list)
listKind := reflect.TypeOf(list).Kind()
listType := reflect.TypeOf(list)
if listType == nil {
return false, false
}
listKind := listType.Kind()
defer func() {
if e := recover(); e != nil {
ok = false
Expand Down
18 changes: 18 additions & 0 deletions assert/assertions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,7 @@ func TestContainsNotContains(t *testing.T) {
{"j", "k"},
}
simpleMap := map[interface{}]interface{}{"Foo": "Bar"}
var zeroMap map[interface{}]interface{}

cases := []struct {
expected interface{}
Expand All @@ -606,6 +607,7 @@ func TestContainsNotContains(t *testing.T) {
{complexList, &A{"g", "e"}, false},
{simpleMap, "Foo", true},
{simpleMap, "Bar", false},
{zeroMap, "Bar", false},
}

for _, c := range cases {
Expand Down Expand Up @@ -652,6 +654,22 @@ func TestContainsFailMessage(t *testing.T) {
}
}

func TestContainsNotContainsOnNilValue(t *testing.T) {
mockT := new(mockTestingT)

Contains(mockT, nil, "key")
expectedFail := "<nil> could not be applied builtin len()"
actualFail := mockT.errorString()
if !strings.Contains(actualFail, expectedFail) {
t.Errorf("Contains failure should include %q but was %q", expectedFail, actualFail)
}

NotContains(mockT, nil, "key")
if !strings.Contains(actualFail, expectedFail) {
t.Errorf("Contains failure should include %q but was %q", expectedFail, actualFail)
}
}

func TestSubsetNotSubset(t *testing.T) {

// MTestCase adds a custom message to the case
Expand Down