ValidateTwoFieldTypesPersonAndUntrackedPersonTest

src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateTypesPersonAndUntrackedPersonTest.java → src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateTwoFieldTypesPersonAndUntrackedPersonTest.java

@@ -20,9 +20,9 @@ import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPe
 
 
 @ExtendWith(MockitoExtension.class)
-class ValidateTypesPersonAndUntrackedPersonTest {
+class ValidateTwoFieldTypesPersonAndUntrackedPersonTest {
 
-    private ValidateTypes validateTypes;
+    private ValidateTypes validateTwoTypes;
 
     private String untrackedPersonField;
     private String personField;
@@ -33,7 +33,7 @@ class ValidateTypesPersonAndUntrackedPersonTest {
 
     @BeforeEach
     void setUp() {
-        validateTypes = new ValidateTypesImpl();
+        validateTwoTypes = new ValidateTypesImpl();
         untrackedPersonField = "untrackedPerson";
         personField = "person";
         message = GetRandomString();
@@ -41,40 +41,40 @@ class ValidateTypesPersonAndUntrackedPersonTest {
 
     @Test
     void bothNullTest() {
-        validateTypes.validatePersonAndUntrackedPerson(null, null, personField, untrackedPersonField, message, bindingResultMock);
+        validateTwoTypes.validatePersonAndUntrackedPerson(null, null, personField, untrackedPersonField, message, bindingResultMock);
         verify(bindingResultMock).rejectValue(personField, ApplicationConstants.EMPTY_STRING, null, message);
         verify(bindingResultMock).rejectValue(untrackedPersonField, ApplicationConstants.EMPTY_STRING, null, message);
     }
 
     @Test
     void nullAndEmptyTest() {
-        validateTypes.validatePersonAndUntrackedPerson(null, "  ", personField, untrackedPersonField, message, bindingResultMock);
+        validateTwoTypes.validatePersonAndUntrackedPerson(null, "  ", personField, untrackedPersonField, message, bindingResultMock);
         verify(bindingResultMock).rejectValue(personField, ApplicationConstants.EMPTY_STRING, null, message);
         verify(bindingResultMock).rejectValue(untrackedPersonField, ApplicationConstants.EMPTY_STRING, null, message);
     }
 
     @Test
     void bothFullTest() {
-        validateTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), GetRandomString(), personField, untrackedPersonField, message, bindingResultMock);
+        validateTwoTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), GetRandomString(), personField, untrackedPersonField, message, bindingResultMock);
         verify(bindingResultMock).rejectValue(personField, ApplicationConstants.EMPTY_STRING, null, message);
         verify(bindingResultMock).rejectValue(untrackedPersonField, ApplicationConstants.EMPTY_STRING, null, message);
     }
 
     @Test
     void fullPersonAndNullUntrackedTest() {
-        validateTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), null, personField, untrackedPersonField, message, bindingResultMock);
+        validateTwoTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), null, personField, untrackedPersonField, message, bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
     @Test
     void fullPersonAndEmptyUntrackedTest() {
-        validateTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), "  ", personField, untrackedPersonField, message, bindingResultMock);
+        validateTwoTypes.validatePersonAndUntrackedPerson(GetRandomPerson(), "  ", personField, untrackedPersonField, message, bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 
     @Test
     void nullPersonAndFullUntrackedTest() {
-        validateTypes.validatePersonAndUntrackedPerson(null, GetRandomString(), personField, untrackedPersonField, message, bindingResultMock);
+        validateTwoTypes.validatePersonAndUntrackedPerson(null, GetRandomString(), personField, untrackedPersonField, message, bindingResultMock);
         verifyNoInteractions(bindingResultMock);
     }
 

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

@@ -1,57 +0,0 @@
-/*
- * 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.mockito.Mockito.verifyNoInteractions;
-import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
-
-@ExtendWith(MockitoExtension.class)
-class ValidateTwoFieldTypesTest {
-
-    ValidateTwoFieldTypes validateTwoFieldTypes;
-
-    @Mock
-    private BindingResult bindingResultMock;
-
-    private String untrackedPlaceField;
-    private String placeField;
-    private String message;
-
-    @BeforeEach
-    void setUp() {
-        validateTwoFieldTypes = new ValidateTwoFieldTypesImpl();
-        untrackedPlaceField = "untrackedWhereBorn";
-        placeField = "whereBorn";
-        message = GetRandomString();
-    }
-
-    @Test
-    void fullPersonAndNullUntrackedTest() {
-        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), null, placeField, untrackedPlaceField, message, bindingResultMock);
-        verifyNoInteractions(bindingResultMock);
-    }
-
-    @Test
-    void fullPersonAndEmptyUntrackedTest() {
-        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), "  ", placeField, untrackedPlaceField, message, bindingResultMock);
-        verifyNoInteractions(bindingResultMock);
-    }
-
-    @Test
-    void nullPersonAndFullUntrackedTest() {
-        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(null, GetRandomString(), placeField, untrackedPlaceField, message, bindingResultMock);
-        verifyNoInteractions(bindingResultMock);
-    }
-
-}