DeathCertificateNullFieldsValidatorTest

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateNullFieldsValidatorImpl.java

@@ -88,7 +88,7 @@ public class DeathCertificateNullFieldsValidatorImpl implements DeathCertificate
     }
 
     private void validateCertificateType(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
-        logger.debug("DeathCertificateNullFieldsValidator::validateRegistrationAuthority");
+        logger.debug("DeathCertificateNullFieldsValidator::validateCertificateType");
         validateTypes.validateCertificateType(deathCertificateCommand.getCertificateType(), "certificateType",ValidationConstants.CERTIFICATE_TYPE_IS_NULL, bindingResult);
     }
 

src/test/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateNullFieldsValidatorImplTest.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.validators.certificates.deathcertificate;
+
+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 scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
+import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
+import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.validators.helpers.ValidateDateTypes;
+import scot.carricksoftware.grants.validators.helpers.ValidateTypesImpl;
+
+import static org.mockito.Mockito.verify;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
+
+@ExtendWith(MockitoExtension.class)
+class DeathCertificateNullFieldsValidatorImplTest {
+
+    DeathCertificateNullFieldsValidator deathCertificateNullFieldsValidator;
+
+    @Mock
+    private ValidateTypesImpl validateTypesMock;
+
+    @Mock
+    private ValidateDateTypes validateDateTypesMock;
+
+    @Mock
+    private BindingResult bindingResultMock;
+
+    DeathCertificateCommand deathCertificateCommand;
+Person deceased;
+String certificateNumber;
+String volume;
+
+    @BeforeEach
+    void setUp() {
+        deathCertificateNullFieldsValidator = new DeathCertificateNullFieldsValidatorImpl(validateTypesMock, validateDateTypesMock);
+        deathCertificateCommand = new DeathCertificateCommandImpl();
+        deceased = GetRandomPerson();
+        certificateNumber = GetRandomString();
+        volume = GetRandomString();
+        deathCertificateCommand.setDeceased(deceased);
+        deathCertificateCommand.setCertificateNumber(certificateNumber);
+        deathCertificateCommand.setVolume(volume);
+    }
+
+    @Test
+    void validateTypesIsCalledTest() {
+        deathCertificateNullFieldsValidator.validate(deathCertificateCommand, bindingResultMock);
+
+        verify(validateTypesMock).validatePerson(deceased, "deceased", "The deceased cannot be null.", bindingResultMock);
+        verify(validateTypesMock).validateNullOrEmptyString(certificateNumber, "certificateNumber", "The certificate number cannot be null.", bindingResultMock);
+        verify(validateTypesMock).validateNullOrEmptyString(volume, "volume", "The volume cannot be null.", bindingResultMock);
+    }
+
+
+}