ValidatePlaceAndUntrackedPerson

src/main/java/scot/carricksoftware/grants/validators/helpers/ValidateTwoFieldTypesImpl.java

@@ -16,8 +16,7 @@ public class ValidateTwoFieldTypesImpl implements ValidateTwoFieldTypes {
 
     @Override
     public void validatePersonAndUntrackedPerson(Person person, String untrackedPerson, String personFieldName, String untrackedFieldName, String message, BindingResult bindingResult) {
-
-        boolean untrackedFound = (untrackedPerson != null && !untrackedPerson.isEmpty());
+        @SuppressWarnings("DuplicatedCode") boolean untrackedFound = (untrackedPerson != null && !untrackedPerson.isEmpty());
         if ((person == null && !untrackedFound) || person != null && untrackedFound) {
             bindingResult.rejectValue(personFieldName, ApplicationConstants.EMPTY_STRING, null, message);
             bindingResult.rejectValue(untrackedFieldName, ApplicationConstants.EMPTY_STRING, null, message);
@@ -26,14 +25,11 @@ public class ValidateTwoFieldTypesImpl implements ValidateTwoFieldTypes {
 
     @Override
     public void validatePlaceAndUntrackedPlace(Place place, String untrackedPlace, String placeFieldName, String untrackedFieldName, String message, BindingResult bindingResult) {
-        boolean error = place == null && (untrackedPlace == null || untrackedPlace.trim().isEmpty());
-        if (!(place == null) && untrackedPlace != null &&  !(untrackedPlace.trim().isEmpty())) {
-            error = true;
-        }
-        if (error) {
+        @SuppressWarnings("DuplicatedCode") boolean untrackedFound = (untrackedPlace != null && !untrackedPlace.isEmpty());
+        if ((place == null && !untrackedFound) || place != null && untrackedFound) {
             bindingResult.rejectValue(placeFieldName, ApplicationConstants.EMPTY_STRING, null, message);
             bindingResult.rejectValue(untrackedFieldName, ApplicationConstants.EMPTY_STRING, null, message);
-        }
+        } 
     }
 
     @Override

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

@@ -0,0 +1,74 @@
+/*
+ * 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.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
+
+@ExtendWith(MockitoExtension.class)
+class ValidateValidatePlaceAndUntrackedPersonTest {
+
+    private ValidateTwoFieldTypes validateTwoFieldTypes;
+
+    private String placeField;
+    private String untrackedField;
+    private String message;
+
+    @Mock
+    private BindingResult bindingResultMock;
+
+    @BeforeEach
+    void setUp() {
+        validateTwoFieldTypes = new ValidateTwoFieldTypesImpl();
+        placeField = "personField";
+        untrackedField = "untrackedField";
+        message = "message";
+    }
+
+    @Test
+    void bothNullTest() {
+        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(null, null, placeField, untrackedField, message, bindingResultMock);
+        verify(bindingResultMock).rejectValue(placeField, "", null, message);
+        verify(bindingResultMock).rejectValue(untrackedField, "", null, message);
+    }
+
+    @Test
+    void nullPlaceAndEmptyUntrackedFieldTest() {
+        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(null, "", placeField, untrackedField, message, bindingResultMock);
+        verify(bindingResultMock).rejectValue(placeField, "", null, message);
+        verify(bindingResultMock).rejectValue(untrackedField, "", null, message);
+    }
+
+    @Test
+    void bothGivenFieldTest() {
+        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), GetRandomString(), placeField, untrackedField, message, bindingResultMock);
+        verify(bindingResultMock).rejectValue(placeField, "", null, message);
+        verify(bindingResultMock).rejectValue(untrackedField, "", null, message);
+    }
+
+    @Test
+    void placeOnlyGivenTest() {
+        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(GetRandomPlace(), null, placeField, untrackedField, message, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+    @Test
+    void unTrackedPlaceOnlyGivenTest() {
+        validateTwoFieldTypes.validatePlaceAndUntrackedPlace(null, GetRandomString(), placeField, untrackedField, message, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+
+}