ValidateIntegerRangeTest

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateIntegerRangeTest.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.validators.helpers;
+
+
+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 static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+
+@ExtendWith(MockitoExtension.class)
+class ValidateIntegerRangeTest {
+
+    private ValidateTypes validateTypes;
+
+    @Mock
+    private BindingResult bindingResultMock;
+
+    String fieldName;
+
+    @BeforeEach
+    public void setUp() {
+        validateTypes = new ValidateTypesImpl();
+        fieldName = GetRandomString();
+    }
+
+    @Test
+    public void constructorTest() {
+        assertNotNull(validateTypes);
+    }
+
+    @Test
+    public void validateNullInteger() {
+        String nullMessage = GetRandomString();
+
+        validateTypes.validateIntegerRange(null, null, null,fieldName, nullMessage, "", "", bindingResultMock);
+        verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
+    }
+
+    @Test
+    public void validateEmptyInteger() {
+        String nullMessage = GetRandomString();
+
+        validateTypes.validateIntegerRange("", null, null, fieldName, nullMessage, "", "", bindingResultMock);
+        verify(bindingResultMock).rejectValue(fieldName, "", null, nullMessage);
+    }
+
+    @Test
+    public void validateBadFormatInteger() {
+        String formatMessage = GetRandomString();
+
+        validateTypes.validateIntegerRange("zz", null, null, fieldName, "", formatMessage, "", bindingResultMock);
+        verify(bindingResultMock).rejectValue(fieldName, "", null, formatMessage);
+    }
+
+    @Test
+    public void validateTooLowInteger() {
+        String rangeMessage = GetRandomString();
+
+        validateTypes.validateIntegerRange("-6", -5, 99, fieldName, "", "", rangeMessage, bindingResultMock);
+        verify(bindingResultMock).rejectValue(fieldName, "", null, rangeMessage);
+    }
+
+    @Test
+    public void validateLowLimitInteger() {
+        validateTypes.validateIntegerRange("-6", -6, 99, fieldName, "", "", "", bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+    @Test
+    public void validateHighLimitInteger() {
+        validateTypes.validateIntegerRange("10", -6, 10, fieldName, "", "", "", bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+    @Test
+    public void validateTooHighInteger() {
+        String rangeMessage = GetRandomString();
+
+        validateTypes.validateIntegerRange("11", -5, 10, fieldName, "", "", rangeMessage, bindingResultMock);
+        verify(bindingResultMock).rejectValue(fieldName, "", null, rangeMessage);
+    }
+
+
+}

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateNonNegativeIntegerTest.java

@@ -26,9 +26,12 @@ class ValidateNonNegativeIntegerTest {
     @Mock
     private BindingResult bindingResultMock;
 
+    private String fieldName;
+
     @BeforeEach
     public void setUp() {
         validateTypes = new ValidateTypesImpl();
+        fieldName = GetRandomString();
     }
 
     @Test
@@ -38,7 +41,6 @@ class ValidateNonNegativeIntegerTest {
 
     @Test
     public void validateNullInteger() {
-        String fieldName = GetRandomString();
         String nullMessage = GetRandomString();
 
         validateTypes.validateNonNegativeInteger(null, fieldName, nullMessage, "", "", bindingResultMock);
@@ -47,7 +49,6 @@ class ValidateNonNegativeIntegerTest {
 
     @Test
     public void validateEmptyInteger() {
-        String fieldName = GetRandomString();
         String nullMessage = GetRandomString();
 
         validateTypes.validateNonNegativeInteger("", fieldName, nullMessage, "", "", bindingResultMock);
@@ -56,7 +57,6 @@ class ValidateNonNegativeIntegerTest {
 
     @Test
     public void validateNegativeInteger() {
-        String fieldName = GetRandomString();
         String negativeMessage = GetRandomString();
 
         validateTypes.validateNonNegativeInteger("-5", fieldName, "", "", negativeMessage, bindingResultMock);
@@ -65,16 +65,12 @@ class ValidateNonNegativeIntegerTest {
 
     @Test
     public void validateZeroInteger() {
-        String fieldName = GetRandomString();
-
         validateTypes.validateNonNegativeInteger("0", fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
     @Test
     public void validatePositiveInteger() {
-        String fieldName = GetRandomString();
-
         validateTypes.validateNonNegativeInteger("1", fieldName, "", "", "", bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
@@ -82,7 +78,6 @@ class ValidateNonNegativeIntegerTest {
 
     @Test
     public void validateBadFormatInteger() {
-        String fieldName = GetRandomString();
         String formatMessage = GetRandomString();
 
         validateTypes.validateNonNegativeInteger("zz", fieldName, "", formatMessage, "", bindingResultMock);