Birth Certificate Validation (3))

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidatorImpl.java

@@ -43,7 +43,12 @@ public class BirthCertificateCommandPartThreeValidatorImpl implements BirthCerti
 
     private void validateWhenBorn(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating when born");
-        validateTypes.validatePastDateAndTime(birthCertificateCommand.getWhenBorn(), "whenBorn", ValidationConstants.WHEN_BORN_IS_NULL, ValidationConstants.WHEN_BORN_INCORRECT_FORMAT, ValidationConstants.DATE_IN_FUTURE,bindingResult);
+        validateTypes.validatePastDateAndTime(birthCertificateCommand.getWhenBorn(),
+                "whenBorn",
+                ValidationConstants.WHEN_BORN_IS_NULL,
+                ValidationConstants.WHEN_BORN_INCORRECT_FORMAT,
+                ValidationConstants.DATE_IN_FUTURE,
+                bindingResult);
     }
 
     private void validateFatherAndUntrackedFather(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {

src/test/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidatorTest.java

@@ -66,21 +66,32 @@ class BirthCertificateCommandPartThreeValidatorTest {
                 bindingResultMock);
     }
 
-        @Test
-        void validateWhereBornAndUntrackedWhereBornTest() {
-            String untrackedWhereBorn = GetRandomString();
-            Place whereBorn = GetRandomPlace();
-            when(birthCertificateCommandMock.getUntrackedWhereBorn()).thenReturn(untrackedWhereBorn);
-            when(birthCertificateCommandMock.getWhereBorn()).thenReturn(whereBorn);
-            validator.validate(birthCertificateCommandMock, bindingResultMock);
-            verify(validateTypesMock).validatePlaceAndUntrackedPlace(
-                    whereBorn,
-                    untrackedWhereBorn,
-                    "whereBorn",
-                    "untrackedWhereBorn",
-                    "One and only one where born and untracked where born must be specified.",
-                    bindingResultMock);
-        }
+    @Test
+    void validateWhereBornAndUntrackedWhereBornTest() {
+        String untrackedWhereBorn = GetRandomString();
+        Place whereBorn = GetRandomPlace();
+        when(birthCertificateCommandMock.getUntrackedWhereBorn()).thenReturn(untrackedWhereBorn);
+        when(birthCertificateCommandMock.getWhereBorn()).thenReturn(whereBorn);
+        validator.validate(birthCertificateCommandMock, bindingResultMock);
+        verify(validateTypesMock).validatePlaceAndUntrackedPlace(
+                whereBorn,
+                untrackedWhereBorn,
+                "whereBorn",
+                "untrackedWhereBorn",
+                "One and only one where born and untracked where born must be specified.",
+                bindingResultMock);
+    }
 
+    @Test
+    void validateWhenBornTestTest() {
+        validator.validate(birthCertificateCommandMock, bindingResultMock);
+        verify(validateTypesMock).validatePastDateAndTime(
+                birthCertificateCommandMock.getWhenBorn(),
+                "whenBorn",
+                "When born cannot be null.",
+                "The format should be dd/MM/yyyy hh:mm.",
+                "Date should not be in the future.",
+                bindingResultMock);
+    }
 
 }