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

Allow assert.Equal on string type alias without panicking on failure #661

Merged
merged 1 commit into from Oct 2, 2018
Merged

Allow assert.Equal on string type alias without panicking on failure #661

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion assert/assertions.go
View file
Open in desktop
Expand Up @@ -1345,7 +1345,7 @@ func diff(expected interface{}, actual interface{}) string {
}

var e, a string
if ek != reflect.String {
if et != reflect.TypeOf("") {
e = spewConfig.Sdump(expected)
a = spewConfig.Sdump(actual)
} else {
Expand Down
8 changes: 8 additions & 0 deletions assert/assertions_test.go
View file
Open in desktop
Expand Up @@ -175,6 +175,8 @@ func TestIsType(t *testing.T) {

}

type myType string

func TestEqual(t *testing.T) {

mockT := new(testing.T)
Expand All @@ -200,13 +202,19 @@ func TestEqual(t *testing.T) {
if !Equal(mockT, uint64(123), uint64(123)) {
t.Error("Equal should return true")
}
if !Equal(mockT, myType("1"), myType("1")) {
t.Error("Equal should return true")
}
if !Equal(mockT, &struct{}{}, &struct{}{}) {
t.Error("Equal should return true (pointer equality is based on equality of underlying value)")
}
var m map[string]interface{}
if Equal(mockT, m["bar"], "something") {
t.Error("Equal should return false")
}
if Equal(mockT, myType("1"), myType("2")) {
t.Error("Equal should return false")
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This test will panic if the fix in assert/assertions.go is reverted.

}

// bufferT implements TestingT. Its implementation of Errorf writes the output that would be produced by
Expand Down