client: Removed AssertEqual function
Used github.com/stretchr/testify/assert to replace the AssertEqual function definition. Required the use of copyToInterface to copy a string slice to the empty interface slice
package testutil
import (
- "fmt"
"reflect"
"testing"
+
+ "github.com/stretchr/testify/assert"
)
-func AssertEqual(t *testing.T, e, a interface{}, msg ...string) {
- t.Helper()
- if (e == nil || a == nil) && (isNil(e) && isNil(a)) {
- return
- }
- if reflect.DeepEqual(e, a) {
- return
+func copyToInterface(msg ...string) []interface{} {
+ newMsg := make([]interface{}, len(msg))
+ for i, v := range msg {
+ newMsg[i] = v
}
- s := ""
- if len(msg) > 0 {
- s = msg[0] + ": "
- }
-
- s = fmt.Sprintf("%s:expected %+v, got %+v", s, e, a)
- FatalStack(t, s)
+ return newMsg
}
func AssertNil(t *testing.T, v interface{}) {
t.Helper()
- AssertEqual(t, nil, v)
+ assert.Equal(t, nil, v)
}
func AssertNotNil(t *testing.T, v interface{}) {
@@ -51,12 +43,14 @@ func AssertNotNil(t *testing.T, v interface{}) {
func AssertTrue(t *testing.T, v bool, msg ...string) {
t.Helper()
- AssertEqual(t, true, v, msg...)
+ newMsg := copyToInterface(msg...)
+ assert.Equal(t, true, v, newMsg)
}
func AssertFalse(t *testing.T, v bool, msg ...string) {
t.Helper()
- AssertEqual(t, false, v, msg...)
+ newMsg := copyToInterface(msg...)
+ assert.Equal(t, false, v, newMsg)
}
func isNil(v interface{}) bool {
