From 84e495e51e9d00b6e6184f12e7e7b84d3d9e3eb5 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 22 Jan 2015 14:28:32 -0800 Subject: [PATCH] client: s/assertResponse/assertRequest/ --- client/keys_test.go | 8 ++++---- client/members_test.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/keys_test.go b/client/keys_test.go index ceb75c872..3f4d5844b 100644 --- a/client/keys_test.go +++ b/client/keys_test.go @@ -120,7 +120,7 @@ func TestGetAction(t *testing.T) { wantURL := baseWantURL wantURL.RawQuery = tt.wantQuery - err := assertResponse(got, wantURL, wantHeader, nil) + err := assertRequest(got, wantURL, wantHeader, nil) if err != nil { t.Errorf("#%d: %v", i, err) } @@ -169,7 +169,7 @@ func TestWaitAction(t *testing.T) { wantURL := baseWantURL wantURL.RawQuery = tt.wantQuery - err := assertResponse(got, wantURL, wantHeader, nil) + err := assertRequest(got, wantURL, wantHeader, nil) if err != nil { t.Errorf("#%d: %v", i, err) } @@ -298,13 +298,13 @@ func TestSetAction(t *testing.T) { } got := tt.act.HTTPRequest(url.URL{Scheme: "http", Host: "example.com"}) - if err := assertResponse(*got, u, wantHeader, []byte(tt.wantBody)); err != nil { + if err := assertRequest(*got, u, wantHeader, []byte(tt.wantBody)); err != nil { t.Errorf("#%d: %v", i, err) } } } -func assertResponse(got http.Request, wantURL *url.URL, wantHeader http.Header, wantBody []byte) error { +func assertRequest(got http.Request, wantURL *url.URL, wantHeader http.Header, wantBody []byte) error { if !reflect.DeepEqual(wantURL, got.URL) { return fmt.Errorf("want.URL=%#v got.URL=%#v", wantURL, got.URL) } diff --git a/client/members_test.go b/client/members_test.go index f99b54df8..d2a9c8ba3 100644 --- a/client/members_test.go +++ b/client/members_test.go @@ -34,7 +34,7 @@ func TestMembersAPIActionList(t *testing.T) { } got := *act.HTTPRequest(ep) - err := assertResponse(got, wantURL, http.Header{}, nil) + err := assertRequest(got, wantURL, http.Header{}, nil) if err != nil { t.Error(err.Error()) } @@ -60,7 +60,7 @@ func TestMembersAPIActionAdd(t *testing.T) { wantBody := []byte(`{"peerURLs":["https://127.0.0.1:8081","http://127.0.0.1:8080"]}`) got := *act.HTTPRequest(ep) - err := assertResponse(got, wantURL, wantHeader, wantBody) + err := assertRequest(got, wantURL, wantHeader, wantBody) if err != nil { t.Error(err.Error()) } @@ -77,7 +77,7 @@ func TestMembersAPIActionRemove(t *testing.T) { } got := *act.HTTPRequest(ep) - err := assertResponse(got, wantURL, http.Header{}, nil) + err := assertRequest(got, wantURL, http.Header{}, nil) if err != nil { t.Error(err.Error()) }