Skip to content

Commit 878e302

Browse files
alpemreelmasalpemreelmas
committed
AYS-444 | Static success variable has been changed to the functional success method in test
1 parent 919c2b0 commit 878e302

11 files changed

+49
-47
lines changed

‎src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void givenValidAdminRegisterRequest_whenAdminRegistered_thenReturnSuccessRespons
376376
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
377377
.post(endpoint, mockRequest);
378378

379-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
379+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
380380

381381
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
382382
.andExpect(AysMockResultMatchersBuilders.status()
@@ -608,7 +608,7 @@ void givenValidAdminRegisterApplicationCompleteRequestWithParametrizedValidEmail
608608
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
609609
.post(endpoint, mockRequest);
610610

611-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
611+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
612612

613613
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
614614
.andExpect(AysMockResultMatchersBuilders.status()
@@ -667,7 +667,7 @@ void givenValidAdminRegisterApplicationId_whenApproveAdminRegisterApplication_th
667667
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
668668
.post(endpoint, mockSuperAdminToken.getAccessToken());
669669

670-
AysResponse<Void> mockResponse = AysResponse.SUCCESS;
670+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
671671

672672
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
673673
.andExpect(AysMockResultMatchersBuilders.status()
@@ -721,7 +721,7 @@ void givenValidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegisterA
721721
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
722722
.post(endpoint, mockSuperAdminToken.getAccessToken(), mockRequest);
723723

724-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
724+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
725725

726726
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
727727
.andExpect(AysMockResultMatchersBuilders.status()

‎src/test/java/org/ays/auth/controller/AdminRegistrationApplicationEndToEndTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ void givenValidAdminRegistrationApplicationCompleteRequest_whenAdminRegistered_t
357357
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
358358
.post(endpoint, completeRequest);
359359

360-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
360+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
361361

362362
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
363363
.andExpect(AysMockResultMatchersBuilders.status()
@@ -444,7 +444,7 @@ void givenValidAdminRegistrationApplicationId_whenApproveAdminRegistrationApplic
444444
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
445445
.post(endpoint, superAdminToken.getAccessToken());
446446

447-
AysResponse<Void> mockResponse = AysResponse.SUCCESS;
447+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
448448

449449
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
450450
.andExpect(AysMockResultMatchersBuilders.status()
@@ -666,7 +666,7 @@ void givenValidAdminRegistrationApplicationRejectRequest_whenRejectingAdminRegis
666666
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
667667
.post(endpoint, superAdminToken.getAccessToken(), rejectRequest);
668668

669-
AysResponse<Void> mockResponse = AysResponse.SUCCESS;
669+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
670670

671671
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
672672
.andExpect(AysMockResultMatchersBuilders.status()

‎src/test/java/org/ays/auth/controller/AysAuthControllerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void givenValidAysTokenInvalidateRequest_whenTokensInvalidated_thenReturnSuccess
206206
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
207207
.post(endpoint, mockUserToken.getAccessToken(), mockTokenInvalidateRequest);
208208

209-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
209+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
210210

211211
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
212212
.andExpect(AysMockResultMatchersBuilders.status()
@@ -237,7 +237,7 @@ void givenValidForgotPasswordRequest_whenSendPasswordCreateMail_thenReturnSucces
237237
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
238238
.post(endpoint, mockForgotPasswordRequest);
239239

240-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
240+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
241241

242242
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
243243
.andExpect(AysMockResultMatchersBuilders.status()
@@ -325,7 +325,7 @@ void givenValidId_whenCheckPasswordIdSuccessfully_thenReturnSuccessResponse() th
325325
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
326326
.get(endpoint);
327327

328-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
328+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
329329

330330
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
331331
.andExpect(AysMockResultMatchersBuilders.status()
@@ -382,7 +382,7 @@ void givenValidPasswordCreateRequest_whenPasswordCreated_thenReturnSuccessRespon
382382
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
383383
.post(endpoint, mockPasswordCreateRequest);
384384

385-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
385+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
386386

387387
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
388388
.andExpect(AysMockResultMatchersBuilders.status()

‎src/test/java/org/ays/auth/controller/AysAuthEndToEndTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void givenValidAysTokenInvalidateRequest_whenTokensInvalidated_thenReturnSuccess
121121
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
122122
.post(endpoint, userToken.getAccessToken(), tokenInvalidateRequest);
123123

124-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
124+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
125125

126126
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
127127
.andExpect(AysMockResultMatchersBuilders.status()
@@ -163,7 +163,7 @@ void givenValidForgotPasswordRequest_whenUserHasNotPasswordAndPasswordCreatedWit
163163
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
164164
.post(endpoint, mockForgotPasswordRequest);
165165

166-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
166+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
167167

168168
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
169169
.andExpect(AysMockResultMatchersBuilders.status()
@@ -224,7 +224,7 @@ void givenValidForgotPasswordRequest_whenUserHasPasswordAndPasswordCreatedWithLa
224224
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
225225
.post(endpoint, mockForgotPasswordRequest);
226226

227-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
227+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
228228

229229
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
230230
.andExpect(AysMockResultMatchersBuilders.status()
@@ -285,7 +285,7 @@ void givenValidId_whenCheckPasswordIdSuccessfully_thenReturnSuccessResponse() th
285285
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
286286
.get(endpoint);
287287

288-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
288+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
289289

290290
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
291291
.andExpect(AysMockResultMatchersBuilders.status()
@@ -335,7 +335,7 @@ void givenValidPasswordCreateRequest_whenPasswordCreated_thenReturnSuccessRespon
335335
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
336336
.post(endpoint, mockPasswordCreateRequest);
337337

338-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
338+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
339339

340340
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
341341
.andExpect(AysMockResultMatchersBuilders.status()

‎src/test/java/org/ays/auth/controller/AysRoleControllerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void givenValidRoleCreateRequest_whenRoleCreated_thenReturnSuccess() throws Exce
340340
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
341341
.post(endpoint, mockAdminToken.getAccessToken(), mockCreateRequest);
342342

343-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
343+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
344344

345345
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
346346
.andExpect(AysMockResultMatchersBuilders.status()
@@ -515,7 +515,7 @@ void givenValidIdAndRoleUpdateRequest_whenRoleUpdated_thenReturnSuccess() throws
515515
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
516516
.put(endpoint, mockAdminToken.getAccessToken(), mockUpdateRequest);
517517

518-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
518+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
519519

520520
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
521521
.andExpect(AysMockResultMatchersBuilders.status()
@@ -732,7 +732,7 @@ void givenValidId_whenRoleActivated_thenReturnSuccess() throws Exception {
732732
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
733733
.patch(endpoint, mockSuperAdminToken.getAccessToken());
734734

735-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
735+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
736736

737737
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
738738
.andExpect(AysMockResultMatchersBuilders.status()
@@ -811,7 +811,7 @@ void givenValidId_whenRolePassivated_thenReturnSuccess() throws Exception {
811811
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
812812
.patch(endpoint, mockSuperAdminToken.getAccessToken());
813813

814-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
814+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
815815

816816
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
817817
.andExpect(AysMockResultMatchersBuilders.status()
@@ -918,7 +918,7 @@ void givenValidId_whenRoleDeleted_thenReturnSuccess() throws Exception {
918918
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
919919
.delete(endpoint, mockAdminToken.getAccessToken());
920920

921-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
921+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
922922

923923
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
924924
.andExpect(AysMockResultMatchersBuilders.status()

‎src/test/java/org/ays/auth/controller/AysRoleEndToEndTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ void givenValidRoleCreateRequest_whenSuperRoleCreated_thenReturnSuccess() throws
309309
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
310310
.post(endpoint, superAdminToken.getAccessToken(), createRequest);
311311

312-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
312+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
313313

314314
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
315315
.andExpect(AysMockResultMatchersBuilders.status()
@@ -350,7 +350,7 @@ void givenValidRoleCreateRequest_whenRoleCreated_thenReturnSuccess() throws Exce
350350
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
351351
.post(endpoint, adminToken.getAccessToken(), createRequest);
352352

353-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
353+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
354354

355355
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
356356
.andExpect(AysMockResultMatchersBuilders.status()
@@ -437,7 +437,7 @@ void givenValidIdAndRoleUpdateRequest_whenSuperRoleUpdated_thenReturnSuccess() t
437437
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
438438
.put(endpoint, superAdminToken.getAccessToken(), updateRequest);
439439

440-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
440+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
441441

442442
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
443443
.andExpect(AysMockResultMatchersBuilders.status()
@@ -491,7 +491,7 @@ void givenValidRoleUpdateRequest_whenRoleUpdated_thenReturnSuccess() throws Exce
491491
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
492492
.put(endpoint, adminToken.getAccessToken(), updateRequest);
493493

494-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
494+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
495495

496496
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
497497
.andExpect(AysMockResultMatchersBuilders.status()
@@ -589,7 +589,7 @@ void givenId_whenRoleActivated_thenReturnSuccess() throws Exception {
589589
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
590590
.patch(endpoint, adminToken.getAccessToken());
591591

592-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
592+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
593593

594594
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
595595
.andExpect(AysMockResultMatchersBuilders.status()
@@ -634,7 +634,7 @@ void givenId_whenRolePassivated_thenReturnSuccess() throws Exception {
634634
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
635635
.patch(endpoint, adminToken.getAccessToken());
636636

637-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
637+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
638638

639639
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
640640
.andExpect(AysMockResultMatchersBuilders.status()
@@ -675,7 +675,7 @@ void givenValidId_whenRoleDeleted_thenReturnSuccess() throws Exception {
675675
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
676676
.delete(endpoint, adminToken.getAccessToken());
677677

678-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
678+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
679679

680680
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
681681
.andExpect(AysMockResultMatchersBuilders.status()

‎src/test/java/org/ays/auth/controller/AysUserControllerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ void givenUserCreateRequest_whenUserCreated_thenReturnSuccess() throws Exception
372372
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
373373
.post(endpoint, mockAdminToken.getAccessToken(), mockCreateRequest);
374374

375-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
375+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
376376

377377
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
378378
.andExpect(AysMockResultMatchersBuilders.status()
@@ -516,7 +516,7 @@ void givenValidIdAndUserUpdateRequest_whenUserUpdated_thenReturnSuccess() throws
516516
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
517517
.put(endpoint, mockAdminToken.getAccessToken(), mockUpdateRequest);
518518

519-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
519+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
520520

521521
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
522522
.andExpect(AysMockResultMatchersBuilders.status()
@@ -694,7 +694,7 @@ void givenValidId_whenActivateUser_thenReturnSuccess() throws Exception {
694694
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
695695
.patch(endpoint, mockAdminToken.getAccessToken());
696696

697-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
697+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
698698

699699
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
700700
.andExpect(AysMockResultMatchersBuilders.status()
@@ -773,7 +773,7 @@ void givenValidId_whenUserDeleted_thenReturnSuccess() throws Exception {
773773
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
774774
.delete(endpoint, mockAdminToken.getAccessToken());
775775

776-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
776+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
777777

778778
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
779779
.andExpect(AysMockResultMatchersBuilders.status()
@@ -852,7 +852,7 @@ void givenValidId_whenPassivateUser_thenReturnSuccess() throws Exception {
852852
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
853853
.patch(endpoint, mockAdminToken.getAccessToken());
854854

855-
AysResponse<Void> mockResponse = AysResponseBuilder.SUCCESS;
855+
AysResponse<Void> mockResponse = AysResponseBuilder.success();
856856

857857
aysMockMvc.perform(mockHttpServletRequestBuilder, mockResponse)
858858
.andExpect(AysMockResultMatchersBuilders.status()

0 commit comments

Comments
 (0)