This commit is contained in:
Brendan Burns
2014-06-11 12:50:01 -07:00
parent 9010ef954c
commit 9f76f13205
2 changed files with 22 additions and 25 deletions

View File

@@ -4,7 +4,7 @@ import (
"bytes"
"net/http"
"net/http/httptest"
"testing"
"testing"
)
func expectNoError(t *testing.T, err error) {
@@ -19,13 +19,13 @@ func TestFakeHandlerPath(t *testing.T) {
method := "GET"
path := "/foo/bar"
body := "somebody"
req, err := http.NewRequest(method, server.URL + path, bytes.NewBufferString(body));
req, err := http.NewRequest(method, server.URL+path, bytes.NewBufferString(body))
expectNoError(t, err)
client := http.Client{}
_, err = client.Do(req)
expectNoError(t, err)
handler.ValidateRequest(t, path, method, &body)
}
@@ -34,18 +34,18 @@ func TestFakeHandlerPathNoBody(t *testing.T) {
server := httptest.NewServer(&handler)
method := "GET"
path := "/foo/bar"
req, err := http.NewRequest(method, server.URL + path, nil);
req, err := http.NewRequest(method, server.URL+path, nil)
expectNoError(t, err)
client := http.Client{}
_, err = client.Do(req)
expectNoError(t, err)
handler.ValidateRequest(t, path, method, nil)
}
type fakeError struct {
errors[] string
errors []string
}
func (f *fakeError) Errorf(format string, args ...interface{}) {
@@ -59,12 +59,12 @@ func TestFakeHandlerWrongPath(t *testing.T) {
path := "/foo/bar"
fakeT := fakeError{}
req, err := http.NewRequest(method, server.URL + "/foo/baz", nil);
req, err := http.NewRequest(method, server.URL+"/foo/baz", nil)
expectNoError(t, err)
client := http.Client{}
_, err = client.Do(req)
expectNoError(t, err)
handler.ValidateRequest(&fakeT, path, method, nil)
if len(fakeT.errors) != 1 {
t.Errorf("Unexpected error set: %#v", fakeT.errors)
@@ -78,12 +78,12 @@ func TestFakeHandlerWrongMethod(t *testing.T) {
path := "/foo/bar"
fakeT := fakeError{}
req, err := http.NewRequest("PUT", server.URL + path, nil);
req, err := http.NewRequest("PUT", server.URL+path, nil)
expectNoError(t, err)
client := http.Client{}
_, err = client.Do(req)
expectNoError(t, err)
handler.ValidateRequest(&fakeT, path, method, nil)
if len(fakeT.errors) != 1 {
t.Errorf("Unexpected error set: %#v", fakeT.errors)
@@ -98,12 +98,12 @@ func TestFakeHandlerWrongBody(t *testing.T) {
body := "somebody"
fakeT := fakeError{}
req, err := http.NewRequest(method, server.URL + path, bytes.NewBufferString(body));
req, err := http.NewRequest(method, server.URL+path, bytes.NewBufferString(body))
expectNoError(t, err)
client := http.Client{}
_, err = client.Do(req)
expectNoError(t, err)
otherbody := "otherbody"
handler.ValidateRequest(&fakeT, path, method, &otherbody)
if len(fakeT.errors) != 1 {
@@ -119,7 +119,7 @@ func TestFakeHandlerNilBody(t *testing.T) {
body := "somebody"
fakeT := fakeError{}
req, err := http.NewRequest(method, server.URL + path, nil);
req, err := http.NewRequest(method, server.URL+path, nil)
expectNoError(t, err)
client := http.Client{}
_, err = client.Do(req)
@@ -130,5 +130,3 @@ func TestFakeHandlerNilBody(t *testing.T) {
t.Errorf("Unexpected error set: %#v", fakeT.errors)
}
}