MarriageCertificateBrideCommandConverter (2)

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

@@ -15,5 +15,15 @@ public class MarriageCertificateBrideCommandConverterImpl implements MarriageCer
     @Override
     public void convert(MarriageCertificateCommand source, MarriageCertificate target) {
 
+        target.setBride(source.getBride());
+        target.setBrideAge(source.getBrideAge());
+        target.setBrideCondition(source.getBrideCondition());
+        target.setBrideFather(source.getBrideFather());
+        target.setBrideFatherRank(source.getBrideFatherRank());
+        target.setBrideRank(source.getBrideRank());
+        target.setBrideUntrackedFather(source.getBrideUntrackedFather());
+        target.setBrideUntrackedResidence(source.getBrideUntrackedResidence());
+        target.setBrideUsualResidence(source.getBrideUsualResidence());
+
     }
 }

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

@@ -23,15 +23,7 @@ public class MarriageCertificateCommandConverterImpl implements MarriageCertific
         MarriageCertificate target = new MarriageCertificate();
         brideConverter.convert(source, target);
 
-        target.setBride(source.getBride());
-        target.setBrideAge(source.getBrideAge());
-        target.setBrideCondition(source.getBrideCondition());
-        target.setBrideFather(source.getBrideFather());
-        target.setBrideFatherRank(source.getBrideFatherRank());
-        target.setBrideRank(source.getBrideRank());
-        target.setBrideUntrackedFather(source.getBrideUntrackedFather());
-        target.setBrideUntrackedResidence(source.getBrideUntrackedResidence());
-        target.setBrideUsualResidence(source.getBrideUsualResidence());
+
         target.setCertificateDate(source.getCertificateDate());
         target.setCertificateNumber(source.getCertificateNumber());
         target.setCertificateSource(source.getCertificateSource());

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

@@ -41,85 +41,63 @@ class MarriageCertificateCommandConverterTest {
 
         MarriageCertificateCommand source = new MarriageCertificateCommandImpl();
 
-        source.setId(GetRandomLong());
-        source.setBride(GetRandomPerson());
+        source.setCertificateDate(GetRandomString());
+        source.setCertificateNumber(GetRandomString());
+        source.setCertificateSource(GetRandomOrganisation());
+        source.setCertificateType(CertificateType.EXTRACT);
+        source.setFirstWitness(GetRandomPerson());
         source.setGroom(GetRandomPerson());
-        source.setGroomUsualResidence(GetRandomPlace());
-        source.setBrideUsualResidence(GetRandomPlace());
-        source.setGroomUntrackedResidence(GetRandomString());
-        source.setBrideUntrackedResidence(GetRandomString());
+        source.setGroomAge(GetRandomString());
+        source.setGroomCondition(GetRandomString());
         source.setGroomFather(GetRandomPerson());
-        source.setBrideFather(GetRandomPerson());
-        source.setGroomUntrackedFather(GetRandomString());
-        source.setBrideUntrackedFather(GetRandomString());
-        source.setBrideFatherRank(GetRandomString());
         source.setGroomFatherRank(GetRandomString());
-        source.setFirstWitness(GetRandomPerson());
+        source.setGroomRank(GetRandomString());
+        source.setGroomUntrackedFather(GetRandomString());
+        source.setGroomUntrackedResidence(GetRandomString());
+        source.setGroomUsualResidence(GetRandomPlace());
+        source.setId(GetRandomLong());
+        source.setNumber(GetRandomString());
+        source.setRegistrationAuthority(GetRandomOrganisation());
         source.setSecondWitness(GetRandomPerson());
         source.setUntrackedFirstWitness(GetRandomString());
         source.setUntrackedSecondWitness(GetRandomString());
-        source.setWhenMarried(GetRandomString());
-        source.setWhereMarried(GetRandomPlace());
         source.setUntrackedWhereMarried(GetRandomString());
-        source.setGroomAge(GetRandomString());
-        source.setBrideAge(GetRandomString());
-        source.setGroomCondition(GetRandomString());
-        source.setBrideCondition(GetRandomString());
-        source.setGroomRank(GetRandomString());
-        source.setBrideRank(GetRandomString());
-        source.setCertificateNumber(GetRandomString());
-        source.setCertificateType(CertificateType.EXTRACT);
-        source.setCertificateSource(GetRandomOrganisation());
-        source.setCertificateDate(GetRandomString());
-        source.setRegistrationAuthority(GetRandomOrganisation());
         source.setVolume(GetRandomString());
-        source.setNumber(GetRandomString());
+        source.setWhenMarried(GetRandomString());
+        source.setWhereMarried(GetRandomPlace());
 
 
         MarriageCertificate target = converter.convert(source);
 
         assert target != null;
-        assertEquals(source.getId(), target.getId());
-        assertEquals(source.getBride(), target.getBride());
-        assertEquals(source.getGroom(), target.getGroom());
-        assertEquals(source.getGroomUntrackedResidence(), target.getGroomUntrackedResidence());
-        assertEquals(source.getBrideUntrackedResidence(), target.getBrideUntrackedResidence());
-        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
-        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
-        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
-        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
-        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.getGroomFatherRank(), target.getGroomFatherRank());
+        assertEquals(source.getCertificateDate(), target.getCertificateDate());
+        assertEquals(source.getCertificateNumber(), target.getCertificateNumber());
+        assertEquals(source.getCertificateSource(), target.getCertificateSource());
+        assertEquals(source.getCertificateType(), target.getCertificateType());
         assertEquals(source.getFirstWitness(), target.getFirstWitness());
