Browse Source

ValidationnnTypes Test (2)

Andrew Grant 5 months ago
parent
commit
cca711cfe7

+ 7 - 7
src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateTypesPlaceAndUntrackedPlaceTest.java

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