BirthCertificateCommandPartOneValidatorTest::getNumber and ::getVolume and ::GetRegistrationAuthority

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartTwoValidatorImpl.java

@@ -33,10 +33,9 @@ public class BirthCertificateCommandPartTwoValidatorImpl implements BirthCertifi
         validateRegistrationAuthority(birthCertificateCommand, bindingResult);
     }
 
-
     private void validateNumber(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating registration number");
-        validateTypes.validateNonNegativeInteger(birthCertificateCommand.getNumber(), "volume", ValidationConstants.NUMBER_IS_NULL, ValidationConstants.NUMBER_IS_INVALID,bindingResult);
+        validateTypes.validateNonNegativeInteger(birthCertificateCommand.getNumber(), "number", ValidationConstants.NUMBER_IS_NULL, ValidationConstants.NUMBER_IS_INVALID,bindingResult);
     }
 
     private void validateVolume(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {

src/test/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartTwoValidatorTest.java

@@ -10,9 +10,15 @@ 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.birthcertificates.BirthCertificateCommand;
+import scot.carricksoftware.grants.domains.places.Organisation;
 import scot.carricksoftware.grants.validators.helpers.ValidateTypes;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomOrganisation;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -23,14 +29,39 @@ class BirthCertificateCommandPartTwoValidatorTest {
     @Mock
     private ValidateTypes validateTypesMock;
 
+    @Mock()
+    BirthCertificateCommand birthCertificateCommandMock;
+
+    @Mock
+    private BindingResult bindingResultMock;
+
     @BeforeEach
     void setUp() {
         validator = new BirthCertificateCommandPartTwoValidatorImpl(validateTypesMock);
     }
 
     @Test
-    void constructorTest() {
-        assertNotNull(validator);
+    void validateRegistrationNumberTest() {
+        String number = GetRandomString();
+        when(birthCertificateCommandMock.getNumber()).thenReturn(number);
+        validator.validate(birthCertificateCommandMock, bindingResultMock);
+        verify(validateTypesMock).validateNonNegativeInteger(number, "number", "The number cannot be null.", "The number must be a non negative integer.", bindingResultMock);
+    }
+
+    @Test
+    void validateVolumeTest() {
+        String number = GetRandomString();
+        when(birthCertificateCommandMock.getVolume()).thenReturn(number);
+        validator.validate(birthCertificateCommandMock, bindingResultMock);
+        verify(validateTypesMock).validateNullOrEmptyString(number, "volume", "The volume cannot be null.", bindingResultMock);
+    }
+
+    @Test
+    void validateRegistrationAuthorityTest() {
+        Organisation organisation = GetRandomOrganisation();
+        when(birthCertificateCommandMock.getRegistrationAuthority()).thenReturn(organisation);
+        validator.validate(birthCertificateCommandMock, bindingResultMock);
+        verify(validateTypesMock).validateOrganisation(organisation, "certificateSource", "The registration authority cannot be null.", bindingResultMock);
     }
 
 }

src/test/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandValidatorTest.java

@@ -63,5 +63,4 @@ class BirthCertificateCommandValidatorTest {
     }
 
 
-
 }