Skip to content

Commit 49704bf

Browse files
authored
refactor: Simplify error handling in JSON decoding in tests (#3602)
1 parent 59da3f3 commit 49704bf

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

github/enterprise_actions_runners_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ func TestEnterpriseService_GenerateEnterpriseJITConfig(t *testing.T) {
2424

2525
mux.HandleFunc("/enterprises/o/actions/runners/generate-jitconfig", func(w http.ResponseWriter, r *http.Request) {
2626
v := new(GenerateJITConfigRequest)
27-
err := json.NewDecoder(r.Body).Decode(v)
28-
if err != nil {
29-
t.Errorf("Request body decode failed: %v", err)
30-
}
27+
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
3128

3229
testMethod(t, r, "POST")
3330
if !cmp.Equal(v, input) {

github/orgs_codesecurity_configurations_test.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,7 @@ func TestOrganizationsService_CreateCodeSecurityConfiguration(t *testing.T) {
111111

112112
mux.HandleFunc("/orgs/o/code-security/configurations", func(w http.ResponseWriter, r *http.Request) {
113113
v := new(CodeSecurityConfiguration)
114-
err := json.NewDecoder(r.Body).Decode(v)
115-
if err != nil {
116-
t.Errorf("Organizations.CreateCodeSecurityConfiguration request body decode failed: %v", err)
117-
}
114+
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
118115

119116
if !reflect.DeepEqual(v, input) {
120117
t.Errorf("Organizations.CreateCodeSecurityConfiguration request body = %+v, want %+v", v, input)
@@ -244,10 +241,7 @@ func TestOrganizationsService_UpdateCodeSecurityConfiguration(t *testing.T) {
244241

245242
mux.HandleFunc("/orgs/o/code-security/configurations/1", func(w http.ResponseWriter, r *http.Request) {
246243
v := new(CodeSecurityConfiguration)
247-
err := json.NewDecoder(r.Body).Decode(v)
248-
if err != nil {
249-
t.Errorf("Organizations.UpdateCodeSecurityConfiguration request body decode failed: %v", err)
250-
}
244+
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
251245

252246
if !reflect.DeepEqual(v, input) {
253247
t.Errorf("Organizations.UpdateCodeSecurityConfiguration request body = %+v, want %+v", v, input)
@@ -329,10 +323,7 @@ func TestOrganizationsService_AttachCodeSecurityConfigurationsToRepositories(t *
329323
SelectedRepositoryIDs []int64 `json:"selected_repository_ids,omitempty"`
330324
}
331325
v := new(request)
332-
err := json.NewDecoder(r.Body).Decode(v)
333-
if err != nil {
334-
t.Errorf("Organizations.AttachCodeSecurityConfigurationsToRepositories request body decode failed: %v", err)
335-
}
326+
assertNilError(t, json.NewDecoder(r.Body).Decode(v))
336327
if v.Scope != "selected" {
337328
t.Errorf("Organizations.AttachCodeSecurityConfigurationsToRepositories request body scope = %s, want selected", v.Scope)
338329
}

0 commit comments

Comments
 (0)