@@ -3,6 +3,7 @@ package apischema
3
3
import (
4
4
"testing"
5
5
6
+ "github.com/stretchr/testify/assert"
6
7
"k8s.io/apimachinery/pkg/api/meta"
7
8
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8
9
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -57,9 +58,7 @@ var _ Resolver = (*ResolverProvider)(nil)
57
58
// instance. This is a runtime check to ensure that the function behaves as expected.
58
59
func TestNewResolverNotNil (t * testing.T ) {
59
60
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" )
63
62
}
64
63
65
64
// TestResolverProvider_Resolve tests the Resolve method of the ResolverProvider struct.
@@ -121,12 +120,11 @@ func TestResolverProvider_Resolve(t *testing.T) {
121
120
rm := & mockRESTMapper {}
122
121
123
122
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" )
130
128
}
131
129
})
132
130
}
0 commit comments