Make logoutput more helpful

Give and example for the mock needed

Author: tsfcode

mock.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"sync"
 	"testing"
 
@@ -35,6 +36,7 @@ func New() *Mock {
 func (m *Mock) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	method := r.Method
 	path := r.URL.Path
+	mapKey := method + " " + path
 	var mr *mockResponse
 	m.Lock()
 	defer m.Unlock()
@@ -47,7 +49,7 @@ func (m *Mock) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if mr == nil {
 		w.WriteHeader(http.StatusNotFound)
 		fmt.Fprintf(w, "%s not found", path)
-		m.unmockedRequests[method+path]++
+		m.unmockedRequests[mapKey]++
 		return
 	}
 
@@ -57,10 +59,10 @@ func (m *Mock) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	var status int
 	if len(mr.callbacks) > 0 {
-		status = mr.callbacks[m.callCount[method+path]](r)
+		status = mr.callbacks[m.callCount[mapKey]](r)
 	}
 
-	m.callCount[method+path]++
+	m.callCount[mapKey]++
 	if status != 0 {
 		w.WriteHeader(status)
 	}
@@ -133,34 +135,46 @@ func (m *Mock) Mock(path, resp string, callback ...func(*http.Request) int) *moc
 
 func (m *Mock) AssertCallCount(tb testing.TB, method, path string, expected int) {
 	m.Lock()
-	cnt, ok := m.callCount[method+path]
+	cnt, ok := m.callCount[method+" "+path]
 	if !ok {
 		tb.Errorf("mocked but never called path: %s method: %s", path, method)
 		m.Unlock()
 		return
 	}
-	m.assertCallCountCalled[method+path] = true
+	m.assertCallCountCalled[method+" "+path] = true
 	m.Unlock()
 	assert.Equal(tb, expected, cnt, path)
 }
 
 func (m *Mock) AssertCallCountAsserted(tb testing.TB) {
-	for url, cnt := range m.callCount {
-		if _, ok := m.assertCallCountCalled[url]; !ok {
+	for request, cnt := range m.callCount {
+		if _, ok := m.assertCallCountCalled[request]; !ok {
+			method := strings.Split(request, " ")[0]
+			url := strings.Split(request, " ")[1]
 			tb.Errorf("url: %s is mocked but never asserted. It was called %d times", url, cnt)
+			tb.Errorf(`httpMock.AssertCallCount(t, "%s", "%s", %d)`, method, url, cnt)
+
 		}
 	}
 }
 
 func (m *Mock) AssertNoMissingMocks(tb testing.TB) {
-	for url, cnt := range m.unmockedRequests {
-		tb.Errorf("url: %s is called but not mocked. It was called %d times", url, cnt)
+	for request, cnt := range m.unmockedRequests {
+		method := strings.Split(request, " ")[0]
+		url := strings.Split(request, " ")[1]
+		tb.Errorf("url: %s is called but not mocked. It was called %d times", request, cnt)
+		if method == "GET" {
+			tb.Errorf(`httpMock.Mock("%s", "response")`, url)
+			return
+
+		}
+		tb.Errorf(`httpMock.Mock("%s", "response").SetMethod("%s")`, url, method)
 	}
 }
 
 func (m *Mock) AssertMocksCalled(tb testing.TB) {
 	for _, mr := range m.mockResponses {
-		if _, ok := m.callCount[mr.method+mr.path]; !ok {
+		if _, ok := m.callCount[mr.method+" "+mr.path]; !ok {
 			tb.Errorf("%s %s mocked but never called.", mr.method, mr.path)
 		}
 	}

mock_test.go

@@ -12,7 +12,7 @@ func TestMock(t *testing.T) {
 	a := 0
 	mock := New()
 	mock.Mock("/test", "ok")
-	mock.Mock("/callback", "ok", func(*http.Request) int {
+	mock.Mock("/callback", "ok", func(http.ResponseWriter, *http.Request) int {
 		a++
 		return 201
 	})
@@ -73,3 +73,31 @@ func TestNotAssertNoMissingMocks(t *testing.T) {
 	mock.AssertNoMissingMocks(newT)
 	assert.True(t, newT.Failed())
 }
+
+func TestWriteResponseFromCallback(t *testing.T) {
+	a := 0
+	mock := New()
+	mock.Mock("/callback", "", func(w http.ResponseWriter, r *http.Request) int {
+
+		w.Header().Set("X-BLAHA", "ok")
+		w.WriteHeader(400)
+		_, err := w.Write([]byte("inte ok"))
+		assert.NoError(t, err)
+		a++
+		return 400
+	})
+
+	resp, err := http.Get(mock.URL() + "/callback")
+	assert.NoError(t, err)
+	body, err := io.ReadAll(resp.Body)
+	assert.NoError(t, err)
+	assert.Equal(t, 400, resp.StatusCode)
+	assert.Equal(t, "inte ok", string(body))
+	assert.Equal(t, "ok", resp.Header.Get("X-BLAHA"))
+
+	mock.AssertCallCount(t, "GET", "/callback", 1)
+	mock.AssertCallCountAsserted(t)
+	mock.AssertNoMissingMocks(t)
+	mock.AssertMocksCalled(t)
+	assert.Equal(t, 1, a)
+}