From adb70fc5e94fd779fb5512838febc194d08cf41d Mon Sep 17 00:00:00 2001 From: Egehan Asal Date: Sun, 24 Nov 2024 16:43:08 +0300 Subject: [PATCH 1/6] AYS-550 | Trailing or Leading Space Validation Has Been Removed from `NoSpecialCharacterValidator` --- .../util/validation/NoSpecialCharacterValidator.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/org/ays/common/util/validation/NoSpecialCharacterValidator.java b/src/main/java/org/ays/common/util/validation/NoSpecialCharacterValidator.java index 812649cd4..7c81c52d6 100644 --- a/src/main/java/org/ays/common/util/validation/NoSpecialCharacterValidator.java +++ b/src/main/java/org/ays/common/util/validation/NoSpecialCharacterValidator.java @@ -31,15 +31,6 @@ public boolean isValid(String value, ConstraintValidatorContext constraintValida return true; } - boolean startsOrEndsWithSpace = value.matches("^\\s.*|.*\\s$"); - - if (startsOrEndsWithSpace) { - constraintValidatorContext.disableDefaultConstraintViolation(); - constraintValidatorContext.buildConstraintViolationWithTemplate("cannot start or end with space") - .addConstraintViolation(); - return false; - } - boolean containsOnlyDigits = value.matches("^\\d+$"); if (containsOnlyDigits) { From 6ea4866bf7e185261cee61d1ff64477828a61b1e Mon Sep 17 00:00:00 2001 From: Egehan Asal Date: Sun, 24 Nov 2024 16:43:51 +0300 Subject: [PATCH 2/6] AYS-550 | `NoTrailingOrLeadingSpaces` Annotation Has Been Created and Implemented --- ...nRegistrationApplicationCreateRequest.java | 2 + ...nRegistrationApplicationRejectRequest.java | 2 + .../validation/NoTrailingOrLeadingSpaces.java | 39 +++++++++++++++++++ .../NoTrailingOrLeadingSpacesValidator.java | 26 +++++++++++++ ...ncyEvacuationApplicationUpdateRequest.java | 2 + 5 files changed, 71 insertions(+) create mode 100644 src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java create mode 100644 src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java diff --git a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java index c1c32eb17..9534af0b2 100644 --- a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java +++ b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java @@ -5,6 +5,7 @@ import lombok.Getter; import lombok.Setter; import org.ays.common.util.validation.NoSpecialCharacters; +import org.ays.common.util.validation.NoTrailingOrLeadingSpaces; /** * Represents a request to register a new admin application. The request includes fields for the required @@ -26,6 +27,7 @@ public class AdminRegistrationApplicationCreateRequest { @NotBlank @Size(min = 40, max = 512) @NoSpecialCharacters + @NoTrailingOrLeadingSpaces private String reason; } diff --git a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java index 8c5006eab..8a845d4cd 100644 --- a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java +++ b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java @@ -4,6 +4,7 @@ import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; +import org.ays.common.util.validation.NoTrailingOrLeadingSpaces; /** * Represents a request to reject a new admin application. The request includes fields for the required application reject reason. @@ -17,6 +18,7 @@ public class AdminRegistrationApplicationRejectRequest { */ @NotBlank @Size(min = 40, max = 512) + @NoTrailingOrLeadingSpaces private String rejectReason; } diff --git a/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java b/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java new file mode 100644 index 000000000..c5faa650c --- /dev/null +++ b/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java @@ -0,0 +1,39 @@ +package org.ays.common.util.validation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation to validate a text using {@link NoTrailingOrLeadingSpacesValidator}. + */ +@Target(value = ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = NoTrailingOrLeadingSpacesValidator.class) +public @interface NoTrailingOrLeadingSpaces { + + /** + * Returns the error message when the text is not valid. + * + * @return the error message + */ + String message() default "must be valid"; + + /** + * Returns the validation groups to which this constraint belongs. + * + * @return the validation groups + */ + Class[] groups() default {}; + + /** + * Returns the payload associated to this constraint. + * + * @return the payload + */ + Class[] payload() default {}; +} diff --git a/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java b/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java new file mode 100644 index 000000000..76e0c696e --- /dev/null +++ b/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java @@ -0,0 +1,26 @@ +package org.ays.common.util.validation; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +/** + * A custom validator implementation for the {@link NoTrailingOrLeadingSpaces} annotation. + * Validates whether the provided text does not have + * trailing or leading spaces. + */ +class NoTrailingOrLeadingSpacesValidator implements ConstraintValidator { + + @Override + public boolean isValid(String text, ConstraintValidatorContext constraintValidatorContext) { + + if (text.startsWith(" ") || text.endsWith(" ")) { + constraintValidatorContext.disableDefaultConstraintViolation(); + constraintValidatorContext.buildConstraintViolationWithTemplate("cannot start or end with space") + .addConstraintViolation(); + return false; + } + + return true; + } + +} diff --git a/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java b/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java index 061acfff1..2faa91e6c 100644 --- a/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java +++ b/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java @@ -4,6 +4,7 @@ import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; +import org.ays.common.util.validation.NoTrailingOrLeadingSpaces; import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus; import org.hibernate.validator.constraints.Range; @@ -43,6 +44,7 @@ public class EmergencyEvacuationApplicationUpdateRequest { * The notes can have a maximum length of 1000 characters. */ @Size(max = 1000) + @NoTrailingOrLeadingSpaces private String notes; } From 88510253a673cb6ffed966165bd58053af762a33 Mon Sep 17 00:00:00 2001 From: Egehan Asal Date: Sun, 24 Nov 2024 17:33:06 +0300 Subject: [PATCH 3/6] AYS-550 | Controller Tests Have Been Updated --- ...RegistrationApplicationControllerTest.java | 45 +++++++++++++++++++ ...cyEvacuationApplicationControllerTest.java | 30 ++++--------- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java index 299be1066..08eaefaee 100644 --- a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java +++ b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java @@ -768,4 +768,49 @@ void givenValidAdminRegisterApplicationRejectRequest_whenUnauthorizedForRejectin .reject(Mockito.eq(mockId), Mockito.any(AdminRegistrationApplicationRejectRequest.class)); } + @ParameterizedTest + @ValueSource(strings = { + "", + " ", + "less than 40", + """ + Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. + Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. + Donec qudam felis, ultricies nec, pellentesque eu, pretscsxwium quis, sem. Nulla consequat massa quis + enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, + imperdiet a, venenatdskjvndshjcndsis vitae, justo. Nullam dictum felis eu pedde mollis pretium. Integer tincidunt. + Cras dapibus. Vivdamus ewl + """, + " spaceAtTheBeginning", + "spaceAtTheEnd ", + " both ", + " justAString " + }) + void givenValidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegisterApplication_thenReturnValidationError(String reason) throws Exception { + + // Given + String mockId = "4d04bd1e-6318-43ba-ab40-57efb8afc918"; + AdminRegistrationApplicationRejectRequest mockRequest = new AdminRegistrationApplicationRejectRequestBuilder() + .withValidValues() + .withRejectReason(reason) + .build(); + + // Then + String endpoint = BASE_PATH.concat("/admin-registration-application/").concat(mockId).concat("/reject"); + MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders + .post(endpoint, mockUserToken.getAccessToken(), mockRequest); + + AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.VALIDATION_ERROR; + + aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse) + .andExpect(AysMockResultMatchersBuilders.status() + .isBadRequest()) + .andExpect(AysMockResultMatchersBuilders.subErrors() + .isNotEmpty()); + + // Verify + Mockito.verify(adminRegistrationApplicationService, Mockito.never()) + .reject(Mockito.anyString(), Mockito.any()); + } + } diff --git a/src/test/java/org/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java b/src/test/java/org/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java index f58b3ef44..c10dde12d 100644 --- a/src/test/java/org/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java +++ b/src/test/java/org/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java @@ -133,11 +133,7 @@ void givenInvalidEmergencyEvacuationApplicationListRequest_whenReferenceNumberNo ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,", "t", "151201485621548562154851458614125461254125412", - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices.", - " spaceAtTheBeginning", - "spaceAtTheEnd ", - " both ", - " justAString " + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices." }) void givenInvalidEmergencyEvacuationApplicationListRequest_whenSourceCityNotValid_thenReturnValidationError(String sourceCity) throws Exception { @@ -173,11 +169,7 @@ void givenInvalidEmergencyEvacuationApplicationListRequest_whenSourceCityNotVali ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,", "t", "151201485621548562154851458614125461254125412", - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices.", - " spaceAtTheBeginning", - "spaceAtTheEnd ", - " both ", - " justAString ", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices." }) void givenInvalidEmergencyEvacuationApplicationListRequest_whenSourceDistrictNotValid_thenReturnValidationError(String sourceDistrict) throws Exception { @@ -245,11 +237,7 @@ void givenInvalidEmergencyEvacuationApplicationListRequest_whenSeatingCountNotVa ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,", "t", "151201485621548562154851458614125461254125412", - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices.", - " spaceAtTheBeginning", - "spaceAtTheEnd ", - " both ", - " justAString ", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices." }) void givenInvalidEmergencyEvacuationApplicationListRequest_whenTargetCityNotValid_thenReturnValidationError(String targetCity) throws Exception { @@ -285,11 +273,7 @@ void givenInvalidEmergencyEvacuationApplicationListRequest_whenTargetCityNotVali ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,", "t", "151201485621548562154851458614125461254125412", - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices.", - " spaceAtTheBeginning", - "spaceAtTheEnd ", - " both ", - " justAString ", + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices." }) void givenInvalidEmergencyEvacuationApplicationListRequest_whenTargetDistrictNotValid_thenReturnValidationError(String targetDistrict) throws Exception { @@ -1124,7 +1108,11 @@ void givenValidIdAndUpdateRequest_whenStatusDoesNotValid_thenReturnValidationErr """ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32. The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham. - """ + """, + " spaceAtTheBeginning", + "spaceAtTheEnd ", + " both ", + " justAString " }) void givenValidIdAndUpdateRequest_whenNotesDoesNotValid_thenReturnValidationError(String mockNotes) throws Exception { // Given From efccea4a4559f6db866e8dfeb7a6d39140cc5202 Mon Sep 17 00:00:00 2001 From: Egehan Asal Date: Sun, 1 Dec 2024 01:30:57 +0300 Subject: [PATCH 4/6] AYS-550 | Validator Has Been Renamed and Updated --- ...nRegistrationApplicationCreateRequest.java | 4 +-- ...nRegistrationApplicationRejectRequest.java | 4 +-- ...LeadingSpaces.java => NoSpacesAround.java} | 8 +++--- .../validation/NoSpacesAroundValidator.java | 25 ++++++++++++++++++ .../NoTrailingOrLeadingSpacesValidator.java | 26 ------------------- ...ncyEvacuationApplicationUpdateRequest.java | 4 +-- 6 files changed, 35 insertions(+), 36 deletions(-) rename src/main/java/org/ays/common/util/validation/{NoTrailingOrLeadingSpaces.java => NoSpacesAround.java} (76%) create mode 100644 src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java delete mode 100644 src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java diff --git a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java index 9534af0b2..8631bc67f 100644 --- a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java +++ b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCreateRequest.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.Setter; import org.ays.common.util.validation.NoSpecialCharacters; -import org.ays.common.util.validation.NoTrailingOrLeadingSpaces; +import org.ays.common.util.validation.NoSpacesAround; /** * Represents a request to register a new admin application. The request includes fields for the required @@ -27,7 +27,7 @@ public class AdminRegistrationApplicationCreateRequest { @NotBlank @Size(min = 40, max = 512) @NoSpecialCharacters - @NoTrailingOrLeadingSpaces + @NoSpacesAround private String reason; } diff --git a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java index 8a845d4cd..a6db27356 100644 --- a/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java +++ b/src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationRejectRequest.java @@ -4,7 +4,7 @@ import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; -import org.ays.common.util.validation.NoTrailingOrLeadingSpaces; +import org.ays.common.util.validation.NoSpacesAround; /** * Represents a request to reject a new admin application. The request includes fields for the required application reject reason. @@ -18,7 +18,7 @@ public class AdminRegistrationApplicationRejectRequest { */ @NotBlank @Size(min = 40, max = 512) - @NoTrailingOrLeadingSpaces + @NoSpacesAround private String rejectReason; } diff --git a/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java b/src/main/java/org/ays/common/util/validation/NoSpacesAround.java similarity index 76% rename from src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java rename to src/main/java/org/ays/common/util/validation/NoSpacesAround.java index c5faa650c..fa154006e 100644 --- a/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpaces.java +++ b/src/main/java/org/ays/common/util/validation/NoSpacesAround.java @@ -9,19 +9,19 @@ import java.lang.annotation.Target; /** - * Annotation to validate a text using {@link NoTrailingOrLeadingSpacesValidator}. + * Annotation to validate a text using {@link NoSpacesAroundValidator}. */ @Target(value = ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) -@Constraint(validatedBy = NoTrailingOrLeadingSpacesValidator.class) -public @interface NoTrailingOrLeadingSpaces { +@Constraint(validatedBy = NoSpacesAroundValidator.class) +public @interface NoSpacesAround { /** * Returns the error message when the text is not valid. * * @return the error message */ - String message() default "must be valid"; + String message() default "cannot start or end with space"; /** * Returns the validation groups to which this constraint belongs. diff --git a/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java b/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java new file mode 100644 index 000000000..beec8bf29 --- /dev/null +++ b/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java @@ -0,0 +1,25 @@ +package org.ays.common.util.validation; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.springframework.util.StringUtils; + +/** + * A custom validator implementation for the {@link NoSpacesAround} annotation. + * Validates whether the provided text does not have + * trailing or leading spaces. + */ +class NoSpacesAroundValidator implements ConstraintValidator { + + @Override + public boolean isValid(String text, ConstraintValidatorContext constraintValidatorContext) { + + if (!StringUtils.hasText(text)) { + return true; + } + + return !(text.startsWith(" ") || text.endsWith(" ")); + + } + +} diff --git a/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java b/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java deleted file mode 100644 index 76e0c696e..000000000 --- a/src/main/java/org/ays/common/util/validation/NoTrailingOrLeadingSpacesValidator.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.ays.common.util.validation; - -import jakarta.validation.ConstraintValidator; -import jakarta.validation.ConstraintValidatorContext; - -/** - * A custom validator implementation for the {@link NoTrailingOrLeadingSpaces} annotation. - * Validates whether the provided text does not have - * trailing or leading spaces. - */ -class NoTrailingOrLeadingSpacesValidator implements ConstraintValidator { - - @Override - public boolean isValid(String text, ConstraintValidatorContext constraintValidatorContext) { - - if (text.startsWith(" ") || text.endsWith(" ")) { - constraintValidatorContext.disableDefaultConstraintViolation(); - constraintValidatorContext.buildConstraintViolationWithTemplate("cannot start or end with space") - .addConstraintViolation(); - return false; - } - - return true; - } - -} diff --git a/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java b/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java index 2faa91e6c..b584c0d39 100644 --- a/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java +++ b/src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationUpdateRequest.java @@ -4,7 +4,7 @@ import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; -import org.ays.common.util.validation.NoTrailingOrLeadingSpaces; +import org.ays.common.util.validation.NoSpacesAround; import org.ays.emergency_application.model.enums.EmergencyEvacuationApplicationStatus; import org.hibernate.validator.constraints.Range; @@ -44,7 +44,7 @@ public class EmergencyEvacuationApplicationUpdateRequest { * The notes can have a maximum length of 1000 characters. */ @Size(max = 1000) - @NoTrailingOrLeadingSpaces + @NoSpacesAround private String notes; } From 90b6a8bd643591c0389e6f42ad435affc0f4e776 Mon Sep 17 00:00:00 2001 From: Egehan Asal Date: Fri, 6 Dec 2024 23:10:25 +0300 Subject: [PATCH 5/6] AYS-550 | Test Method Name Has Been Fixed --- .../controller/AdminRegistrationApplicationControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java index 08eaefaee..deb0b5fd9 100644 --- a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java +++ b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java @@ -786,7 +786,7 @@ void givenValidAdminRegisterApplicationRejectRequest_whenUnauthorizedForRejectin " both ", " justAString " }) - void givenValidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegisterApplication_thenReturnValidationError(String reason) throws Exception { + void givenInvalidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegisterApplication_thenReturnValidationError(String reason) throws Exception { // Given String mockId = "4d04bd1e-6318-43ba-ab40-57efb8afc918"; From e471bf53c253b0495ae53b3997a46759b0c29e73 Mon Sep 17 00:00:00 2001 From: Egehan Asal Date: Sat, 7 Dec 2024 01:54:45 +0300 Subject: [PATCH 6/6] AYS-550 | Test Methods Have Been Refactored --- .../common/util/validation/NoSpacesAroundValidator.java | 1 - .../AdminRegistrationApplicationControllerTest.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java b/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java index beec8bf29..c135ab2b3 100644 --- a/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java +++ b/src/main/java/org/ays/common/util/validation/NoSpacesAroundValidator.java @@ -19,7 +19,6 @@ public boolean isValid(String text, ConstraintValidatorContext constraintValidat } return !(text.startsWith(" ") || text.endsWith(" ")); - } } diff --git a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java index deb0b5fd9..d6bc5f6fc 100644 --- a/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java +++ b/src/test/java/org/ays/auth/controller/AdminRegistrationApplicationControllerTest.java @@ -786,13 +786,13 @@ void givenValidAdminRegisterApplicationRejectRequest_whenUnauthorizedForRejectin " both ", " justAString " }) - void givenInvalidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegisterApplication_thenReturnValidationError(String reason) throws Exception { + void givenInvalidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegisterApplication_thenReturnValidationError(String rejectReason) throws Exception { // Given String mockId = "4d04bd1e-6318-43ba-ab40-57efb8afc918"; AdminRegistrationApplicationRejectRequest mockRequest = new AdminRegistrationApplicationRejectRequestBuilder() .withValidValues() - .withRejectReason(reason) + .withRejectReason(rejectReason) .build(); // Then @@ -810,7 +810,8 @@ void givenInvalidAdminRegisterApplicationRejectRequest_whenRejectingAdminRegiste // Verify Mockito.verify(adminRegistrationApplicationService, Mockito.never()) - .reject(Mockito.anyString(), Mockito.any()); + .reject(Mockito.anyString(), + Mockito.any(AdminRegistrationApplicationRejectRequest.class)); } }