Browse Source

Zero allowed in non negative integer

Andrew Grant 6 months ago
parent
commit
5cecd5a787

+ 1 - 1
src/main/java/scot/carricksoftware/grants/validators/census/censusentry/CensusEntryCommandValidatorImpl.java

@@ -116,7 +116,7 @@ public class CensusEntryCommandValidatorImpl implements CensusEntryCommandValida
         boolean invalid = false;
         try {
             int value = Integer.parseInt(part);
-            if (value <= 0) {
+            if (value < 0) {
                 invalid = true;
             }
         } catch (RuntimeException e) {

+ 1 - 1
src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=grants
 server.port=8086
 server.servlet.context-path=/grants
 spring.mvc.format.date=dd-MM-yyyy
-spring.profiles.active=dev
+spring.profiles.active=uat
 logging.level.scot.carricksoftware=trace
 
 

+ 3 - 2
src/test/java/scot/carricksoftware/grants/validators/census/censusentry/CensusEntryCommandValidatorChildrenBornAliveTest.java

@@ -18,6 +18,7 @@ import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.constants.ValidationConstants;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
@@ -52,8 +53,8 @@ class CensusEntryCommandValidatorChildrenBornAliveTest {
         censusEntryCommand.setChildrenBornAlive("0");
         censusEntryCommand.setPerson(GetRandomPerson());
         validator.validate(censusEntryCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue("childrenBornAlive", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
-    }
+        verifyNoInteractions(bindingResultMock);
+       }
 
     @Test
     public void NotIntegerTest() {

+ 2 - 1
src/test/java/scot/carricksoftware/grants/validators/census/censusentry/CensusEntryCommandValidatorChildrenStillAliveTest.java

@@ -18,6 +18,7 @@ import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.constants.ValidationConstants;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
@@ -52,7 +53,7 @@ class CensusEntryCommandValidatorChildrenStillAliveTest {
         censusEntryCommand.setChildrenStillAlive("0");
         censusEntryCommand.setPerson(GetRandomPerson());
         validator.validate(censusEntryCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue("childrenStillAlive", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        verifyNoInteractions(bindingResultMock);
     }
 
     @Test

+ 2 - 1
src/test/java/scot/carricksoftware/grants/validators/census/censusentry/CensusEntryCommandValidatorChildrenStillWhoHaveDiedTest.java

@@ -18,6 +18,7 @@ import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.constants.ValidationConstants;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
@@ -52,7 +53,7 @@ class CensusEntryCommandValidatorChildrenStillWhoHaveDiedTest {
         censusEntryCommand.setChildrenWhoHaveDied("0");
         censusEntryCommand.setPerson(GetRandomPerson());
         validator.validate(censusEntryCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue("childrenWhoHaveDied", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        verifyNoInteractions(bindingResultMock);
     }
 
     @Test

+ 2 - 1
src/test/java/scot/carricksoftware/grants/validators/census/censusentry/CensusEntryCommandValidatorYearsCompletedMarriageTest.java

@@ -18,6 +18,7 @@ import scot.carricksoftware.grants.constants.ApplicationConstants;
 import scot.carricksoftware.grants.constants.ValidationConstants;
 
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
@@ -52,7 +53,7 @@ class CensusEntryCommandValidatorYearsCompletedMarriageTest {
         censusEntryCommand.setYearsCompletedMarriage("0");
         censusEntryCommand.setPerson(GetRandomPerson());
         validator.validate(censusEntryCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue("yearsCompletedMarriage", ApplicationConstants.EMPTY_STRING, null, ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        verifyNoInteractions(bindingResultMock);
     }
 
     @Test