ValidateTypes

src/main/java/scot/carricksoftware/grants/validators/images/AppendixImageCommandValidatorImpl.java

@@ -31,7 +31,7 @@ public class AppendixImageCommandValidatorImpl implements AppendixImageCommandVa
         logger.debug("AppendixCommandValidator::validate");
         validateImage(imageCommand, bindingResult);
         validateOrder(imageCommand, bindingResult);
-        validateLevel(imageCommand, bindingResult);
+        validateLevel(imageCommand.getLevel(), bindingResult);
         validateWidth(imageCommand, bindingResult);
         validateHeight(imageCommand, bindingResult);
     }
@@ -72,12 +72,14 @@ public class AppendixImageCommandValidatorImpl implements AppendixImageCommandVa
     }
 
 
-    private void validateLevel(AppendixImageCommand imageCommand, BindingResult bindingResult) {
+    private void validateLevel(String integerString, BindingResult bindingResult) {
         logger.debug("AppendixImageCommandValidator::validateLevel");
-        validateTypes.validateNonNegativeStaredInteger(imageCommand.getLevel(), "level",
+        validateTypes.validateIntegerStaredRange(integerString,
+                ApplicationConstants.LATEX_BOOK,
+                ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,
                 ValidationConstants.LEVEL_IS_INVALID,
-                ValidationConstants.LEVEL_IS_NEGATIVE,
+                ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS,
                 bindingResult);
     }
 

src/main/java/scot/carricksoftware/grants/validators/images/DocumentImageCommandValidatorImpl.java

@@ -31,7 +31,7 @@ public class DocumentImageCommandValidatorImpl implements DocumentImageCommandVa
         logger.debug("DocumentCommandValidator::validate");
         validateImage(imageCommand, bindingResult);
         validateOrder(imageCommand, bindingResult);
-        validateLevel(imageCommand, bindingResult);
+        validateLevel(imageCommand.getLevel(), bindingResult);
         validateWidth(imageCommand, bindingResult);
         validateHeight(imageCommand, bindingResult);
     }
@@ -72,12 +72,14 @@ public class DocumentImageCommandValidatorImpl implements DocumentImageCommandVa
     }
 
 
-    private void validateLevel(DocumentImageCommand imageCommand, BindingResult bindingResult) {
-        logger.debug("DocumentImageCommandValidator::validateLevel");
-        validateTypes.validateNonNegativeStaredInteger(imageCommand.getLevel(), "level",
+    private void validateLevel(String integerString, BindingResult bindingResult) {
+        logger.debug("AppendixImageCommandValidator::validateLevel");
+        validateTypes.validateIntegerStaredRange(integerString,
+                ApplicationConstants.LATEX_BOOK,
+                ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,
                 ValidationConstants.LEVEL_IS_INVALID,
-                ValidationConstants.LEVEL_IS_NEGATIVE,
+                ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS,
                 bindingResult);
     }
 

src/main/java/scot/carricksoftware/grants/validators/images/ImageCommandValidatorImpl.java

@@ -50,3 +50,5 @@ public class ImageCommandValidatorImpl implements ImageCommandValidator {
 
 }
 
+
+

src/main/java/scot/carricksoftware/grants/validators/images/PersonImageCommandValidatorImpl.java

@@ -32,7 +32,7 @@ public class PersonImageCommandValidatorImpl implements PersonImageCommandValida
         validatePerson(imageCommand, bindingResult);
         validateImage(imageCommand, bindingResult);
         validateOrder(imageCommand, bindingResult);
-        validateLevel(imageCommand, bindingResult);
+        validateLevel(imageCommand.getLevel(), bindingResult);
         validateWidth(imageCommand, bindingResult);
         validateHeight(imageCommand, bindingResult);
     }
@@ -73,12 +73,14 @@ public class PersonImageCommandValidatorImpl implements PersonImageCommandValida
     }
 
 
