Browse Source

client: assert method in tests

Brian Waldon 11 years ago
parent
commit
2f479c8721
2 changed files with 11 additions and 7 deletions
  1. 8 4
      client/keys_test.go
  2. 3 3
      client/members_test.go

+ 8 - 4
client/keys_test.go

@@ -120,7 +120,7 @@ func TestGetAction(t *testing.T) {
 		wantURL := baseWantURL
 		wantURL.RawQuery = tt.wantQuery
 
-		err := assertRequest(got, wantURL, wantHeader, nil)
+		err := assertRequest(got, "GET", 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 := assertRequest(got, wantURL, wantHeader, nil)
+		err := assertRequest(got, "GET", wantURL, wantHeader, nil)
 		if err != nil {
 			t.Errorf("#%d: %v", i, err)
 		}
@@ -298,13 +298,17 @@ func TestSetAction(t *testing.T) {
 		}
 
 		got := tt.act.HTTPRequest(url.URL{Scheme: "http", Host: "example.com"})
-		if err := assertRequest(*got, u, wantHeader, []byte(tt.wantBody)); err != nil {
+		if err := assertRequest(*got, "PUT", u, wantHeader, []byte(tt.wantBody)); err != nil {
 			t.Errorf("#%d: %v", i, err)
 		}
 	}
 }
 
-func assertRequest(got http.Request, wantURL *url.URL, wantHeader http.Header, wantBody []byte) error {
+func assertRequest(got http.Request, wantMethod string, wantURL *url.URL, wantHeader http.Header, wantBody []byte) error {
+	if wantMethod != got.Method {
+		return fmt.Errorf("want.Method=%#v got.Method=%#v", wantMethod, got.Method)
+	}
+
 	if !reflect.DeepEqual(wantURL, got.URL) {
 		return fmt.Errorf("want.URL=%#v got.URL=%#v", wantURL, got.URL)
 	}

+ 3 - 3
client/members_test.go

@@ -34,7 +34,7 @@ func TestMembersAPIActionList(t *testing.T) {
 	}
 
 	got := *act.HTTPRequest(ep)
-	err := assertRequest(got, wantURL, http.Header{}, nil)
+	err := assertRequest(got, "GET", 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 := assertRequest(got, wantURL, wantHeader, wantBody)
+	err := assertRequest(got, "POST", wantURL, wantHeader, wantBody)
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -77,7 +77,7 @@ func TestMembersAPIActionRemove(t *testing.T) {
 	}
 
 	got := *act.HTTPRequest(ep)
-	err := assertRequest(got, wantURL, http.Header{}, nil)
+	err := assertRequest(got, "DELETE", wantURL, http.Header{}, nil)
 	if err != nil {
 		t.Error(err.Error())
 	}