From 95b4e61a07c3560426e4a41199fa046c20bc3874 Mon Sep 17 00:00:00 2001
From: Peter Hellberg <peter@c7.se>
Date: Sat, 9 May 2015 00:36:58 +0200
Subject: [PATCH 1/2] redirect: initial test for Redirect

---
 middleware/redirect/redirect_test.go | 66 ++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 middleware/redirect/redirect_test.go

diff --git a/middleware/redirect/redirect_test.go b/middleware/redirect/redirect_test.go
new file mode 100644
index 000000000..a690f0468
--- /dev/null
+++ b/middleware/redirect/redirect_test.go
@@ -0,0 +1,66 @@
+package redirect
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/mholt/caddy/middleware"
+)
+
+func TestRedirect(t *testing.T) {
+	re := Redirect{
+		Next: middleware.HandlerFunc(urlPrinter),
+		Rules: []Rule{
+			{From: "/from", To: "/to"},
+			{From: "/a", To: "/b"},
+		},
+	}
+	tests := []struct {
+		from             string
+		expectedLocation string
+	}{
+		{"/from", "/to"},
+		{"/a", "/b"},
+		{"/aa", ""},
+		{"/", ""},
+		{"/a?foo=bar", "/b"},
+		{"/asdf?foo=bar", ""},
+		{"/foo#bar", ""},
+		{"/a#foo", "/b"},
+	}
+
+	for i, test := range tests {
+		req, err := http.NewRequest("GET", test.from, nil)
+		if err != nil {
+			t.Fatalf("Test %d: Could not create HTTP request: %v", i, err)
+		}
+
+		rec := httptest.NewRecorder()
+		re.ServeHTTP(rec, req)
+
+		if rec.Header().Get("Location") != test.expectedLocation {
+			t.Errorf("Test %d: Expected Location header to be %q but was %q",
+				i, test.expectedLocation, rec.Header().Get("Location"))
+		}
+
+		var expectedBody string
+
+		if test.expectedLocation != "" {
+			expectedBody = "<a href=\"" + test.expectedLocation + "\"></a>.\n\n"
+		} else {
+			expectedBody = test.from
+		}
+
+		if rec.Body.String() != expectedBody {
+			t.Errorf("Test %d: Expected body to be %q but was %q",
+				i, expectedBody, rec.Body.String())
+		}
+	}
+}
+
+func urlPrinter(w http.ResponseWriter, r *http.Request) (int, error) {
+	fmt.Fprintf(w, r.URL.String())
+	return 0, nil
+}

From 0f9df18dfb748a9fc3839f7288a202ed4be04b16 Mon Sep 17 00:00:00 2001
From: Peter Hellberg <peter@c7.se>
Date: Sat, 9 May 2015 20:07:29 +0200
Subject: [PATCH 2/2] Check if the Next handler was called unexpectedly

Removed body check and replaced urlPrinter with a inlined Next handler
---
 middleware/redirect/redirect_test.go | 43 +++++++++++-----------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/middleware/redirect/redirect_test.go b/middleware/redirect/redirect_test.go
index a690f0468..af6bb538c 100644
--- a/middleware/redirect/redirect_test.go
+++ b/middleware/redirect/redirect_test.go
@@ -1,7 +1,6 @@
 package redirect
 
 import (
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -10,14 +9,7 @@ import (
 )
 
 func TestRedirect(t *testing.T) {
-	re := Redirect{
-		Next: middleware.HandlerFunc(urlPrinter),
-		Rules: []Rule{
-			{From: "/from", To: "/to"},
-			{From: "/a", To: "/b"},
-		},
-	}
-	tests := []struct {
+	for i, test := range []struct {
 		from             string
 		expectedLocation string
 	}{
@@ -29,9 +21,20 @@ func TestRedirect(t *testing.T) {
 		{"/asdf?foo=bar", ""},
 		{"/foo#bar", ""},
 		{"/a#foo", "/b"},
-	}
+	} {
+		var nextCalled bool
+
+		re := Redirect{
+			Next: middleware.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
+				nextCalled = true
+				return 0, nil
+			}),
+			Rules: []Rule{
+				{From: "/from", To: "/to"},
+				{From: "/a", To: "/b"},
+			},
+		}
 
-	for i, test := range tests {
 		req, err := http.NewRequest("GET", test.from, nil)
 		if err != nil {
 			t.Fatalf("Test %d: Could not create HTTP request: %v", i, err)
@@ -45,22 +48,8 @@ func TestRedirect(t *testing.T) {
 				i, test.expectedLocation, rec.Header().Get("Location"))
 		}
 
-		var expectedBody string
-
-		if test.expectedLocation != "" {
-			expectedBody = "<a href=\"" + test.expectedLocation + "\"></a>.\n\n"
-		} else {
-			expectedBody = test.from
-		}
-
-		if rec.Body.String() != expectedBody {
-			t.Errorf("Test %d: Expected body to be %q but was %q",
-				i, expectedBody, rec.Body.String())
+		if nextCalled && test.expectedLocation != "" {
+			t.Errorf("Test %d: Next handler was unexpectedly called", i)
 		}
 	}
 }
-
-func urlPrinter(w http.ResponseWriter, r *http.Request) (int, error) {
-	fmt.Fprintf(w, r.URL.String())
-	return 0, nil
-}