TESTING: Get up to 95.6% coverage by testing IsRouted, RoutePath.

Author: cypriss

TODO

@@ -3,10 +3,6 @@ TODO:
    - AppResponseWriter
    - HTTPMethod
    - HTTPMethods
- - Code coverage
-   - IsRouted, RoutePath
-   - PanicHandler
-   - Invalid handlers?
  - Go lint
  - Godoc -- make sure everything is commented.
  - Investigate sync.Pool

error_test.go

@@ -1,9 +1,12 @@
 package web
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/stretchr/testify/assert"
+	"log"
 	"net/http"
+	"strings"
 	"testing"
 )
 
@@ -132,6 +135,30 @@ func TestNonRootMiddlewarePanic(t *testing.T) {
 	assertResponse(t, rw, "Admin Error", 500)
 }
 
+func TestPanicLogging(t *testing.T) {
+	var buf bytes.Buffer
+
+	// Set the panichandler to our own time, then set it back after the test is done:
+	oldHandler := PanicHandler
+	PanicHandler = logPanicReporter{
+		log: log.New(&buf, "", 0),
+	}
+	defer func() {
+		PanicHandler = oldHandler
+	}()
+
+	router := New(Context{})
+	router.Get("/action", (*Context).ErrorAction)
+
+	rw, req := newTestRequest("GET", "/action")
+	router.ServeHTTP(rw, req)
+	assertResponse(t, rw, "Application Error", 500)
+
+	if !strings.HasPrefix(buf.String(), "PANIC") {
+		t.Error("Expected to have our PanicHandler be logged to.")
+	}
+}
+
 func TestConsistentContext(t *testing.T) {
 	router := New(Context{})
 	router.Error((*Context).ErrorHandler)

router_serve.go

@@ -225,7 +225,7 @@ func (rootRouter *Router) handlePanic(rw *AppResponseWriter, req *Request, err i
 			if targetRouter.contextType != curContextStruct.Type() {
 				context = curContextStruct.Field(0)
 				if reflect.Indirect(context).Type() != targetRouter.contextType {
-					panic("oshit why")
+					panic("bug: shouldn't get here")
 				}
 			}
 		}

tree_test.go renamed to routing_test.go

@@ -3,6 +3,7 @@ package web
 import (
 	"bytes"
 	"fmt"
+	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"sort"
@@ -325,3 +326,38 @@ func TestRouteVerbs(t *testing.T) {
 		}
 	}
 }
+
+func TestIsRouted(t *testing.T) {
+	router := New(Context{})
+	router.Middleware(func(w ResponseWriter, r *Request, next NextMiddlewareFunc) {
+		if r.IsRouted() {
+			panic("shouldn't be routed yet")
+		}
+		if r.RoutePath() != "" {
+			panic("shouldn't have a route path yet")
+		}
+		next(w, r)
+		if !r.IsRouted() {
+			panic("should be routed")
+		}
+	})
+	subrouter := router.Subrouter(Context{}, "")
+	subrouter.Middleware(func(w ResponseWriter, r *Request, next NextMiddlewareFunc) {
+		if !r.IsRouted() {
+			panic("should be routed")
+		}
+		next(w, r)
+		if !r.IsRouted() {
+			panic("should be routed")
+		}
+	})
+	subrouter.Get("/a", func(w ResponseWriter, r *Request) {
+		fmt.Fprintf(w, r.RoutePath())
+	})
+
+	assert.NotPanics(t, func() {
+		rw, req := newTestRequest("GET", "/a")
+		router.ServeHTTP(rw, req)
+		assertResponse(t, rw, "/a", 200)
+	})
+}

tree.go

@@ -125,7 +125,7 @@ func (leaf *pathLeaf) match(wildcardValues []string) bool {
 
 	// Invariant:
 	if len(leaf.regexps) != len(wildcardValues) {
-		panic("bug of some sort")
+		panic("bug: invariant violated")
 	}
 
 	for i, r := range leaf.regexps {