fix: crd_resolver_test now use a consistent assertion style

Author: kekcleader

listener/apischema/crd_resolver_test.go

@@ -2,9 +2,11 @@ package apischema
 
 import (
 	"encoding/json"
-	"errors"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/openapi"
@@ -76,17 +78,9 @@ func TestGetCRDGroupKindVersions(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			gkv := getCRDGroupKindVersions(tc.spec)
-			if gkv.Group != tc.wantG || gkv.Kind != tc.wantKind {
-				t.Errorf("GroupKind mismatch: got %v/%v, want %v/%v", gkv.Group, gkv.Kind, tc.wantG, tc.wantKind)
-			}
-			if len(gkv.Versions) != len(tc.wantVers) {
-				t.Fatalf("Versions length: got %d, want %d", len(gkv.Versions), len(tc.wantVers))
-			}
-			for i, v := range tc.wantVers {
-				if gkv.Versions[i] != v {
-					t.Errorf("Versions[%d]: got %q, want %q", i, gkv.Versions[i], v)
-				}
-			}
+			assert.Equal(t, tc.wantG, gkv.Group, "Group mismatch")
+			assert.Equal(t, tc.wantKind, gkv.Kind, "Kind mismatch")
+			assert.Equal(t, tc.wantVers, gkv.Versions, "Versions mismatch")
 		})
 	}
 }
@@ -116,9 +110,7 @@ func TestIsCRDKindIncluded(t *testing.T) {
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			got := isCRDKindIncluded(tc.gkv, tc.apiList)
-			if got != tc.want {
-				t.Errorf("expected %v, got %v", tc.want, got)
-			}
+			assert.Equal(t, tc.want, got, "result mismatch")
 		})
 	}
 }
@@ -162,22 +154,11 @@ func TestErrorIfCRDNotInPreferredApiGroups(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			groups, err := errorIfCRDNotInPreferredApiGroups(gkv, tc.lists)
 			if tc.wantErr != nil {
-				if !errors.Is(err, tc.wantErr) {
-					t.Fatalf("expected error %v, got %v", tc.wantErr, err)
-				}
+				assert.ErrorIs(t, err, tc.wantErr)
 				return
 			}
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-			if len(groups) != len(tc.wantGroup) {
-				t.Fatalf("group count: got %d, want %d", len(groups), len(tc.wantGroup))
-			}
-			for i := range groups {
-				if groups[i] != tc.wantGroup[i] {
-					t.Errorf("groups[%d]: got %q, want %q", i, groups[i], tc.wantGroup[i])
-				}
-			}
+			require.NoError(t, err, "unexpected error")
+			assert.Equal(t, tc.wantGroup, groups, "groups mismatch")
 		})
 	}
 }
@@ -236,17 +217,11 @@ func TestGetSchemaForPath(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, err := getSchemaForPath(tc.preferred, tc.path, tc.gv)
 			if tc.wantErr != nil {
-				if !errors.Is(err, tc.wantErr) {
-					t.Fatalf("expected error %v, got %v", tc.wantErr, err)
-				}
+				assert.ErrorIs(t, err, tc.wantErr)
 				return
 			}
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-			if len(got) != tc.wantCount {
-				t.Errorf("schema count: got %d, want %d", len(got), tc.wantCount)
-			}
+			require.NoError(t, err, "unexpected error")
+			assert.Equal(t, tc.wantCount, len(got), "schema count mismatch")
 		})
 	}
 }
@@ -309,12 +284,11 @@ func TestResolveSchema(t *testing.T) {
 			}
 
 			got, err := resolveSchema(resolver, resolver)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("resolveSchema() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !tt.wantErr && got == nil {
-				t.Error("resolveSchema() returned nil result when no error expected")
+			if tt.wantErr {
+				assert.Error(t, err, "expected an error")
+			} else {
+				assert.NoError(t, err, "unexpected error")
+				assert.NotNil(t, got, "expected non-nil result")
 			}
 		})
 	}