-    private void validateLevel(PersonImageCommand imageCommand, BindingResult bindingResult) {
-        logger.debug("ImageCommandValidator::validateLevel");
-        validateTypes.validateNonNegativeStaredInteger(imageCommand.getLevel(), "level",
+    private void validateLevel(String integerString, BindingResult bindingResult) {
+        logger.debug("AppendixImageCommandValidator::validateLevel");
+        validateTypes.validateIntegerStaredRange(integerString,
+                ApplicationConstants.LATEX_BOOK,
+                ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
                 ValidationConstants.LEVEL_IS_NULL,
                 ValidationConstants.LEVEL_IS_INVALID,
-                ValidationConstants.LEVEL_IS_NEGATIVE,
+                ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS,
                 bindingResult);
     }
 

src/main/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidatorImpl.java

@@ -28,17 +28,23 @@ public class AppendixTextCommandValidatorImpl implements AppendixTextCommandVali
 
     @Override
     public void validate(AppendixTextCommand appendixTextCommand, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validate");
+        logger.debug("AppendixTextCommandValidator::validate");
         validateOrder(appendixTextCommand.getOrder(), bindingResult);
         validateLevel(appendixTextCommand.getLevel(), bindingResult);
     }
 
-    private void validateLevel(String level, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateLevel");
-        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
-                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
+    private void validateLevel(String integerString, BindingResult bindingResult) {
+        logger.debug("AppendixImageCommandValidator::validateLevel");
+        validateTypes.validateIntegerStaredRange(integerString,
+                ApplicationConstants.LATEX_BOOK,
+                ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
+                ValidationConstants.LEVEL_IS_NULL,
+                ValidationConstants.LEVEL_IS_INVALID,
+                ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS,
+                bindingResult);
     }
 
+
     private void validateOrder(String order, BindingResult bindingResult) {
         logger.debug("PersonTextCommandValidator::validateOrder");
         validateTypes.validateNonNegativeInteger(order, "order",ValidationConstants.ORDER_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/text/DocumentTextCommandValidatorImpl.java

@@ -35,12 +35,18 @@ public class DocumentTextCommandValidatorImpl implements DocumentTextCommandVali
         validateLevel(documentTextCommand.getLevel(), bindingResult);
     }
 
-    private void validateLevel(String level, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateLevel");
-        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
-                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
+    private void validateLevel(String integerString, BindingResult bindingResult) {
+        logger.debug("DocumentImageCommandValidator::validateLevel");
+        validateTypes.validateIntegerStaredRange(integerString,
+                ApplicationConstants.LATEX_BOOK,
+                ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
+                ValidationConstants.LEVEL_IS_NULL,
+                ValidationConstants.LEVEL_IS_INVALID,
+                ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS,
+                bindingResult);
     }
 
+
     private void validateOrder(String order, BindingResult bindingResult) {
         logger.debug("PersonTextCommandValidator::validateOrder");
         validateTypes.validateNonNegativeInteger(order, "order",ValidationConstants.ORDER_IS_NULL,

src/main/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidatorImpl.java

@@ -35,12 +35,18 @@ public class PersonTextCommandValidatorImpl implements PersonTextCommandValidato
         validateLevel(personTextCommand.getLevel(), bindingResult);
     }
 
-    private void validateLevel(String level, BindingResult bindingResult) {
-        logger.debug("PersonTextCommandValidator::validateLevel");
-        validateTypes.validateIntegerRange(level, ApplicationConstants.LATEX_BOOK, ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
-                ValidationConstants.LEVEL_IS_NULL, ValidationConstants.LEVEL_IS_INVALID, ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS, bindingResult);
+    private void validateLevel(String integerString, BindingResult bindingResult) {
+        logger.debug("AppendixImageCommandValidator::validateLevel");
+        validateTypes.validateIntegerStaredRange(integerString,
+                ApplicationConstants.LATEX_BOOK,
+                ApplicationConstants.LATEX_SUB_PARAGRAPH, "level",
+                ValidationConstants.LEVEL_IS_NULL,
+                ValidationConstants.LEVEL_IS_INVALID,
+                ValidationConstants.LEVEL_IS_OUTSIDE_LIMITS,
+                bindingResult);
     }
 
+
     private void validatePerson(Person person, BindingResult bindingResult) {
         logger.debug("PersonTextCommandValidator::validatePerson");
         validateTypes.validatePerson(person, "person", ValidationConstants.PERSON_IS_NULL, bindingResult);

src/test/java/scot/carricksoftware/grants/validators/images/appendiximage/AppendixImageCommandValidatorTest.java

@@ -63,16 +63,23 @@ class AppendixImageCommandValidatorTest {
                 "The order must be non-negative.", bindingResultMock);
     }
 
+
+
+
     @Test
-    void validateLevelIsRunTest() {
+    void validateLevelIsCalledTest() {
         String level = GetRandomString();
         when(appendixImageCommandMock.getLevel()).thenReturn(level);
         validator.validate(appendixImageCommandMock, bindingResultMock);
-
-        verify(validateTypesMock).validateNonNegativeStaredInteger(level,
-                "level", "Level must exist.", "Level must be an integer.",
-                "The level must be non-negative.", bindingResultMock);
+        verify(validateTypesMock).validateIntegerStaredRange(level,
+                -2,
+                5,
+                "level",
+                "Level must exist.",
+                "Level must be an integer.",
+                "Level must be between -2 and 5.", bindingResultMock);
     }
 
 
+
 }

src/test/java/scot/carricksoftware/grants/validators/images/documentimage/DocumentImageCommandValidatorTest.java

@@ -63,16 +63,7 @@ class DocumentImageCommandValidatorTest {
                 "The order must be non-negative.", bindingResultMock);
     }
 
-    @Test
-    void validateLevelIsRunTest() {
-        String level = GetRandomString();
-        when(documentImageCommandMock.getLevel()).thenReturn(level);
-        validator.validate(documentImageCommandMock, bindingResultMock);
 
-        verify(validateTypesMock).validateNonNegativeStaredInteger(level,
-                "level", "Level must exist.", "Level must be an integer.",
-                "The level must be non-negative.", bindingResultMock);
-    }
 
 
 }

src/test/java/scot/carricksoftware/grants/validators/images/personimage/PersonImageCommandValidatorTest.java

@@ -76,14 +76,17 @@ class PersonImageCommandValidatorTest {
     }
 
     @Test
-    void validateLevelIsRunTest() {
+    void validateLevelIsCalledTest() {
         String level = GetRandomString();
         when(personImageCommandMock.getLevel()).thenReturn(level);
         validator.validate(personImageCommandMock, bindingResultMock);
-
-        verify(validateTypesMock).validateNonNegativeStaredInteger(level,
-                "level", "Level must exist.", "Level must be an integer.",
-                "The level must be non-negative.", bindingResultMock);
+        verify(validateTypesMock).validateIntegerStaredRange(level,
+                -2,
+                5,
+                "level",
+                "Level must exist.",
+                "Level must be an integer.",
+                "Level must be between -2 and 5.", bindingResultMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/validators/text/AppendixTextCommandValidatorImplTest.java

@@ -54,7 +54,7 @@ class AppendixTextCommandValidatorImplTest {
         String level = GetRandomString();
         appendixTextCommand.setLevel(level);
         validator.validate(appendixTextCommand, bindingResultMock);
-        verify(validateTypesMock).validateIntegerRange(level,
+        verify(validateTypesMock).validateIntegerStaredRange(level,
                 -2,
                 5,
                 "level",

src/test/java/scot/carricksoftware/grants/validators/text/PersonTextCommandValidatorImplTest.java

@@ -13,12 +13,10 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.text.PersonTextCommand;
 import scot.carricksoftware.grants.commands.text.PersonTextCommandImpl;
-import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
 
 import static org.mockito.Mockito.verify;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 
 @ExtendWith(MockitoExtension.class)
 class PersonTextCommandValidatorImplTest {
@@ -51,12 +49,14 @@ class PersonTextCommandValidatorImplTest {
                 "The order must be non-negative.", bindingResultMock);
     }
 
+
+
     @Test
     void validateLevelIsCalledTest() {
         String level = GetRandomString();
         personTextCommand.setLevel(level);
         validator.validate(personTextCommand, bindingResultMock);
-        verify(validateTypesMock).validateIntegerRange(level,
+        verify(validateTypesMock).validateIntegerStaredRange(level,
                 -2,
                 5,
                 "level",
@@ -65,15 +65,4 @@ class PersonTextCommandValidatorImplTest {
                 "Level must be between -2 and 5.", bindingResultMock);
     }
 
-    @Test
-    void validatePersonIsCalledTest() {
-        Person person = GetRandomPerson();
-        personTextCommand.setPerson(person);
-        validator.validate(personTextCommand, bindingResultMock);
-        verify(validateTypesMock).validatePerson(person,
-                "person",
-                "The person cannot be null.",
-                bindingResultMock);
-    }
-
 }