Skip to content

Commit

Permalink
tests: stop on error
Browse files Browse the repository at this point in the history
  • Loading branch information
aviau committed Sep 15, 2024
1 parent 04f4d39 commit 006e7f7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
28 changes: 21 additions & 7 deletions api_client_http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ func TestGenerateToken(t *testing.T) {
assert.True(t, ct.apiClient.isApiTokenExpired(), "The initial api token exp should be before now")

token, err := ct.apiClient.GenerateToken()
assert.NoError(t, err, "Generating a token")
if !assert.NoError(t, err, "Generating a token") {
return
}
assert.Equal(t, "test-api-token", token)
assert.Equal(t, "test-api-token", ct.apiClient.apiToken)
assert.False(t, ct.apiClient.isApiTokenExpired(), "The api token should be unexpired")
Expand All @@ -84,11 +86,15 @@ func TestGetUnauthenticated(t *testing.T) {
defer ct.Close()

resp, err := ct.apiClient.Get("/test-endpoint", nil)
assert.NoError(t, err, "Failed to make get request")
if !assert.NoError(t, err, "Failed to make get request") {
return
}
defer resp.Body.Close()

body, err := io.ReadAll(resp.Body)
assert.NoError(t, err, "Failed to read resp body")
if !assert.NoError(t, err, "Failed to read resp body") {
return
}
assert.Equal(t, `"hello"`, string(body), "Didn't get expected response")
}

Expand All @@ -103,11 +109,15 @@ func TestPost(t *testing.T) {
defer ct.Close()

resp, err := ct.apiClient.Post("/hey", nil, "application/something-custom", strings.NewReader(`"hey"`))
assert.NoError(t, err, "failed to make post request")
if !assert.NoError(t, err, "failed to make post request") {
return
}
defer resp.Body.Close()

body, err := io.ReadAll(resp.Body)
assert.NoError(t, err, "failed to read response body")
if !assert.NoError(t, err, "failed to read response body") {
return
}
assert.Equal(t, `"ho"`, string(body), "Didn't get expected response")
}

Expand All @@ -126,11 +136,15 @@ func TestGetParams(t *testing.T) {
"some-param": []string{"some-value"},
},
)
assert.NoError(t, err, "failed to make get request")
if !assert.NoError(t, err, "failed to make get request") {
return
}
defer resp.Body.Close()

body, err := io.ReadAll(resp.Body)
assert.NoError(t, err, "failed to read response body")
if !assert.NoError(t, err, "failed to read response body") {
return
}
assert.Equal(t, []byte{}, body)
}

Expand Down
3 changes: 1 addition & 2 deletions api_client_iter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ func TestIterPostJson(t *testing.T) {
From string `json:"from"`
}
var pagedRequest PagedRequest
if err := json.NewDecoder(r.Body).Decode(&pagedRequest); err != nil {
assert.NoError(t, err, "Error decoding posted JSON")
if err := json.NewDecoder(r.Body).Decode(&pagedRequest); !assert.NoError(t, err, "Error decoding posted JSON") {
return
}

Expand Down

0 comments on commit 006e7f7

Please sign in to comment.