|
|
@@ -16,7 +16,7 @@ import scot.carricksoftware.grants.constants.ApplicationConstants;
|
|
|
import static org.mockito.Mockito.verify;
|
|
|
import static org.mockito.Mockito.verifyNoInteractions;
|
|
|
import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
|
|
|
-import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
|
|
|
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
|
|
|
|
|
|
|
|
|
@ExtendWith(MockitoExtension.class)
|
|
|
@@ -41,40 +41,40 @@ class ValidateTypesPlaceAndUntrackedPlaceTest {
|
|
|
|
|
|
@Test
|
|
|
void bothNullTest() {
|
|
|
- validateTypes.validatePersonAndUntrackedPerson(null, null, placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
+ validateTypes.validatePlaceAndUntrackedPlace(null, null, placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
verify(bindingResultMock).rejectValue(placeField, ApplicationConstants.EMPTY_STRING, null, message);
|
|
|
verify(bindingResultMock).rejectValue(untrackedPlaceField, ApplicationConstants.EMPTY_STRING, null, message);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void nullAndEmptyTest() {
|
|
|
- validateTypes.validatePersonAndUntrackedPerson(null, " ", placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
+ validateTypes.validatePlaceAndUntrackedPlace(null, " ", placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
verify(bindingResultMock).rejectValue(placeField, ApplicationConstants.EMPTY_STRING, null, message);
|
|
|
verify(bindingResultMock).rejectValue(untrackedPlaceField, ApplicationConstants.EMPTY_STRING, null, message);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void bothFullTest() {
|
|
|
- validateTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), GetRandomString(), placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
+ validateTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), GetRandomString(), placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
verify(bindingResultMock).rejectValue(placeField, ApplicationConstants.EMPTY_STRING, null, message);
|
|
|
verify(bindingResultMock).rejectValue(untrackedPlaceField, ApplicationConstants.EMPTY_STRING, null, message);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void fullPersonAndNullUntrackedTest() {
|
|
|
- validateTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), null, placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
+ validateTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), null, placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
verifyNoInteractions(bindingResultMock);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void fullPersonAndEmptyUntrackedTest() {
|
|
|
- validateTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), " ", placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
+ validateTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), " ", placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
verifyNoInteractions(bindingResultMock);
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void nullPersonAndFullUntrackedTest() {
|
|
|
- validateTypes.validatePersonAndUntrackedPerson(null, GetRandomString(), placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
+ validateTypes.validatePlaceAndUntrackedPlace(null, GetRandomString(), placeField, untrackedPlaceField, message, bindingResultMock);
|
|
|
verifyNoInteractions(bindingResultMock);
|
|
|
}
|
|
|
|