Skip to content

Commit

Permalink
Bugfix: client/*_test unchecked errors
Browse files Browse the repository at this point in the history 
Explicitly ignores errors within tests
  • Loading branch information
@kenjones-cisco
kenjones-cisco committed Aug 31, 2017
1 parent d71b465 commit 180c5cc
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 48 deletions.
88 changes: 44 additions & 44 deletions client/request_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,41 +38,41 @@ var testProducers = map[string]runtime.Producer{
func TestBuildRequest_SetHeaders(t *testing.T) {
r, _ := newRequest("GET", "/flats/{id}/", nil)
// single value
r.SetHeaderParam("X-Rate-Limit", "500")
_ = r.SetHeaderParam("X-Rate-Limit", "500")
assert.Equal(t, "500", r.header.Get("X-Rate-Limit"))
r.SetHeaderParam("X-Rate-Limit", "400")
_ = r.SetHeaderParam("X-Rate-Limit", "400")
assert.Equal(t, "400", r.header.Get("X-Rate-Limit"))

// multi value
r.SetHeaderParam("X-Accepts", "json", "xml", "yaml")
_ = r.SetHeaderParam("X-Accepts", "json", "xml", "yaml")
assert.EqualValues(t, []string{"json", "xml", "yaml"}, r.header["X-Accepts"])
}

func TestBuildRequest_SetPath(t *testing.T) {
r, _ := newRequest("GET", "/flats/{id}/?hello=world", nil)

r.SetPathParam("id", "1345")
_ = r.SetPathParam("id", "1345")
assert.Equal(t, "1345", r.pathParams["id"])
}

func TestBuildRequest_SetQuery(t *testing.T) {
r, _ := newRequest("GET", "/flats/{id}/", nil)

// single value
r.SetQueryParam("hello", "there")
_ = r.SetQueryParam("hello", "there")
assert.Equal(t, "there", r.query.Get("hello"))

// multi value
r.SetQueryParam("goodbye", "cruel", "world")
_ = r.SetQueryParam("goodbye", "cruel", "world")
assert.Equal(t, []string{"cruel", "world"}, r.query["goodbye"])
}

func TestBuildRequest_SetForm(t *testing.T) {
// non-multipart
r, _ := newRequest("POST", "/flats", nil)
r.SetFormParam("hello", "world")
_ = r.SetFormParam("hello", "world")
assert.Equal(t, "world", r.formFields.Get("hello"))
r.SetFormParam("goodbye", "cruel", "world")
_ = r.SetFormParam("goodbye", "cruel", "world")
assert.Equal(t, []string{"cruel", "world"}, r.formFields["goodbye"])
}

Expand Down Expand Up @@ -107,16 +107,16 @@ func TestBuildRequest_SetBody(t *testing.T) {
r, _ := newRequest("GET", "/flats/{id}/?hello=world", nil)
bd := []struct{ Name, Hobby string }{{"Tom", "Organ trail"}, {"John", "Bird watching"}}

r.SetBodyParam(bd)
_ = r.SetBodyParam(bd)
assert.Equal(t, bd, r.payload)
}

func TestBuildRequest_BuildHTTP_NoPayload(t *testing.T) {
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetBodyParam(nil)
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetBodyParam(nil)
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("POST", "/flats/{id}/", reqWrtr)
Expand All @@ -133,14 +133,14 @@ func TestBuildRequest_BuildHTTP_NoPayload(t *testing.T) {
func TestBuildRequest_BuildHTTP_Payload(t *testing.T) {
bd := []struct{ Name, Hobby string }{{"Tom", "Organ trail"}, {"John", "Bird watching"}}
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetBodyParam(bd)
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetBodyParam(bd)
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("GET", "/flats/{id}/", reqWrtr)
r.SetHeaderParam(runtime.HeaderContentType, runtime.JSONMime)
_ = r.SetHeaderParam(runtime.HeaderContentType, runtime.JSONMime)

req, err := r.BuildHTTP(runtime.JSONMime, testProducers, nil)
if assert.NoError(t, err) && assert.NotNil(t, req) {
Expand All @@ -160,14 +160,14 @@ func TestBuildRequest_BuildHTTP_XMLPayload(t *testing.T) {
Hobby string `xml:"hobby"`
}{{xml.Name{}, "Tom", "Organ trail"}, {xml.Name{}, "John", "Bird watching"}}
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetBodyParam(bd)
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetBodyParam(bd)
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("GET", "/flats/{id}/", reqWrtr)
r.SetHeaderParam(runtime.HeaderContentType, runtime.XMLMime)
_ = r.SetHeaderParam(runtime.HeaderContentType, runtime.XMLMime)

req, err := r.BuildHTTP(runtime.XMLMime, testProducers, nil)
if assert.NoError(t, err) && assert.NotNil(t, req) {
Expand All @@ -183,14 +183,14 @@ func TestBuildRequest_BuildHTTP_XMLPayload(t *testing.T) {
func TestBuildRequest_BuildHTTP_TextPayload(t *testing.T) {
bd := "Tom: Organ trail; John: Bird watching"
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetBodyParam(bd)
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetBodyParam(bd)
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("GET", "/flats/{id}/", reqWrtr)
r.SetHeaderParam(runtime.HeaderContentType, runtime.TextMime)
_ = r.SetHeaderParam(runtime.HeaderContentType, runtime.TextMime)

req, err := r.BuildHTTP(runtime.TextMime, testProducers, nil)
if assert.NoError(t, err) && assert.NotNil(t, req) {
Expand All @@ -205,14 +205,14 @@ func TestBuildRequest_BuildHTTP_TextPayload(t *testing.T) {

func TestBuildRequest_BuildHTTP_Form(t *testing.T) {
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetFormParam("something", "some value")
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetFormParam("something", "some value")
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("GET", "/flats/{id}/", reqWrtr)
r.SetHeaderParam(runtime.HeaderContentType, runtime.JSONMime)
_ = r.SetHeaderParam(runtime.HeaderContentType, runtime.JSONMime)

req, err := r.BuildHTTP(runtime.JSONMime, testProducers, nil)
if assert.NoError(t, err) && assert.NotNil(t, req) {
Expand All @@ -227,14 +227,14 @@ func TestBuildRequest_BuildHTTP_Form(t *testing.T) {

func TestBuildRequest_BuildHTTP_Form_Content_Length(t *testing.T) {
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetFormParam("something", "some value")
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetFormParam("something", "some value")
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("GET", "/flats/{id}/", reqWrtr)
r.SetHeaderParam(runtime.HeaderContentType, runtime.MultipartFormMime)
_ = r.SetHeaderParam(runtime.HeaderContentType, runtime.MultipartFormMime)

req, err := r.BuildHTTP(runtime.JSONMime, testProducers, nil)
if assert.NoError(t, err) && assert.NotNil(t, req) {
Expand All @@ -252,15 +252,15 @@ func TestBuildRequest_BuildHTTP_Form_Content_Length(t *testing.T) {
func TestBuildRequest_BuildHTTP_Files(t *testing.T) {
cont, _ := ioutil.ReadFile("./runtime.go")
reqWrtr := runtime.ClientRequestWriterFunc(func(req runtime.ClientRequest, reg strfmt.Registry) error {
req.SetFormParam("something", "some value")
req.SetFileParam("file", mustGetFile("./runtime.go"))
req.SetQueryParam("hello", "world")
req.SetPathParam("id", "1234")
req.SetHeaderParam("X-Rate-Limit", "200")
_ = req.SetFormParam("something", "some value")
_ = req.SetFileParam("file", mustGetFile("./runtime.go"))
_ = req.SetQueryParam("hello", "world")
_ = req.SetPathParam("id", "1234")
_ = req.SetHeaderParam("X-Rate-Limit", "200")
return nil
})
r, _ := newRequest("GET", "/flats/{id}/", reqWrtr)
r.SetHeaderParam(runtime.HeaderContentType, runtime.JSONMime)
_ = r.SetHeaderParam(runtime.HeaderContentType, runtime.JSONMime)
req, err := r.BuildHTTP(runtime.JSONMime, testProducers, nil)
if assert.NoError(t, err) && assert.NotNil(t, req) {
assert.Equal(t, "200", req.Header.Get("x-rate-limit"))
Expand Down
6 changes: 3 additions & 3 deletions client_request_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ func (t *trw) SetTimeout(timeout time.Duration) error {
func TestRequestWriterFunc(t *testing.T) {

hand := ClientRequestWriterFunc(func(r ClientRequest, reg strfmt.Registry) error {
r.SetHeaderParam("blah", "blah blah")
r.SetBodyParam(struct{ Name string }{"Adriana"})
_ = r.SetHeaderParam("blah", "blah blah")
_ = r.SetBodyParam(struct{ Name string }{"Adriana"})
return nil
})

tr := new(trw)
hand.WriteToRequest(tr, nil)
_ = hand.WriteToRequest(tr, nil)
assert.Equal(t, "blah blah", tr.Headers.Get("blah"))
assert.Equal(t, "Adriana", tr.Body.(struct{ Name string }).Name)
}
2 changes: 1 addition & 1 deletion client_response_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestResponseReaderFunc(t *testing.T) {
actual.Header = r.GetHeader("blah")
return actual, nil
})
reader.ReadResponse(response{}, nil)
_, _ = reader.ReadResponse(response{}, nil)
assert.Equal(t, "the content", actual.Body)
assert.Equal(t, "the message", actual.Message)
assert.Equal(t, "the header", actual.Header)
Expand Down

0 comments on commit 180c5cc

Please sign in to comment.