Skip to content

Commit 1a2f1b0

Browse files
bjarneschroedercgoetz-inovex
bjarneschroeder
and
cgoetz-inovex
authored
Dremio: Apply suggestions from code review for waiter implementation.
Co-authored-by: cgoetz-inovex <carlo.goetz@inovex.de>
1 parent 79f84d8 commit 1a2f1b0

1 file changed

Lines changed: 132 additions & 120 deletions

File tree

‎services/dremio/v1alphaapi/wait/wait/wait_test.go‎

Lines changed: 132 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -99,29 +99,31 @@ func TestCreateDremioWaitHandler(t *testing.T) {
9999
}
100100
for _, currentTest := range tests {
101101
t.Run(currentTest.description, func(t *testing.T) {
102-
apiClient := newAPIMock(mockSettings{
103-
getFails: currentTest.getFails,
104-
resourceState: currentTest.resourceState,
105-
isDeleted: false,
106-
})
107-
108-
var expectedResponse *dremio.DremioResponse
109-
if currentTest.wantResponse {
110-
expectedResponse = &dremio.DremioResponse{
111-
State: currentTest.resourceState,
102+
synctest.Test(t, func(t *testing.T) {
103+
apiClient := newAPIMock(mockSettings{
104+
getFails: currentTest.getFails,
105+
resourceState: currentTest.resourceState,
106+
isDeleted: false,
107+
})
108+
109+
var expectedResponse *dremio.DremioResponse
110+
if currentTest.wantResponse {
111+
expectedResponse = &dremio.DremioResponse{
112+
State: currentTest.resourceState,
113+
}
112114
}
113-
}
114115

115-
handler := CreateDremioWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId")
116+
handler := CreateDremioWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId")
116117

117-
gotResponse, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())
118+
gotResponse, err := handler.WaitWithContext(context.Background())
118119

119-
if (err != nil) != currentTest.wantError {
120-
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
121-
}
122-
if !cmp.Equal(gotResponse, expectedResponse) {
123-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
124-
}
120+
if (err != nil) != currentTest.wantError {
121+
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
122+
}
123+
if !cmp.Equal(gotResponse, expectedResponse) {
124+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
125+
}
126+
})
125127
})
126128
}
127129
}
@@ -165,29 +167,31 @@ func TestUpdateDremioWaitHandler(t *testing.T) {
165167
}
166168
for _, currentTest := range tests {
167169
t.Run(currentTest.description, func(t *testing.T) {
168-
apiClient := newAPIMock(mockSettings{
169-
getFails: currentTest.getFails,
170-
resourceState: currentTest.resourceState,
171-
isDeleted: false,
172-
})
173-
174-
var expectedResponse *dremio.DremioResponse
175-
if currentTest.wantResponse {
176-
expectedResponse = &dremio.DremioResponse{
177-
State: currentTest.resourceState,
170+
synctest.Test(t, func(t *testing.T) {
171+
apiClient := newAPIMock(mockSettings{
172+
getFails: currentTest.getFails,
173+
resourceState: currentTest.resourceState,
174+
isDeleted: false,
175+
})
176+
177+
var expectedResponse *dremio.DremioResponse
178+
if currentTest.wantResponse {
179+
expectedResponse = &dremio.DremioResponse{
180+
State: currentTest.resourceState,
181+
}
178182
}
179-
}
180183

181-
handler := UpdateDremioWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId")
184+
handler := UpdateDremioWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId")
182185

183-
gotResponse, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())
186+
gotResponse, err := handler.WaitWithContext(context.Background())
184187

185-
if (err != nil) != currentTest.wantError {
186-
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
187-
}
188-
if !cmp.Equal(gotResponse, expectedResponse) {
189-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
190-
}
188+
if (err != nil) != currentTest.wantError {
189+
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
190+
}
191+
if !cmp.Equal(gotResponse, expectedResponse) {
192+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
193+
}
194+
})
191195
})
192196
}
193197
}
@@ -236,33 +240,35 @@ func TestDeleteDremioWaitHandler(t *testing.T) {
236240
}
237241
for _, currentTest := range tests {
238242
t.Run(currentTest.description, func(t *testing.T) {
239-
apiClient := newAPIMock(mockSettings{
240-
getFails: currentTest.getFails,
241-
resourceState: currentTest.resourceState,
242-
isDeleted: currentTest.isDeleted,
243-
})
244-
245-
var expectedResponse *dremio.DremioResponse
246-
if currentTest.wantResponse {
247-
expectedResponse = &dremio.DremioResponse{
248-
State: currentTest.resourceState,
243+
synctest.Test(t, func(t *testing.T) {
244+
apiClient := newAPIMock(mockSettings{
245+
getFails: currentTest.getFails,
246+
resourceState: currentTest.resourceState,
247+
isDeleted: currentTest.isDeleted,
248+
})
249+
250+
var expectedResponse *dremio.DremioResponse
251+
if currentTest.wantResponse {
252+
expectedResponse = &dremio.DremioResponse{
253+
State: currentTest.resourceState,
254+
}
249255
}
250-
}
251256

252-
handler := DeleteDremioWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId")
257+
handler := DeleteDremioWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId")
253258

254-
gotResponse, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())
259+
gotResponse, err := handler.WaitWithContext(context.Background())
255260

256-
if (err != nil) != currentTest.wantError {
257-
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
258-
}
261+
if (err != nil) != currentTest.wantError {
262+
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
263+
}
259264

260-
if !currentTest.wantResponse && gotResponse != nil {
261-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
262-
}
263-
if currentTest.wantResponse && !cmp.Equal(gotResponse, expectedResponse) {
264-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
265-
}
265+
if !currentTest.wantResponse && gotResponse != nil {
266+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
267+
}
268+
if currentTest.wantResponse && !cmp.Equal(gotResponse, expectedResponse) {
269+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
270+
}
271+
})
266272
})
267273
}
268274
}
@@ -306,29 +312,31 @@ func TestCreateDremioUserWaitHandler(t *testing.T) {
306312
}
307313
for _, currentTest := range tests {
308314
t.Run(currentTest.description, func(t *testing.T) {
309-
apiClient := newAPIMock(mockSettings{
310-
getFails: currentTest.getFails,
311-
resourceState: currentTest.resourceState,
312-
isDeleted: false,
313-
})
314-
315-
var expectedResponse *dremio.DremioUserResponse
316-
if currentTest.wantResponse {
317-
expectedResponse = &dremio.DremioUserResponse{
318-
State: currentTest.resourceState,
315+
synctest.Test(t, func(t *testing.T) {
316+
apiClient := newAPIMock(mockSettings{
317+
getFails: currentTest.getFails,
318+
resourceState: currentTest.resourceState,
319+
isDeleted: false,
320+
})
321+
322+
var expectedResponse *dremio.DremioUserResponse
323+
if currentTest.wantResponse {
324+
expectedResponse = &dremio.DremioUserResponse{
325+
State: currentTest.resourceState,
326+
}
319327
}
320-
}
321328

322-
handler := CreateDremioUserWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId", "userId")
329+
handler := CreateDremioUserWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId", "userId")
323330

324-
gotResponse, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())
331+
gotResponse, err := handler.WaitWithContext(context.Background())
325332

326-
if (err != nil) != currentTest.wantError {
327-
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
328-
}
329-
if !cmp.Equal(gotResponse, expectedResponse) {
330-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
331-
}
333+
if (err != nil) != currentTest.wantError {
334+
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
335+
}
336+
if !cmp.Equal(gotResponse, expectedResponse) {
337+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
338+
}
339+
})
332340
})
333341
}
334342
}
@@ -372,29 +380,31 @@ func TestUpdateDremioUserWaitHandler(t *testing.T) {
372380
}
373381
for _, currentTest := range tests {
374382
t.Run(currentTest.description, func(t *testing.T) {
375-
apiClient := newAPIMock(mockSettings{
376-
getFails: currentTest.getFails,
377-
resourceState: currentTest.resourceState,
378-
isDeleted: false,
379-
})
380-
381-
var expectedResponse *dremio.DremioUserResponse
382-
if currentTest.wantResponse {
383-
expectedResponse = &dremio.DremioUserResponse{
384-
State: currentTest.resourceState,
383+
synctest.Test(t, func(t *testing.T) {
384+
apiClient := newAPIMock(mockSettings{
385+
getFails: currentTest.getFails,
386+
resourceState: currentTest.resourceState,
387+
isDeleted: false,
388+
})
389+
390+
var expectedResponse *dremio.DremioUserResponse
391+
if currentTest.wantResponse {
392+
expectedResponse = &dremio.DremioUserResponse{
393+
State: currentTest.resourceState,
394+
}
385395
}
386-
}
387396

388-
handler := UpdateDremioUserWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId", "userId")
397+
handler := UpdateDremioUserWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId", "userId")
389398

390-
gotResponse, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())
399+
gotResponse, err := handler.WaitWithContext(context.Background())
391400

392-
if (err != nil) != currentTest.wantError {
393-
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
394-
}
395-
if !cmp.Equal(gotResponse, expectedResponse) {
396-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
397-
}
401+
if (err != nil) != currentTest.wantError {
402+
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
403+
}
404+
if !cmp.Equal(gotResponse, expectedResponse) {
405+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
406+
}
407+
})
398408
})
399409
}
400410
}
@@ -443,33 +453,35 @@ func TestDeleteDremioUserWaitHandler(t *testing.T) {
443453
}
444454
for _, currentTest := range tests {
445455
t.Run(currentTest.description, func(t *testing.T) {
446-
apiClient := newAPIMock(mockSettings{
447-
getFails: currentTest.getFails,
448-
resourceState: currentTest.resourceState,
449-
isDeleted: currentTest.isDeleted,
450-
})
451-
452-
var expectedResponse *dremio.DremioUserResponse
453-
if currentTest.wantResponse {
454-
expectedResponse = &dremio.DremioUserResponse{
455-
State: currentTest.resourceState,
456+
synctest.Test(t, func(t *testing.T) {
457+
apiClient := newAPIMock(mockSettings{
458+
getFails: currentTest.getFails,
459+
resourceState: currentTest.resourceState,
460+
isDeleted: currentTest.isDeleted,
461+
})
462+
463+
var expectedResponse *dremio.DremioUserResponse
464+
if currentTest.wantResponse {
465+
expectedResponse = &dremio.DremioUserResponse{
466+
State: currentTest.resourceState,
467+
}
456468
}
457-
}
458469

459-
handler := DeleteDremioUserWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId", "userId")
470+
handler := DeleteDremioUserWaitHandler(context.Background(), apiClient, "pid", "zid", "dremioId", "userId")
460471

461-
gotResponse, err := handler.SetTimeout(10 * time.Millisecond).WaitWithContext(context.Background())
472+
gotResponse, err := handler.WaitWithContext(context.Background())
462473

463-
if (err != nil) != currentTest.wantError {
464-
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
465-
}
474+
if (err != nil) != currentTest.wantError {
475+
t.Fatalf("handler error = %v, wantErr %v", err, currentTest.wantError)
476+
}
466477

467-
if !currentTest.wantResponse && gotResponse != nil {
468-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
469-
}
470-
if currentTest.wantResponse && !cmp.Equal(gotResponse, expectedResponse) {
471-
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
472-
}
478+
if !currentTest.wantResponse && gotResponse != nil {
479+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
480+
}
481+
if currentTest.wantResponse && !cmp.Equal(gotResponse, expectedResponse) {
482+
t.Fatalf("handler gotResponse = %v, expectedResponse = %v", gotResponse, expectedResponse)
483+
}
484+
})
473485
})
474486
}
475487
}

0 commit comments

Comments
 (0)