From a3bbd3cc0aa11f6e361d389e0f20602a4ecc273c Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Wed, 25 Jun 2025 16:26:10 +0300 Subject: [PATCH] refactor: Simplify error handling in JSON decoding in tests --- github/enterprise_actions_runners_test.go | 5 +---- github/orgs_codesecurity_configurations_test.go | 15 +++------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/github/enterprise_actions_runners_test.go b/github/enterprise_actions_runners_test.go index b3a5770b6ad..dd714078f94 100644 --- a/github/enterprise_actions_runners_test.go +++ b/github/enterprise_actions_runners_test.go @@ -24,10 +24,7 @@ func TestEnterpriseService_GenerateEnterpriseJITConfig(t *testing.T) { mux.HandleFunc("/enterprises/o/actions/runners/generate-jitconfig", func(w http.ResponseWriter, r *http.Request) { v := new(GenerateJITConfigRequest) - err := json.NewDecoder(r.Body).Decode(v) - if err != nil { - t.Errorf("Request body decode failed: %v", err) - } + assertNilError(t, json.NewDecoder(r.Body).Decode(v)) testMethod(t, r, "POST") if !cmp.Equal(v, input) { diff --git a/github/orgs_codesecurity_configurations_test.go b/github/orgs_codesecurity_configurations_test.go index ef916efbffd..f2a35c2c3cd 100644 --- a/github/orgs_codesecurity_configurations_test.go +++ b/github/orgs_codesecurity_configurations_test.go @@ -111,10 +111,7 @@ func TestOrganizationsService_CreateCodeSecurityConfiguration(t *testing.T) { mux.HandleFunc("/orgs/o/code-security/configurations", func(w http.ResponseWriter, r *http.Request) { v := new(CodeSecurityConfiguration) - err := json.NewDecoder(r.Body).Decode(v) - if err != nil { - t.Errorf("Organizations.CreateCodeSecurityConfiguration request body decode failed: %v", err) - } + assertNilError(t, json.NewDecoder(r.Body).Decode(v)) if !reflect.DeepEqual(v, input) { t.Errorf("Organizations.CreateCodeSecurityConfiguration request body = %+v, want %+v", v, input) @@ -244,10 +241,7 @@ func TestOrganizationsService_UpdateCodeSecurityConfiguration(t *testing.T) { mux.HandleFunc("/orgs/o/code-security/configurations/1", func(w http.ResponseWriter, r *http.Request) { v := new(CodeSecurityConfiguration) - err := json.NewDecoder(r.Body).Decode(v) - if err != nil { - t.Errorf("Organizations.UpdateCodeSecurityConfiguration request body decode failed: %v", err) - } + assertNilError(t, json.NewDecoder(r.Body).Decode(v)) if !reflect.DeepEqual(v, input) { t.Errorf("Organizations.UpdateCodeSecurityConfiguration request body = %+v, want %+v", v, input) @@ -329,10 +323,7 @@ func TestOrganizationsService_AttachCodeSecurityConfigurationsToRepositories(t * SelectedRepositoryIDs []int64 `json:"selected_repository_ids,omitempty"` } v := new(request) - err := json.NewDecoder(r.Body).Decode(v) - if err != nil { - t.Errorf("Organizations.AttachCodeSecurityConfigurationsToRepositories request body decode failed: %v", err) - } + assertNilError(t, json.NewDecoder(r.Body).Decode(v)) if v.Scope != "selected" { t.Errorf("Organizations.AttachCodeSecurityConfigurationsToRepositories request body scope = %s, want selected", v.Scope) }