Remove dependency on testify

Author: Stein Fletcher

apitest.go

@@ -240,7 +240,6 @@ func (a *APITest) Intercept(interceptor Intercept) *APITest {
 }
 
 // Verifier allows consumers to override the verification implementation.
-// By default testify is used to perform assertions
 func (a *APITest) Verifier(v Verifier) *APITest {
 	a.verifier = v
 	return a
@@ -801,7 +800,7 @@ func (r *Response) runTest() *http.Response {
 	}()
 
 	if a.verifier == nil {
-		a.verifier = newTestifyVerifier()
+		a.verifier = DefaultVerifier{}
 	}
 
 	a.assertMocks()

apitest_test.go

@@ -13,8 +13,6 @@ import (
 
 	"github.com/steinfletcher/apitest"
 	"github.com/steinfletcher/apitest/mocks"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestApiTest_ResponseBody(t *testing.T) {
@@ -803,13 +801,13 @@ func TestApiTest_Report(t *testing.T) {
 	r := reporter.capturedRecorder
 	assert.Equal(t, "POST /hello", r.Title)
 	assert.Equal(t, "some test", r.SubTitle)
-	assert.Len(t, r.Events, 4)
+	assert.Equal(t, 4, len(r.Events))
 	assert.Equal(t, 200, r.Meta["status_code"])
 	assert.Equal(t, "/hello", r.Meta["path"])
 	assert.Equal(t, "POST", r.Meta["method"])
 	assert.Equal(t, "some test", r.Meta["name"])
 	assert.Equal(t, "abc.com", r.Meta["host"])
-	assert.NotEmpty(t, r.Meta["duration"])
+	assert.Equal(t, true, r.Meta["duration"] != nil)
 }
 
 func TestApiTest_Recorder(t *testing.T) {
@@ -857,7 +855,7 @@ func TestApiTest_Recorder(t *testing.T) {
 		End()
 
 	r := reporter.capturedRecorder
-	assert.Len(t, r.Events, 6)
+	assert.Equal(t, 6, len(r.Events))
 	assert.Equal(t, messageRequest, r.Events[0])
 	assert.Equal(t, messageResponse, r.Events[1])
 }
@@ -881,7 +879,7 @@ func TestApiTest_Observe(t *testing.T) {
 		Status(http.StatusOK).
 		End()
 
-	assert.True(t, observeCalled)
+	assert.Equal(t, true, observeCalled)
 }
 
 func TestApiTest_Observe_DumpsTheHttpRequestAndResponse(t *testing.T) {
@@ -926,7 +924,7 @@ func TestApiTest_ObserveWithReport(t *testing.T) {
 		Status(http.StatusOK).
 		End()
 
-	assert.True(t, observeCalled)
+	assert.Equal(t, true, observeCalled)
 }
 
 func TestApiTest_Intercept(t *testing.T) {
@@ -960,8 +958,8 @@ func TestApiTest_Intercept(t *testing.T) {
 func TestApiTest_ExposesRequestAndResponse(t *testing.T) {
 	apiTest := apitest.New()
 
-	assert.NotNil(t, apiTest.Request())
-	assert.NotNil(t, apiTest.Response())
+	assert.Equal(t, true, apiTest.Request() != nil)
+	assert.Equal(t, true, apiTest.Response() != nil)
 }
 
 func TestApiTest_RequestContextIsPreserved(t *testing.T) {
@@ -1142,7 +1140,7 @@ func TestApiTest_ErrorIfMockInvocationsDoNotMatchTimes(t *testing.T) {
 		End()
 
 	unmatchedMocks := res.UnmatchedMocks()
-	assert.NotEmpty(t, unmatchedMocks)
+	assert.Equal(t, true, len(unmatchedMocks) > 0)
 	assert.Equal(t, "http://localhost:8080", unmatchedMocks[0].URL.String())
 }
 
@@ -1165,7 +1163,7 @@ func TestApiTest_MatchesTimes(t *testing.T) {
 		Status(http.StatusOK).
 		End()
 
-	assert.Empty(t, res.UnmatchedMocks())
+	assert.Equal(t, 0, len(res.UnmatchedMocks()))
 }
 
 type RecorderCaptor struct {
@@ -1187,3 +1185,5 @@ func getUserData() []byte {
 	}
 	return data
 }
+
+var assert = apitest.DefaultVerifier{}