Domain MarriageCertificate Untracked Tests

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadCertificatesDeathCertificatesTest.java

@@ -47,12 +47,11 @@ public class DataLoadCertificatesDeathCertificatesTest {
     @SuppressWarnings("unused")
     private final Person deceased = GetRandomPerson();
     @SuppressWarnings("unused")
-    private final Person spouse= GetRandomPerson();
+    private final Person spouse = GetRandomPerson();
     @SuppressWarnings("unused")
     private final Person informant = GetRandomPerson();
 
 
-
     @BeforeEach
     public void setup() {
         dataLoadCertificates = new DataLoadCertificates(

src/test/java/scot/carricksoftware/grants/capitalisation/CapitaliseRegressionTest.java

@@ -22,6 +22,6 @@ class CapitaliseRegressionTest {
     @Test
     void certificateNumberTest() {
         String certificateNumber = "12345CE";
-        assertEquals(certificateNumber,capitaliseString.capitalise(certificateNumber));
+        assertEquals(certificateNumber, capitaliseString.capitalise(certificateNumber));
     }
 }

src/test/java/scot/carricksoftware/grants/commands/certificates/death/DeathCertificateCommandLongTest.java

@@ -36,5 +36,4 @@ class DeathCertificateCommandLongTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/commands/certificates/death/DeathCertificateCommandSexTest.java

@@ -84,6 +84,4 @@ class DeathCertificateCommandSexTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/commands/certificates/death/DeathCertificateCommandStringTest.java

@@ -96,6 +96,4 @@ class DeathCertificateCommandStringTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/commands/certificates/death/DeathCertificateCommandStringTwoTest.java

@@ -23,7 +23,7 @@ class DeathCertificateCommandStringTwoTest {
     void setUp() {
         deathCertificateCommand = new DeathCertificateCommandImpl();
     }
-    
+
     @Test
     void getCauseOfDeathTest() {
         assertNull(deathCertificateCommand.getCauseOfDeath());

src/test/java/scot/carricksoftware/grants/converters/certificates/deathcertificates/DeathCertificateCommandCallsMilitaryConverterTest.java

@@ -33,7 +33,7 @@ class DeathCertificateCommandCallsMilitaryConverterTest {
 
     @Test
     void converterTest() {
-        DeathCertificate deathCertificate  = converter.convert(deathCertificateCommand);
+        DeathCertificate deathCertificate = converter.convert(deathCertificateCommand);
         verify(deathCertificateCommandMilitaryConverterMock).convert(deathCertificateCommand, deathCertificate);
     }
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/deathcertificates/DeathCertificateCommandConverterTest.java

@@ -114,45 +114,45 @@ class DeathCertificateCommandConverterTest {
         deathCertificateCommand.setWhenRegistered(whenRegistered);
         deathCertificateCommand.setWhereDied(whereDied);
         deathCertificateCommand.setWhereRegistered(whereRegistered);
-        
+
         DeathCertificate target = converter.convert(deathCertificateCommand);
 
         assertNotNull(target);
-        assertEquals(age,target.getAge());
-        assertEquals(causeOfDeath,target.getCauseOfDeath());
-        assertEquals(certificateDate,target.getCertificateDate());
-        assertEquals(certificateNumber,target.getCertificateNumber());
-        assertEquals(certificateSource,target.getCertificateSource());
-        assertEquals(certificateType,target.getCertificateType());
-        assertEquals(deceased,target.getDeceased());
-        assertEquals(father,target.getFather());
-        assertEquals(fatherOccupation,target.getFatherOccupation());
-        assertEquals(id,target.getId());
-        assertEquals(informant,target.getInformant());
-        assertEquals(informantAddress,target.getInformantAddress());
-        assertEquals(informantQualification,target.getInformantQualification());
-        assertEquals(maritalStatus,target.getMaritalStatus());
-        assertEquals(mother,target.getMother());
-        assertEquals(motherOccupation,target.getMotherOccupation());
-        assertEquals(number,target.getNumber());
-        assertEquals(occupation,target.getOccupation());
-        assertEquals(registrationAuthority,target.getRegistrationAuthority());
-        assertEquals(sex,target.getSex());
-        assertEquals(spouse,target.getSpouse());
-        assertEquals(spouseOccupation,target.getSpouseOccupation());
-        assertEquals(untrackedFather,target.getUntrackedFather());
-        assertEquals(untrackedInformant,target.getUntrackedInformant());
-        assertEquals(untrackedMother,target.getUntrackedMother());
-        assertEquals(untrackedSpouse,target.getUntrackedSpouse());
-        assertEquals(untrackedUsualResidence,target.getUntrackedUsualResidence());
-        assertEquals(untrackedWhereDied,target.getUntrackedWhereDied());
-        assertEquals(usualResidence,target.getUsualResidence());
-        assertEquals(volume,target.getVolume());
-        assertEquals(whenBorn,target.getWhenBorn());
-        assertEquals(whenDied,target.getWhenDied());
-        assertEquals(whenRegistered,target.getWhenRegistered());
-        assertEquals(whereDied,target.getWhereDied());
-        assertEquals(whereRegistered,target.getWhereRegistered());
+        assertEquals(age, target.getAge());
+        assertEquals(causeOfDeath, target.getCauseOfDeath());
+        assertEquals(certificateDate, target.getCertificateDate());
+        assertEquals(certificateNumber, target.getCertificateNumber());
+        assertEquals(certificateSource, target.getCertificateSource());
+        assertEquals(certificateType, target.getCertificateType());
+        assertEquals(deceased, target.getDeceased());
+        assertEquals(father, target.getFather());
+        assertEquals(fatherOccupation, target.getFatherOccupation());
+        assertEquals(id, target.getId());
+        assertEquals(informant, target.getInformant());
+        assertEquals(informantAddress, target.getInformantAddress());
+        assertEquals(informantQualification, target.getInformantQualification());
+        assertEquals(maritalStatus, target.getMaritalStatus());
+        assertEquals(mother, target.getMother());
+        assertEquals(motherOccupation, target.getMotherOccupation());
+        assertEquals(number, target.getNumber());
+        assertEquals(occupation, target.getOccupation());
+        assertEquals(registrationAuthority, target.getRegistrationAuthority());
+        assertEquals(sex, target.getSex());
+        assertEquals(spouse, target.getSpouse());
+        assertEquals(spouseOccupation, target.getSpouseOccupation());
+        assertEquals(untrackedFather, target.getUntrackedFather());
+        assertEquals(untrackedInformant, target.getUntrackedInformant());
+        assertEquals(untrackedMother, target.getUntrackedMother());
+        assertEquals(untrackedSpouse, target.getUntrackedSpouse());
+        assertEquals(untrackedUsualResidence, target.getUntrackedUsualResidence());
+        assertEquals(untrackedWhereDied, target.getUntrackedWhereDied());
+        assertEquals(usualResidence, target.getUsualResidence());
+        assertEquals(volume, target.getVolume());
+        assertEquals(whenBorn, target.getWhenBorn());
+        assertEquals(whenDied, target.getWhenDied());
+        assertEquals(whenRegistered, target.getWhenRegistered());
+        assertEquals(whereDied, target.getWhereDied());
+        assertEquals(whereRegistered, target.getWhereRegistered());
 
     }
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/deathcertificates/DeathCertificateConverterCallsMilitaryConverterTest.java

@@ -33,7 +33,7 @@ class DeathCertificateConverterCallsMilitaryConverterTest {
 
     @Test
     void militaryConverterIsCalledTest() {
-         DeathCertificateCommand deathCertificateCommand =  converter.convert(deathCertificate);
+        DeathCertificateCommand deathCertificateCommand = converter.convert(deathCertificate);
         verify(militaryConverterMock).convert(deathCertificate, deathCertificateCommand);
     }
 }

src/test/java/scot/carricksoftware/grants/converters/certificates/deathcertificates/DeathCertificateConverterTest.java

@@ -120,41 +120,41 @@ class DeathCertificateConverterTest {
         DeathCertificateCommand target = converter.convert(deathCertificate);
 
         assertNotNull(target);
-        assertEquals(age,target.getAge());
-        assertEquals(causeOfDeath,target.getCauseOfDeath());
-        assertEquals(certificateDate,target.getCertificateDate());
-        assertEquals(certificateNumber,target.getCertificateNumber());
-        assertEquals(certificateSource,target.getCertificateSource());
-        assertEquals(certificateType,target.getCertificateType());
-        assertEquals(deceased,target.getDeceased());
-        assertEquals(father,target.getFather());
-        assertEquals(fatherOccupation,target.getFatherOccupation());
-        assertEquals(id,target.getId());
-        assertEquals(informant,target.getInformant());
-        assertEquals(informantAddress,target.getInformantAddress());
-        assertEquals(informantQualification,target.getInformantQualification());
-        assertEquals(maritalStatus,target.getMaritalStatus());
-        assertEquals(mother,target.getMother());
-        assertEquals(motherOccupation,target.getMotherOccupation());
-        assertEquals(number,target.getNumber());
-        assertEquals(occupation,target.getOccupation());
-        assertEquals(registrationAuthority,target.getRegistrationAuthority());
-        assertEquals(sex,target.getSex());
-        assertEquals(spouse,target.getSpouse());
-        assertEquals(spouseOccupation,target.getSpouseOccupation());
-        assertEquals(untrackedFather,target.getUntrackedFather());
-        assertEquals(untrackedInformant,target.getUntrackedInformant());
-        assertEquals(untrackedMother,target.getUntrackedMother());
-        assertEquals(untrackedSpouse,target.getUntrackedSpouse());
-        assertEquals(untrackedUsualResidence,target.getUntrackedUsualResidence());
-        assertEquals(untrackedWhereDied,target.getUntrackedWhereDied());
-        assertEquals(usualResidence,target.getUsualResidence());
-        assertEquals(volume,target.getVolume());
-        assertEquals(whenBorn,target.getWhenBorn());
-        assertEquals(whenDied,target.getWhenDied());
-        assertEquals(whenRegistered,target.getWhenRegistered());
-        assertEquals(whereDied,target.getWhereDied());
-        assertEquals(whereRegistered,target.getWhereRegistered());
+        assertEquals(age, target.getAge());
+        assertEquals(causeOfDeath, target.getCauseOfDeath());
+        assertEquals(certificateDate, target.getCertificateDate());
+        assertEquals(certificateNumber, target.getCertificateNumber());
+        assertEquals(certificateSource, target.getCertificateSource());
+        assertEquals(certificateType, target.getCertificateType());
+        assertEquals(deceased, target.getDeceased());
+        assertEquals(father, target.getFather());
+        assertEquals(fatherOccupation, target.getFatherOccupation());
+        assertEquals(id, target.getId());
+        assertEquals(informant, target.getInformant());
+        assertEquals(informantAddress, target.getInformantAddress());
+        assertEquals(informantQualification, target.getInformantQualification());
+        assertEquals(maritalStatus, target.getMaritalStatus());
+        assertEquals(mother, target.getMother());
+        assertEquals(motherOccupation, target.getMotherOccupation());
+        assertEquals(number, target.getNumber());
+        assertEquals(occupation, target.getOccupation());
+        assertEquals(registrationAuthority, target.getRegistrationAuthority());
+        assertEquals(sex, target.getSex());
+        assertEquals(spouse, target.getSpouse());
+        assertEquals(spouseOccupation, target.getSpouseOccupation());
+        assertEquals(untrackedFather, target.getUntrackedFather());
+        assertEquals(untrackedInformant, target.getUntrackedInformant());
+        assertEquals(untrackedMother, target.getUntrackedMother());
+        assertEquals(untrackedSpouse, target.getUntrackedSpouse());
+        assertEquals(untrackedUsualResidence, target.getUntrackedUsualResidence());
+        assertEquals(untrackedWhereDied, target.getUntrackedWhereDied());
+        assertEquals(usualResidence, target.getUsualResidence());
+        assertEquals(volume, target.getVolume());
+        assertEquals(whenBorn, target.getWhenBorn());
+        assertEquals(whenDied, target.getWhenDied());
+        assertEquals(whenRegistered, target.getWhenRegistered());
+        assertEquals(whereDied, target.getWhereDied());
+        assertEquals(whereRegistered, target.getWhereRegistered());
 
     }
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/death/DeathCertificateMilitaryTest.java

@@ -60,6 +60,4 @@ class DeathCertificateMilitaryTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/death/DeathCertificateTimeTest.java

@@ -73,5 +73,4 @@ class DeathCertificateTimeTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/death/DeathCertificateTwoTest.java

@@ -22,7 +22,7 @@ class DeathCertificateTwoTest {
     void setUp() {
         deathCertificate = new DeathCertificate();
     }
-    
+
     @Test
     void getCauseOfDeathTest() {
         assertNull(deathCertificate.getCauseOfDeath());
@@ -48,5 +48,4 @@ class DeathCertificateTwoTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/marriage/MarriageCertificatePersonTest.java

@@ -75,6 +75,17 @@ class MarriageCertificatePersonTest {
         assertNull(marriageCertificate.getFirstWitness());
     }
 
+    @Test
+    void setFirstWitnessTest() {
+        marriageCertificate.setFirstWitness(person);
+        assertEquals(person, marriageCertificate.getFirstWitness());
+    }
+
+    @Test
+    void getSecondWitnessTest() {
+        assertNull(marriageCertificate.getSecondWitness());
+    }
+
     @Test
     void setSecondWitnessTest() {
         marriageCertificate.setSecondWitness(person);

src/test/java/scot/carricksoftware/grants/domains/certificates/marriage/MarriageCertificatePlaceTest.java

@@ -60,7 +60,4 @@ class MarriageCertificatePlaceTest {
     }
 
 
-
-
-
 }

src/test/java/scot/carricksoftware/grants/domains/certificates/marriage/MarriageCertificateUntrackedTest.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.domains.certificates.marriage;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import scot.carricksoftware.grants.domains.certificates.MarriageCertificate;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+
+
+class MarriageCertificateUntrackedTest {
+
+    private MarriageCertificate marriageCertificate;
+    private String string;
+
+    @BeforeEach
+    void setUp() {
+        marriageCertificate = new MarriageCertificate();
+        string = GetRandomString();
+    }
+
+    @Test
+    void getUntrackedWhereMarriedTest() {
+        assertNull(marriageCertificate.getUntrackedWhereMarried());
+    }
+
+    @Test
+    void setUntrackedWhereMarriedTest() {
+        marriageCertificate.setUntrackedWhereMarried(string);
+        assertEquals(string, marriageCertificate.getUntrackedWhereMarried());
+    }
+
+    @Test
+    void getGroomUntrackedResidenceTest() {
+        assertNull(marriageCertificate.getGroomUntrackedResidence());
+    }
+
+    @Test
+    void setGroomUntrackedResidenceTest() {
+        marriageCertificate.setGroomUntrackedResidence(string);
+        assertEquals(string, marriageCertificate.getGroomUntrackedResidence());
+    }
+
+
+    @Test
+    void getGroomUntrackedFatherTest() {
+        assertNull(marriageCertificate.getGroomUntrackedFather());
+    }
+
+    @Test
+    void setGroomUntrackedFatherTest() {
+        marriageCertificate.setGroomUntrackedFather(string);
+        assertEquals(string, marriageCertificate.getGroomUntrackedFather());
+    }
+
+    @Test
+    void getBrideUntrackedFatherTest() {
+        assertNull(marriageCertificate.getBrideUntrackedFather());
+    }
+
+    @Test
+    void setBrideUntrackedFatherTest() {
+        marriageCertificate.setBrideUntrackedFather(string);
+        assertEquals(string, marriageCertificate.getBrideUntrackedFather());
+    }
+
+    @Test
+    void getUntrackedFirstWitnessTest() {
+        assertNull(marriageCertificate.getUntrackedFirstWitness());
+    }
+
+    @Test
+    void setUntrackedFirstWitnessTest() {
+        marriageCertificate.setUntrackedFirstWitness(string);
+        assertEquals(string, marriageCertificate.getUntrackedFirstWitness());
+    }
+
+    @Test
+    void getUntrackedSecondWitnessTest() {
+        assertNull(marriageCertificate.getUntrackedSecondWitness());
+    }
+
+    @Test
+    void setUntrackedSecondWitnessTest() {
+        marriageCertificate.setUntrackedSecondWitness(string);
+        assertEquals(string, marriageCertificate.getUntrackedSecondWitness());
+    }
+
+
+}

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

@@ -86,9 +86,9 @@ class DeathCertificateUntrackedFieldsValidatorTest {
         verify(validateTwoFieldTypesMock).validateOptionalPersonAndUntrackedPerson(spouse, untrackedSpouse, "spouse", "untrackedSpouse",
                 "One and only one spouse and untracked spouse may be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validateOptionalPersonAndUntrackedPerson(father, untrackedFather, "father", "untrackedFather",
-               "One and only one father and untracked father may be specified.", bindingResultMock);
+                "One and only one father and untracked father may be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validatePlaceAndUntrackedPlace(whereDied, untrackedWhereDied, "whereDied", "untrackedWhereDied",
-               "One and only one where died and untracked where died must be specified.", bindingResultMock);
+                "One and only one where died and untracked where died must be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validateOptionalPlaceAndUntrackedPlace(usualResidence, untrackedUsualResidence, "usualResidence", "untrackedUsualResidence",
                 "Only one usual residence and untracked usual residence may be specified.", bindingResultMock);
         verify(validateTwoFieldTypesMock).validateOptionalPersonAndUntrackedPerson(mother, untrackedMother, "mother", "untrackedMother",

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

@@ -44,6 +44,4 @@ class ValidatePastDateAndTimeRegressionTest {
     }
 
 
-
-
 }