Skip to content

Commit 590d116

Browse files
kekcleaderkekcleader
committed
fix: reduced length of long lines
1 parent e241f7c commit 590d116

File tree

3 files changed

+178
-51
lines changed

3 files changed

+178
-51
lines changed

‎listener/apischema/builder_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ func TestNewSchemaBuilder(t *testing.T) {
112112
{
113113
name: "populates_schemas",
114114
client: &fakeClient{paths: map[string]openapi.GroupVersion{"/X/v1": fakeGV{data: func() []byte {
115-
d, _ := json.Marshal(&schemaResponse{Components: schemasComponentsWrapper{Schemas: map[string]*spec.Schema{"X.v1.K": {}}}})
115+
d, _ := json.Marshal(&schemaResponse{
116+
Components: schemasComponentsWrapper{Schemas: map[string]*spec.Schema{"X.v1.K": {}}}})
116117
return d
117118
}(), err: nil}}},
118119
wantLen: 1,

‎listener/apischema/crd_resolver_test.go

Lines changed: 79 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package apischema
22

33
import (
44
"encoding/json"
5+
"errors"
56
"testing"
67

7-
"github.com/stretchr/testify/assert"
8-
"github.com/stretchr/testify/require"
9-
108
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
119
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1210
"k8s.io/client-go/openapi"
@@ -78,9 +76,17 @@ func TestGetCRDGroupKindVersions(t *testing.T) {
7876
for _, tc := range tests {
7977
t.Run(tc.name, func(t *testing.T) {
8078
gkv := getCRDGroupKindVersions(tc.spec)
81-
assert.Equal(t, tc.wantG, gkv.Group, "Group mismatch")
82-
assert.Equal(t, tc.wantKind, gkv.Kind, "Kind mismatch")
83-
assert.Equal(t, tc.wantVers, gkv.Versions, "Versions mismatch")
79+
if gkv.Group != tc.wantG || gkv.Kind != tc.wantKind {
80+
t.Errorf("GroupKind mismatch: got %v/%v, want %v/%v", gkv.Group, gkv.Kind, tc.wantG, tc.wantKind)
81+
}
82+
if len(gkv.Versions) != len(tc.wantVers) {
83+
t.Fatalf("Versions length: got %d, want %d", len(gkv.Versions), len(tc.wantVers))
84+
}
85+
for i, v := range tc.wantVers {
86+
if gkv.Versions[i] != v {
87+
t.Errorf("Versions[%d]: got %q, want %q", i, gkv.Versions[i], v)
88+
}
89+
}
8490
})
8591
}
8692
}
@@ -95,22 +101,47 @@ func TestIsCRDKindIncluded(t *testing.T) {
95101
want bool
96102
}{
97103
{
98-
name: "kind_present",
99-
gkv: &GroupKindVersions{GroupKind: &metav1.GroupKind{Group: "g", Kind: "KindA"}, Versions: []string{"v1"}},
100-
apiList: &metav1.APIResourceList{GroupVersion: "g/v1", APIResources: []metav1.APIResource{{Kind: "KindA"}, {Kind: "Other"}}},
101-
want: true,
104+
name: "kind_present",
105+
gkv: &GroupKindVersions{
106+
GroupKind: &metav1.GroupKind{
107+
Group: "g",
108+
Kind: "KindA",
109+
},
110+
Versions: []string{"v1"},
111+
},
112+
apiList: &metav1.APIResourceList{
113+
GroupVersion: "g/v1",
114+
APIResources: []metav1.APIResource{
115+
{Kind: "KindA"},
116+
{Kind: "Other"},
117+
},
118+
},
119+
want: true,
102120
},
103121
{
104-
name: "kind_absent",
105-
gkv: &GroupKindVersions{GroupKind: &metav1.GroupKind{Group: "g", Kind: "KindA"}, Versions: []string{"v1"}},
106-
apiList: &metav1.APIResourceList{GroupVersion: "g/v1", APIResources: []metav1.APIResource{{Kind: "Different"}}},
107-
want: false,
122+
name: "kind_absent",
123+
gkv: &GroupKindVersions{
124+
GroupKind: &metav1.GroupKind{
125+
Group: "g",
126+
Kind: "KindA",
127+
},
128+
Versions: []string{"v1"},
129+
},
130+
apiList: &metav1.APIResourceList{
131+
GroupVersion: "g/v1",
132+
APIResources: []metav1.APIResource{
133+
{Kind: "Different"},
134+
},
135+
},
136+
want: false,
108137
},
109138
}
110139
for _, tc := range tests {
111140
t.Run(tc.name, func(t *testing.T) {
112141
got := isCRDKindIncluded(tc.gkv, tc.apiList)
113-
assert.Equal(t, tc.want, got, "result mismatch")
142+
if got != tc.want {
143+
t.Errorf("expected %v, got %v", tc.want, got)
144+
}
114145
})
115146
}
116147
}
@@ -129,7 +160,7 @@ func TestErrorIfCRDNotInPreferredApiGroups(t *testing.T) {
129160
wantGroup []string
130161
}{
131162
{
132-
name: "kind_found",
163+
name: "kind found",
133164
lists: []*metav1.APIResourceList{
134165
{
135166
GroupVersion: "g/v2",
@@ -154,11 +185,22 @@ func TestErrorIfCRDNotInPreferredApiGroups(t *testing.T) {
154185
t.Run(tc.name, func(t *testing.T) {
155186
groups, err := errorIfCRDNotInPreferredApiGroups(gkv, tc.lists)
156187
if tc.wantErr != nil {
157-
assert.ErrorIs(t, err, tc.wantErr)
188+
if !errors.Is(err, tc.wantErr) {
189+
t.Fatalf("expected error %v, got %v", tc.wantErr, err)
190+
}
158191
return
159192
}
160-
require.NoError(t, err, "unexpected error")
161-
assert.Equal(t, tc.wantGroup, groups, "groups mismatch")
193+
if err != nil {
194+
t.Fatalf("unexpected error: %v", err)
195+
}
196+
if len(groups) != len(tc.wantGroup) {
197+
t.Fatalf("group count: got %d, want %d", len(groups), len(tc.wantGroup))
198+
}
199+
for i := range groups {
200+
if groups[i] != tc.wantGroup[i] {
201+
t.Errorf("groups[%d]: got %q, want %q", i, groups[i], tc.wantGroup[i])
202+
}
203+
}
162204
})
163205
}
164206
}
@@ -197,7 +239,7 @@ func TestGetSchemaForPath(t *testing.T) {
197239
wantErr: ErrNotPreferred,
198240
},
199241
{
200-
name: "unmarshal_error",
242+
name: "unmarshal error",
201243
preferred: []string{"g/v1"},
202244
path: "/g/v1",
203245
gv: fakeGV{data: []byte("bad json"), err: nil},
@@ -217,11 +259,17 @@ func TestGetSchemaForPath(t *testing.T) {
217259
t.Run(tc.name, func(t *testing.T) {
218260
got, err := getSchemaForPath(tc.preferred, tc.path, tc.gv)
219261
if tc.wantErr != nil {
220-
assert.ErrorIs(t, err, tc.wantErr)
262+
if !errors.Is(err, tc.wantErr) {
263+
t.Fatalf("expected error %v, got %v", tc.wantErr, err)
264+
}
221265
return
222266
}
223-
require.NoError(t, err, "unexpected error")
224-
assert.Equal(t, tc.wantCount, len(got), "schema count mismatch")
267+
if err != nil {
268+
t.Fatalf("unexpected error: %v", err)
269+
}
270+
if len(got) != tc.wantCount {
271+
t.Errorf("schema count: got %d, want %d", len(got), tc.wantCount)
272+
}
225273
})
226274
}
227275
}
@@ -238,7 +286,7 @@ func TestResolveSchema(t *testing.T) {
238286
wantErr bool
239287
}{
240288
{
241-
name: "discovery_error",
289+
name: "discovery error",
242290
err: ErrGetServerPreferred,
243291
wantErr: true,
244292
},
@@ -262,7 +310,7 @@ func TestResolveSchema(t *testing.T) {
262310
wantErr: false,
263311
},
264312
{
265-
name: "empty_resources_list",
313+
name: "empty resources list",
266314
preferredResources: []*metav1.APIResourceList{},
267315
openAPIPaths: map[string]openapi.GroupVersion{
268316
"/api/v1": fakeGV{},
@@ -284,11 +332,12 @@ func TestResolveSchema(t *testing.T) {
284332
}
285333

286334
got, err := resolveSchema(resolver, resolver)
287-
if tt.wantErr {
288-
assert.Error(t, err, "expected an error")
289-
} else {
290-
assert.NoError(t, err, "unexpected error")
291-
assert.NotNil(t, got, "expected non-nil result")
335+
if (err != nil) != tt.wantErr {
336+
t.Errorf("resolveSchema() error = %v, wantErr %v", err, tt.wantErr)
337+
return
338+
}
339+
if !tt.wantErr && got == nil {
340+
t.Error("resolveSchema() returned nil result when no error expected")
292341
}
293342
})
294343
}

‎listener/controller/apibinding_controller_test.go

Lines changed: 97 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,15 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
4545
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
4646
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
4747

48-
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(nil).
49-
Run(func(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) {
48+
controllerRuntimeClient.EXPECT().
49+
Get(mock.Anything, mock.Anything, mock.Anything).
50+
Return(nil).
51+
Run(func(
52+
ctx context.Context,
53+
key client.ObjectKey,
54+
obj client.Object,
55+
opts ...client.GetOption,
56+
) {
5057
lc := obj.(*kcpcore.LogicalCluster) // Get the pointer argument
5158
lc.Annotations = map[string]string{
5259
"kcp.io/path": "dev-cluster",
@@ -61,11 +68,23 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
6168
{
6269
name: "workspace_delete_error",
6370
clusterName: "dev-cluster",
64-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
71+
mockSetup: func(
72+
ioHandler *workspacefileMocks.MockIOHandler,
73+
discoverFactory *discoveryclientMocks.MockFactory,
74+
apiSchemaResolver *apischemaMocks.MockResolver,
75+
clusterPathResolver *clusterpathMocks.MockResolver,
76+
) {
6577
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
6678
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
67-
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(nil).
68-
Run(func(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) {
79+
controllerRuntimeClient.EXPECT().
80+
Get(mock.Anything, mock.Anything, mock.Anything).
81+
Return(nil).
82+
Run(func(
83+
ctx context.Context,
84+
key client.ObjectKey,
85+
obj client.Object,
86+
opts ...client.GetOption,
87+
) {
6988
lc := obj.(*kcpcore.LogicalCluster)
7089
lc.Annotations = map[string]string{
7190
"kcp.io/path": "dev-cluster",
@@ -79,7 +98,12 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
7998
{
8099
name: "missing_annotation_error",
81100
clusterName: "dev-cluster",
82-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
101+
mockSetup: func(
102+
ioHandler *workspacefileMocks.MockIOHandler,
103+
discoverFactory *discoveryclientMocks.MockFactory,
104+
apiSchemaResolver *apischemaMocks.MockResolver,
105+
clusterPathResolver *clusterpathMocks.MockResolver,
106+
) {
83107
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
84108
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
85109
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(nil)
@@ -89,7 +113,12 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
89113
{
90114
name: "nil_annotation_error",
91115
clusterName: "dev-cluster",
92-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
116+
mockSetup: func(
117+
ioHandler *workspacefileMocks.MockIOHandler,
118+
discoverFactory *discoveryclientMocks.MockFactory,
119+
apiSchemaResolver *apischemaMocks.MockResolver,
120+
clusterPathResolver *clusterpathMocks.MockResolver,
121+
) {
93122
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
94123
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
95124
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(nil).
@@ -102,11 +131,23 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
102131
{
103132
name: "empty_annotation_error",
104133
clusterName: "dev-cluster",
105-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
134+
mockSetup: func(
135+
ioHandler *workspacefileMocks.MockIOHandler,
136+
discoverFactory *discoveryclientMocks.MockFactory,
137+
apiSchemaResolver *apischemaMocks.MockResolver,
138+
clusterPathResolver *clusterpathMocks.MockResolver,
139+
) {
106140
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
107141
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
108-
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(nil).
109-
Run(func(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) {
142+
controllerRuntimeClient.EXPECT().
143+
Get(mock.Anything, mock.Anything, mock.Anything).
144+
Return(nil).
145+
Run(func(
146+
ctx context.Context,
147+
key client.ObjectKey,
148+
obj client.Object,
149+
opts ...client.GetOption,
150+
) {
110151
lc := obj.(*kcpcore.LogicalCluster)
111152
lc.Annotations = map[string]string{
112153
"kcp.io/path": "",
@@ -122,7 +163,12 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
122163
{
123164
name: "logicalcluster_get_error",
124165
clusterName: "dev-cluster",
125-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
166+
mockSetup: func(
167+
ioHandler *workspacefileMocks.MockIOHandler,
168+
discoverFactory *discoveryclientMocks.MockFactory,
169+
apiSchemaResolver *apischemaMocks.MockResolver,
170+
clusterPathResolver *clusterpathMocks.MockResolver,
171+
) {
126172
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
127173
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
128174
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(assert.AnError)
@@ -132,19 +178,36 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
132178
{
133179
name: "client_for_cluster_error",
134180
clusterName: "dev-cluster",
135-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
181+
mockSetup: func(
182+
ioHandler *workspacefileMocks.MockIOHandler,
183+
discoverFactory *discoveryclientMocks.MockFactory,
184+
apiSchemaResolver *apischemaMocks.MockResolver,
185+
clusterPathResolver *clusterpathMocks.MockResolver,
186+
) {
136187
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(nil, assert.AnError)
137188
},
138189
err: assert.AnError,
139190
},
140191
{
141192
name: "successful_schema_update",
142193
clusterName: "dev-cluster",
143-
mockSetup: func(ioHandler *workspacefileMocks.MockIOHandler, discoverFactory *discoveryclientMocks.MockFactory, apiSchemaResolver *apischemaMocks.MockResolver, clusterPathResolver *clusterpathMocks.MockResolver) {
194+
mockSetup: func(
195+
ioHandler *workspacefileMocks.MockIOHandler,
196+
discoverFactory *discoveryclientMocks.MockFactory,
197+
apiSchemaResolver *apischemaMocks.MockResolver,
198+
clusterPathResolver *clusterpathMocks.MockResolver,
199+
) {
144200
controllerRuntimeClient := &controllerRuntimeMocks.MockClient{}
145201
clusterPathResolver.EXPECT().ClientForCluster("dev-cluster").Return(controllerRuntimeClient, nil)
146-
controllerRuntimeClient.EXPECT().Get(mock.Anything, mock.Anything, mock.Anything).Return(nil).
147-
Run(func(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) {
202+
controllerRuntimeClient.EXPECT().
203+
Get(mock.Anything, mock.Anything, mock.Anything).
204+
Return(nil).
205+
Run(func(
206+
ctx context.Context,
207+
key client.ObjectKey,
208+
obj client.Object,
209+
opts ...client.GetOption,
210+
) {
148211
lc := obj.(*kcpcore.LogicalCluster)
149212
lc.Annotations = map[string]string{
150213
"kcp.io/path": "dev-cluster",
@@ -164,15 +227,29 @@ func TestAPIBindingReconciler_Reconcile(t *testing.T) {
164227
for _, tt := range tests {
165228
t.Run(tt.name, func(t *testing.T) {
166229
ioHandler := workspacefileMocks.NewMockIOHandler(t)
167-
discoverFactory := discoveryclientMocks.NewMockFactory(t)
168-
apiSchemaResolver := apischemaMocks.NewMockResolver(t)
169-
clusterPathResolver := clusterpathMocks.NewMockResolver(t)
230+
discoverFactory := discoveryclientMocks.
231+
NewMockFactory(t)
232+
apiSchemaResolver := apischemaMocks.
233+
NewMockResolver(t)
234+
clusterPathResolver := clusterpathMocks.
235+
NewMockResolver(t)
170236

171237
if tt.mockSetup != nil {
172-
tt.mockSetup(ioHandler, discoverFactory, apiSchemaResolver, clusterPathResolver)
238+
tt.mockSetup(
239+
ioHandler,
240+
discoverFactory,
241+
apiSchemaResolver,
242+
clusterPathResolver,
243+
)
173244
}
174245

175-
r := controller.NewAPIBindingReconciler(ioHandler, discoverFactory, apiSchemaResolver, clusterPathResolver, log)
246+
r := controller.NewAPIBindingReconciler(
247+
ioHandler,
248+
discoverFactory,
249+
apiSchemaResolver,
250+
clusterPathResolver,
251+
log,
252+
)
176253
_, err := r.Reconcile(context.Background(), ctrl.Request{ClusterName: tt.clusterName})
177254

178255
if tt.name == "logicalcluster_get_error" {

0 commit comments

Comments
 (0)