Marriage Certificate converter test (3)

src/main/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/MarriageCertificateConverterImpl.java

@@ -26,7 +26,7 @@ public class MarriageCertificateConverterImpl implements MarriageCertificateConv
         target.setGroomFather(source.getGroomFather());
         target.setBrideFather(source.getBrideFather());
         target.setGroomUntrackedFather(source.getGroomUntrackedFather());
-        target.setBrideUntrackedFather(source.getGroomUntrackedFather());
+        target.setBrideUntrackedFather(source.getBrideUntrackedFather());
         target.setBrideFatherRank(source.getBrideFatherRank());
         target.setFirstWitness(source.getFirstWitness());
         target.setSecondWitness(source.getSecondWitness());

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/MarriageCertificateCommandConverterTest.java

@@ -76,6 +76,7 @@ class MarriageCertificateCommandConverterTest {
         assertEquals(source.getBrideUntrackedFather(), target.getBrideUntrackedFather());
         assertEquals(source.getGroomRank(), target.getGroomRank());
         assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getBrideFatherRank(), target.getBrideFatherRank());
         assertEquals(source.getFirstWitness(), target.getFirstWitness());
         assertEquals(source.getSecondWitness(), target.getSecondWitness());
         assertEquals(source.getWhenMarried(), target.getWhenMarried());
@@ -89,6 +90,8 @@ class MarriageCertificateCommandConverterTest {
         assertEquals(source.getBrideRank(), target.getBrideRank());
         assertEquals(source.getFirstWitness(), target.getFirstWitness());
         assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getUntrackedFirstWitness(), target.getUntrackedFirstWitness());
+        assertEquals(source.getUntrackedSecondWitness(), target.getUntrackedSecondWitness());
         assertEquals(source.getWhereMarried(), target.getWhereMarried());
         assertEquals(source.getWhereMarried(), target.getWhereMarried());
 

src/test/java/scot/carricksoftware/grants/converters/certificates/marriagecertificates/MarriageCertificateConverterTest.java

@@ -64,14 +64,20 @@ class MarriageCertificateConverterTest {
         assertEquals(source.getGroom(), target.getGroom());
         assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
         assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+        assertEquals(source.getGroomUntrackedResidence(), target.getGroomUntrackedResidence());
+        assertEquals(source.getBrideUntrackedResidence(), target.getBrideUntrackedResidence());
         assertEquals(source.getGroomFather(), target.getGroomFather());
         assertEquals(source.getBrideFather(), target.getBrideFather());
+        assertEquals(source.getGroomUntrackedFather(), target.getGroomUntrackedFather());
+        assertEquals(source.getBrideUntrackedFather(), target.getBrideUntrackedFather());
         assertEquals(source.getGroomRank(), target.getGroomRank());
         assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getBrideFatherRank(), target.getBrideFatherRank());
         assertEquals(source.getFirstWitness(), target.getFirstWitness());
         assertEquals(source.getSecondWitness(), target.getSecondWitness());
         assertEquals(source.getWhereMarried(), target.getWhereMarried());
         assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getUntrackedWhereMarried(), target.getUntrackedWhereMarried());
         assertEquals(source.getGroomAge(), target.getGroomAge());
         assertEquals(source.getBrideAge(), target.getBrideAge());
         assertEquals(source.getGroomCondition(), target.getGroomCondition());
@@ -80,8 +86,10 @@ class MarriageCertificateConverterTest {
         assertEquals(source.getBrideRank(), target.getBrideRank());
         assertEquals(source.getFirstWitness(), target.getFirstWitness());
         assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getUntrackedFirstWitness(), target.getUntrackedFirstWitness());
+        assertEquals(source.getUntrackedSecondWitness(), target.getUntrackedSecondWitness());
         assertEquals(source.getWhereMarried(), target.getWhereMarried());
-        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getWhenMarried(), target.getWhenMarried());
 
 
     }