Merge pull request #128 from maxatome/fix-iface-nil

fix: reflect.Interface containing nil

Author: maxatome

td/equal.go

@@ -116,19 +116,19 @@ func isCustomEqual(a, b reflect.Value) (bool, bool) {
 }
 
 func deepValueEqual(ctx ctxerr.Context, got, expected reflect.Value) (err *ctxerr.Error) {
+	// "got" must not implement testDeeper
+	if got.IsValid() && got.Type().Implements(testDeeper) {
+		panic(color.Bad("Found a TestDeep operator in got param, " +
+			"can only use it in expected one!"))
+	}
+
 	if !got.IsValid() || !expected.IsValid() {
 		if got.IsValid() == expected.IsValid() {
 			return
 		}
 		return nilHandler(ctx, got, expected)
 	}
 
-	// "got" must not implement testDeeper
-	if got.Type().Implements(testDeeper) {
-		panic(color.Bad("Found a TestDeep operator in got param, " +
-			"can only use it in expected one!"))
-	}
-
 	// Check if a Smuggle hook matches got type
 	if handled, e := ctx.Hooks.Smuggle(&got); handled {
 		if e != nil {
@@ -308,19 +308,6 @@ func deepValueEqual(ctx ctxerr.Context, got, expected reflect.Value) (err *ctxer
 		return
 
 	case reflect.Interface:
-		if got.IsNil() || expected.IsNil() {
-			if got.IsNil() == expected.IsNil() {
-				return
-			}
-			if ctx.BooleanError {
-				return ctxerr.BooleanError
-			}
-			return ctx.CollectError(&ctxerr.Error{
-				Message:  "nil interface",
-				Got:      isNilStr(got.IsNil()),
-				Expected: isNilStr(expected.IsNil()),
-			})
-		}
 		return deepValueEqual(ctx, got.Elem(), expected.Elem())
 
 	case reflect.Ptr:

td/equal_test.go

@@ -234,17 +234,17 @@ func TestEqualInterface(t *testing.T) {
 
 	checkError(t, []interface{}{1, nil}, []interface{}{1, "foo"},
 		expectedError{
-			Message:  mustBe("nil interface"),
+			Message:  mustBe("values differ"),
 			Path:     mustBe("DATA[1]"),
 			Got:      mustBe("nil"),
-			Expected: mustBe("not nil"),
+			Expected: mustBe(`"foo"`),
 		})
 
 	checkError(t, []interface{}{1, "foo"}, []interface{}{1, nil},
 		expectedError{
-			Message:  mustBe("nil interface"),
+			Message:  mustBe("values differ"),
 			Path:     mustBe("DATA[1]"),
-			Got:      mustBe("not nil"),
+			Got:      mustBe(`"foo"`),
 			Expected: mustBe("nil"),
 		})
 

td/td_json_test.go

@@ -7,6 +7,7 @@
 package td_test
 
 import (
+	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"os"
@@ -116,6 +117,32 @@ func TestJSON(t *testing.T) {
 			td.Tag("age", td.Between(40, 45)),
 			td.Tag("name", td.Re(`^Bob`))))
 
+	//
+	// nil++
+	checkOK(t, nil, td.JSON(`$1`, nil))
+	checkOK(t, (*int)(nil), td.JSON(`$1`, td.Nil()))
+
+	checkOK(t, nil, td.JSON(`$x`, td.Tag("x", nil)))
+	checkOK(t, (*int)(nil), td.JSON(`$x`, td.Tag("x", nil)))
+
+	checkOK(t, json.RawMessage(`{"foo": null}`), td.JSON(`{"foo": null}`))
+
+	checkOK(t,
+		json.RawMessage(`{"foo": null}`),
+		td.JSON(`{"foo": $1}`, nil))
+
+	checkOK(t,
+		json.RawMessage(`{"foo": null}`),
+		td.JSON(`{"foo": $1}`, td.Nil()))
+
+	checkOK(t,
+		json.RawMessage(`{"foo": null}`),
+		td.JSON(`{"foo": $x}`, td.Tag("x", nil)))
+
+	checkOK(t,
+		json.RawMessage(`{"foo": null}`),
+		td.JSON(`{"foo": $x}`, td.Tag("x", td.Nil())))
+
 	//
 	// Loading a file
 	tmpDir, err := ioutil.TempDir("", "")

td/td_nil_test.go

@@ -22,6 +22,10 @@ func TestNil(t *testing.T) {
 	checkOK(t, (*int)(nil), td.Nil())
 	checkOK(t, (chan int)(nil), td.Nil())
 	checkOK(t, nil, td.Nil())
+	checkOK(t,
+		map[string]interface{}{"foo": nil},
+		map[string]interface{}{"foo": td.Nil()},
+	)
 
 	var got fmt.Stringer = (*bytes.Buffer)(nil)
 	checkOK(t, got, td.Nil())