2 files changed, 14 insertions, 1 deletions
diff --git a/middleware/test/helpers.go b/middleware/test/helpers.go
index 01a6f156b..8ed27261f 100644
--- a/middleware/test/helpers.go
+++ b/middleware/test/helpers.go
@@ -224,6 +224,7 @@ func Section(t *testing.T, tc Case, sect Sect, rr []dns.RR) bool {
 	return true
 }
 
+// ErrorHanlder returns a Handler that returns ServerFailure error when called.
 func ErrorHandler() Handler {
 	return HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
 		m := new(dns.Msg)
@@ -233,7 +234,14 @@ func ErrorHandler() Handler {
 	})
 }
 
-// Copied here to prevent an import cycle.
+// NextHandler returns a Handler that returns rcode and err.
+func NextHandler(rcode int, err error) Handler {
+	return HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+		return rcode, err
+	})
+}
+
+// Copied here to prevent an import cycle, so that we can define to above handlers.
 type (
 	// HandlerFunc is a convenience type like dns.HandlerFunc, except
 	// ServeDNS returns an rcode and an error.
diff --git a/middleware/test/responsewriter.go b/middleware/test/responsewriter.go
index fb70d7e8d..925dc7b35 100644
--- a/middleware/test/responsewriter.go
+++ b/middleware/test/responsewriter.go
@@ -6,14 +6,19 @@ import (
 	"github.com/miekg/dns"
 )
 
+// ResponseWriter is useful for writing tests. It uses some fixed values for the client. The
+// remote will always be 10.240.0.1 and port 40212. The local address is always 127.0.0.1 and
+// port 53.
 type ResponseWriter struct{}
 
+// LocalAddr returns the local address, always 127.0.0.1:53 (UDP).
 func (t *ResponseWriter) LocalAddr() net.Addr {
 	ip := net.ParseIP("127.0.0.1")
 	port := 53
 	return &net.UDPAddr{IP: ip, Port: port, Zone: ""}
 }
 
+// RemoteAddr returns the remote address, always 10.240.0.1:40212 (UDP).
 func (t *ResponseWriter) RemoteAddr() net.Addr {
 	ip := net.ParseIP("10.240.0.1")
 	port := 40212