Revert "Fixes #13"

This reverts commit 9b28fe8965.

assert/assertions.go

@@ -173,13 +173,8 @@ func NotNil(t *testing.T, object interface{}, msgAndArgs ...interface{}) bool {
 
 	if object == nil {
 		success = false
-	}
-
-	val := reflect.ValueOf(object)
-	if val.CanAddr() {
-		if reflect.ValueOf(object).IsNil() {
-			success = false
-		}
+	} else if reflect.ValueOf(object).IsNil() {
+		success = false
 	}
 
 	if !success {
@@ -206,13 +201,8 @@ func Nil(t *testing.T, object interface{}, msgAndArgs ...interface{}) bool {
 
 	if object == nil {
 		return true
-	}
-
-	val := reflect.ValueOf(object)
-	if val.CanAddr() {
-		if reflect.ValueOf(object).IsNil() {
-			return true
-		}
+	} else if reflect.ValueOf(object).IsNil() {
+		return true
 	}
 
 	if len(message) > 0 {

assert/assertions_test.go

@@ -5,10 +5,6 @@ import (
 	"testing"
 )
 
-type CustomError struct{}
-
-func (c CustomError) Error() string { return "Error" }
-
 // AssertionTesterInterface defines an interface to be used for testing assertion methods
 type AssertionTesterInterface interface {
 	TestMethod()
@@ -119,54 +115,6 @@ func TestNil(t *testing.T) {
 
 }
 
-func TestNil_ValueType(t *testing.T) {
-
-	f := func() AssertionTesterConformingObject {
-		return AssertionTesterConformingObject{}
-	}
-
-	mockT := new(testing.T)
-	obj := f()
-	False(t, Nil(mockT, obj))
-
-}
-
-func TestNil_ValueType_IsNil(t *testing.T) {
-
-	f := func() AssertionTesterInterface {
-		return nil
-	}
-
-	mockT := new(testing.T)
-	obj := f()
-	True(t, Nil(mockT, obj))
-
-}
-
-func TestNil_ValueError(t *testing.T) {
-
-	f := func() error {
-		return CustomError{}
-	}
-
-	mockT := new(testing.T)
-	obj := f()
-	False(t, Nil(mockT, obj))
-
-}
-
-func TestNotNil_ValueError(t *testing.T) {
-
-	f := func() error {
-		return CustomError{}
-	}
-
-	mockT := new(testing.T)
-	obj := f()
-	True(t, NotNil(mockT, obj))
-
-}
-
 func TestTrue(t *testing.T) {
 
 	mockT := new(testing.T)
@@ -385,15 +333,3 @@ func TestNotEmpty(t *testing.T) {
 	True(t, NotEmpty(mockT, true), "True value is not empty")
 
 }
-
-func TestEmpty_Value(t *testing.T) {
-
-	f := func() error {
-		return CustomError{}
-	}
-
-	mockT := new(testing.T)
-	obj := f()
-	False(t, Empty(mockT, obj))
-
-}