Handle reflect invalid and nil cases

Author: segogoreng

assert/assertions.go

@@ -495,10 +495,19 @@ func Kind(t TestingT, expectedKind reflect.Kind, object interface{}, msgAndArgs
 		h.Helper()
 	}
 
+	if expectedKind == reflect.Invalid {
+		return Fail(t, "reflect.Invalid must not be used as expected kind", msgAndArgs...)
+	}
+
+	if object == nil {
+		return Fail(t, "Object must not be nil", msgAndArgs...)
+	}
+
 	objectKind := reflect.TypeOf(object).Kind()
 	if objectKind == expectedKind {
 		return true
 	}
+
 	return Fail(t, fmt.Sprintf("Object expected to be of kind %v, but was %v", expectedKind, objectKind), msgAndArgs...)
 }
 
@@ -510,10 +519,19 @@ func NotKind(t TestingT, unexpectedKind reflect.Kind, object interface{}, msgAnd
 		h.Helper()
 	}
 
+	if unexpectedKind == reflect.Invalid {
+		return Fail(t, "reflect.Invalid must not be used as unexpected kind", msgAndArgs...)
+	}
+
+	if object == nil {
+		return Fail(t, "Object must not be nil", msgAndArgs...)
+	}
+
 	objectKind := reflect.TypeOf(object).Kind()
 	if objectKind != unexpectedKind {
 		return true
 	}
+
 	return Fail(t, fmt.Sprintf("Object expected NOT to be of kind %v, but was %v", unexpectedKind, objectKind), msgAndArgs...)
 }
 

assert/assertions_test.go

@@ -594,6 +594,7 @@ func TestKind(t *testing.T) {
 		result   bool
 		remark   string
 	}{
+		// True cases
 		{reflect.String, "Hello World", true, "is string"},
 		{reflect.Int, 123, true, "is int"},
 		{reflect.Array, [6]int{2, 3, 5, 7, 11, 13}, true, "is array"},
@@ -603,11 +604,15 @@ func TestKind(t *testing.T) {
 		{reflect.Bool, true, true, "is bool"},
 		{reflect.Ptr, new(int), true, "is pointer"},
 
-		// Not expected to be equal
+		// False cases
 		{reflect.String, 13, false, "not string"},
 		{reflect.Int, [6]int{2, 3, 5, 7, 11, 13}, false, "not int"},
 		{reflect.Float64, 12, false, "not float64"},
 		{reflect.Bool, make(map[string]int), false, "not bool"},
+
+		// Invalid inputs
+		{reflect.Invalid, "string", false, "reflect.Invalid must not be used as expected kind"},
+		{reflect.Ptr, nil, false, "Object must not be nil"},
 	}
 
 	for _, c := range cases {
@@ -630,14 +635,19 @@ func TestNotKind(t *testing.T) {
 		result     bool
 		remark     string
 	}{
+		// True cases
 		{reflect.String, 123, true, "not string"},
 		{reflect.Int, "hi", true, "not int"},
 		{reflect.Map, []int{1, 2}, true, "not map"},
 		{reflect.Ptr, 99, true, "not pointer"},
 
-		// Should fail when kinds match
+		// False cases
 		{reflect.Func, func() {}, false, "is func"},
 		{reflect.Bool, false, false, "is bool"},
+
+		// Invalid inputs
+		{reflect.Invalid, "string", false, "reflect.Invalid must not be used as unexpected kind"},
+		{reflect.Ptr, nil, false, "Object must not be nil"},
 	}
 
 	for _, c := range cases {