code cleanup.

This commit is contained in:
2020-11-22 18:31:29 -08:00
parent b6c2ec539c
commit 5a002e8f9b
2 changed files with 81 additions and 63 deletions

View File

@ -9,6 +9,8 @@ import (
)
func TestAddRouter(t *testing.T) {
defer testOutcome("can add router", t)
router := Router{}
routeCounter := 0
@ -41,11 +43,11 @@ func TestAddRouter(t *testing.T) {
if err != nil {
t.Error("The route was not correctly added to the router: ", err)
}
// checkLookup(router.lookup)
}
func TestServeHTTP(t *testing.T) {
defer testOutcome("can find correct callback function", t)
router := Router{}
path := "/items"
expectedBody := "I am /items"
@ -60,7 +62,10 @@ func TestServeHTTP(t *testing.T) {
if err != nil {
t.Error("Did not find the expected callback handler", err)
return
}
}
func matchAndCheckRoute(r *Router, method string, path string, expectedBody string, expectedCode int) (err error) {
@ -136,6 +141,20 @@ func addAndCheckRoute(r *Router, method string, path string, callback http.Handl
return
}
func testOutcome(message string, t *testing.T) {
var status string
if t.Failed() {
status = "\u001b[31mx\u001b[0m"
} else {
status = "\u001b[32m✓\u001b[0m"
}
fmt.Printf("%s %s\n", status, message)
return
}
// checkLookup prints out the various saved routes. It's not needed for any test, but is a helpful debugging tool.
// func checkLookup(curr *segment) {
// fmt.Printf("%p { path: %s, methods: %v, children: %v}\n", curr, curr.path, curr.methods, curr.children)