Skip to content

Commit 1c264b1

Browse files
HaraldNordgrenernesto-jimenez
authored andcommitted
Refactor ObjectsAreEqual()
1 parent 2a15e20 commit 1c264b1

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

assert/assertions.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,23 @@ type Comparison func() (success bool)
5454
//
5555
// This function does no assertion of any kind.
5656
func ObjectsAreEqual(expected, actual interface{}) bool {
57-
5857
if expected == nil || actual == nil {
5958
return expected == actual
6059
}
61-
if exp, ok := expected.([]byte); ok {
62-
act, ok := actual.([]byte)
63-
if !ok {
64-
return false
65-
} else if exp == nil || act == nil {
66-
return exp == nil && act == nil
67-
}
68-
return bytes.Equal(exp, act)
60+
61+
exp, ok := expected.([]byte)
62+
if !ok {
63+
return reflect.DeepEqual(expected, actual)
6964
}
70-
return reflect.DeepEqual(expected, actual)
7165

66+
act, ok := actual.([]byte)
67+
if !ok {
68+
return false
69+
}
70+
if exp == nil || act == nil {
71+
return exp == nil && act == nil
72+
}
73+
return bytes.Equal(exp, act)
7274
}
7375

7476
// ObjectsAreEqualValues gets whether two objects are equal, or if their

0 commit comments

Comments
 (0)