Skip to content

Commit 516def8

Browse files
committed
Use t.Run in test
1 parent d481ca7 commit 516def8

File tree

1 file changed

+33
-26
lines changed

1 file changed

+33
-26
lines changed

client/nginx_test.go

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -627,55 +627,62 @@ func TestClientWithMaxAPI(t *testing.T) {
627627
t.Parallel()
628628

629629
tests := []struct {
630+
name string
630631
apiVersions string
631632
expected int
632633
}{
633634
{
635+
name: "Test 1: API versions contains invalid version",
634636
apiVersions: `[4, 5, 6, 7, 8, 9, 25]`,
635637
expected: APIVersion,
636638
},
637639
{
640+
name: "Test 2: No API versions, default API Version is used",
638641
apiVersions: ``,
639642
expected: APIVersion,
640643
},
641644
{
645+
name: "Test 3: API version lower than default",
642646
apiVersions: `[4, 5, 6, 7]`,
643647
expected: 7,
644648
},
645649
{
650+
name: "Test 4: No API versions, default API version is used",
646651
apiVersions: `[""]`,
647652
expected: APIVersion,
648653
},
649654
}
650655

651-
for _, test := range tests {
652-
// Test creating a new client with max API version
653-
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
654-
switch {
655-
case r.RequestURI == "/":
656-
_, err := w.Write([]byte(test.apiVersions))
657-
if err != nil {
658-
t.Fatalf("unexpected error: %v", err)
659-
}
660-
default:
661-
_, err := w.Write([]byte(`{}`))
662-
if err != nil {
663-
t.Fatalf("unexpected error: %v", err)
656+
for _, tt := range tests {
657+
t.Run(tt.name, func(t *testing.T) {
658+
// Test creating a new client with max API version
659+
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
660+
switch {
661+
case r.RequestURI == "/":
662+
_, err := w.Write([]byte(tt.apiVersions))
663+
if err != nil {
664+
t.Fatalf("unexpected error: %v", err)
665+
}
666+
default:
667+
_, err := w.Write([]byte(`{}`))
668+
if err != nil {
669+
t.Fatalf("unexpected error: %v", err)
670+
}
664671
}
665-
}
666-
}))
667-
defer ts.Close()
672+
}))
673+
defer ts.Close()
668674

669-
client, err := NewNginxClient(ts.URL, WithMaxAPIVersion())
670-
if err != nil {
671-
t.Fatalf("unexpected error: %v", err)
672-
}
673-
if client == nil {
674-
t.Fatalf("client is nil")
675-
}
676-
if client.apiVersion != test.expected {
677-
t.Fatalf("expected client.apiVersion to be %v, but got %v", test.expected, client.apiVersion)
678-
}
675+
client, err := NewNginxClient(ts.URL, WithMaxAPIVersion())
676+
if err != nil {
677+
t.Fatalf("unexpected error: %v", err)
678+
}
679+
if client == nil {
680+
t.Fatalf("client is nil")
681+
}
682+
if client.apiVersion != tt.expected {
683+
t.Fatalf("expected client.apiVersion to be %v, but got %v", tt.expected, client.apiVersion)
684+
}
685+
})
679686
}
680687
}
681688

0 commit comments

Comments
 (0)