Skip to content

Commit f7f079a

Browse files
committed
fix: resolver_test now use a consistent assertion style
1 parent 437bfd1 commit f7f079a

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

listener/apischema/resolver_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package apischema
33
import (
44
"testing"
55

6+
"github.com/stretchr/testify/assert"
67
"k8s.io/apimachinery/pkg/api/meta"
78
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
89
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -57,9 +58,7 @@ var _ Resolver = (*ResolverProvider)(nil)
5758
// instance. This is a runtime check to ensure that the function behaves as expected.
5859
func TestNewResolverNotNil(t *testing.T) {
5960
r := NewResolver()
60-
if r == nil {
61-
t.Fatal("NewResolver() returned nil, expected non-nil *ResolverProvider")
62-
}
61+
assert.NotNil(t, r, "NewResolver() should return non-nil *ResolverProvider")
6362
}
6463

6564
// TestResolverProvider_Resolve tests the Resolve method of the ResolverProvider struct.
@@ -121,12 +120,11 @@ func TestResolverProvider_Resolve(t *testing.T) {
121120
rm := &mockRESTMapper{}
122121

123122
got, err := resolver.Resolve(dc, rm)
124-
if (err != nil) != tt.wantErr {
125-
t.Errorf("Resolver.Resolve() error = %v, wantErr %v", err, tt.wantErr)
126-
return
127-
}
128-
if !tt.wantErr && got == nil {
129-
t.Error("Resolver.Resolve() returned nil result when no error expected")
123+
if tt.wantErr {
124+
assert.Error(t, err, "should return error")
125+
} else {
126+
assert.NoError(t, err, "should not return error")
127+
assert.NotNil(t, got, "should return non-nil result when no error expected")
130128
}
131129
})
132130
}

0 commit comments

Comments
 (0)