-        assertEquals(source.getSecondWitness(), target.getSecondWitness());
-        assertEquals(source.getWhenMarried(), target.getWhenMarried());
-        assertEquals(source.getWhereMarried(), target.getWhereMarried());
-        assertEquals(source.getUntrackedWhereMarried(), target.getUntrackedWhereMarried());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getGroom(), target.getGroom());
         assertEquals(source.getGroomAge(), target.getGroomAge());
-        assertEquals(source.getBrideAge(), target.getBrideAge());
         assertEquals(source.getGroomCondition(), target.getGroomCondition());
-        assertEquals(source.getBrideCondition(), target.getBrideCondition());
+        assertEquals(source.getGroomFather(), target.getGroomFather());
+        assertEquals(source.getGroomFatherRank(), target.getGroomFatherRank());
         assertEquals(source.getGroomRank(), target.getGroomRank());
-        assertEquals(source.getBrideRank(), target.getBrideRank());
-        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getGroomUntrackedFather(), target.getGroomUntrackedFather());
+        assertEquals(source.getGroomUntrackedResidence(), target.getGroomUntrackedResidence());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+        assertEquals(source.getId(), target.getId());
+        assertEquals(source.getNumber(), target.getNumber());
+        assertEquals(source.getRegistrationAuthority(), target.getRegistrationAuthority());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
         assertEquals(source.getSecondWitness(), target.getSecondWitness());
         assertEquals(source.getUntrackedFirstWitness(), target.getUntrackedFirstWitness());
         assertEquals(source.getUntrackedSecondWitness(), target.getUntrackedSecondWitness());
-        assertEquals(source.getWhereMarried(), target.getWhereMarried());
-
-        assertEquals(source.getCertificateNumber(), target.getCertificateNumber());
-        assertEquals(source.getCertificateType(), target.getCertificateType());
-        assertEquals(source.getCertificateSource(), target.getCertificateSource());
-        assertEquals(source.getCertificateDate(), target.getCertificateDate());
-        assertEquals(source.getRegistrationAuthority(), target.getRegistrationAuthority());
+        assertEquals(source.getUntrackedWhereMarried(), target.getUntrackedWhereMarried());
         assertEquals(source.getVolume(), target.getVolume());
-        assertEquals(source.getNumber(), target.getNumber());
+        assertEquals(source.getWhenMarried(), target.getWhenMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
 
 
     }