Five attributes added to CensusEntry validator (4)

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandTest.java

@@ -102,5 +102,4 @@ class CensusCommandTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandPartOneTest.java

@@ -79,7 +79,4 @@ class CensusEntryCommandPartOneTest {
     }
 
 
-
-
-
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandPartThreeTest.java

@@ -71,5 +71,4 @@ class CensusEntryCommandPartThreeTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandPartTwoTest.java

@@ -96,6 +96,4 @@ class CensusEntryCommandPartTwoTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerAttributeTest.java

@@ -64,5 +64,4 @@ public class SelectedCensusListControllerAttributeTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerPageNumberTest.java

@@ -55,7 +55,7 @@ public class SelectedCensusListControllerPageNumberTest {
         controller.getListPage(modelMock);
         int page = controller.getPageNumber();
         controller.getNextPage(modelMock);
-        assertEquals(page+1, controller.getPageNumber());
+        assertEquals(page + 1, controller.getPageNumber());
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/census/selectedcensus/SelectedCensusListControllerReturnValueTest.java

@@ -70,7 +70,7 @@ public class SelectedCensusListControllerReturnValueTest {
 
     @Test
     public void getCensusEntryListTest() {
-        assertEquals("selectedCensus/list", controller.censusEntryList(GetRandomLong().toString(),modelMock));
+        assertEquals("selectedCensus/list", controller.censusEntryList(GetRandomLong().toString(), modelMock));
     }
 
 

src/test/java/scot/carricksoftware/grants/validators/census/CensusCommandValidatorTotalRoomsTest.java

@@ -107,5 +107,4 @@ class CensusCommandValidatorTotalRoomsTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/validators/census/CensusEntryCommandValidatorBirthYearAndAgeTest.java

@@ -60,13 +60,4 @@ class CensusEntryCommandValidatorBirthYearAndAgeTest {
     }
 
 
-
-
-
-
-
-
-
-
-
 }

src/test/java/scot/carricksoftware/grants/validators/census/CensusEntryCommandValidatorBirthYearTest.java

@@ -67,5 +67,4 @@ class CensusEntryCommandValidatorBirthYearTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/validators/census/CensusEntryCommandValidatorChildrenBornAliveTest.java

@@ -72,5 +72,4 @@ class CensusEntryCommandValidatorChildrenBornAliveTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/validators/census/CensusEntryCommandValidatorChildrenStillAliveTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 24/03/2025, 09:07. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.validators.census;
+
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
+import scot.carricksoftware.grants.commands.census.CensusEntryCommandImpl;
+import scot.carricksoftware.grants.constants.ApplicationConstants;
+import scot.carricksoftware.grants.constants.ValidationConstants;
+
+import static org.mockito.Mockito.verify;
+import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
+import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
+
+@ExtendWith(MockitoExtension.class)
+class CensusEntryCommandValidatorChildrenStillAliveTest {
+
+    private CensusEntryCommandValidatorImpl validator;
+
+    private CensusEntryCommand censusEntryCommand;
+
+
+    @Mock
+    BindingResult bindingResultMock;
+
+    @BeforeEach
+    void setUp() {
+        validator = new CensusEntryCommandValidatorImpl();
+        censusEntryCommand = new CensusEntryCommandImpl();
+        censusEntryCommand.setCensus(GetRandomCensus());
+    }
+
+    @Test
+    public void NegativeTest() {
+        censusEntryCommand.setChildrenStillAlive("-5");
+        censusEntryCommand.setPerson(GetRandomPerson());
+        validator.validate(censusEntryCommand, bindingResultMock);
+        verify(bindingResultMock).rejectValue("childrenStillAlive", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+    }
+
+    @Test
+    public void ZeroTest() {
+        censusEntryCommand.setChildrenStillAlive("0");
+        censusEntryCommand.setPerson(GetRandomPerson());
+        validator.validate(censusEntryCommand, bindingResultMock);
+        verify(bindingResultMock).rejectValue("childrenStillAlive", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+    }
+
+    @Test
+    public void NotIntegerTest() {
+        censusEntryCommand.setChildrenStillAlive("3.14");
+        censusEntryCommand.setPerson(GetRandomPerson());
+        validator.validate(censusEntryCommand, bindingResultMock);
+        verify(bindingResultMock).rejectValue("childrenStillAlive", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+    }
+
+    @Test
+    public void NotANumberTest() {
+        censusEntryCommand.setChildrenStillAlive("zzz");
+        censusEntryCommand.setPerson(GetRandomPerson());
+        validator.validate(censusEntryCommand, bindingResultMock);
+        verify(bindingResultMock).rejectValue("childrenStillAlive", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+    }
+
+
+}