Marriage Certificate converter test

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

@@ -33,7 +33,7 @@ public class MarriageCertificateCommandConverterImpl implements MarriageCertific
         target.setBride(source.getBride());
         target.setGroom(source.getGroom());
         target.setWhenMarried(source.getWhenMarried());
-        target.setWhenMarried(source.getWhenMarried());
+        target.setWhereMarried(source.getWhereMarried());
         target.setUntrackedWhereMarried(source.getUntrackedWhereMarried());
         target.setGroomAge(source.getGroomAge());
         target.setBrideAge(source.getBrideAge());

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

@@ -19,18 +19,6 @@ public class MarriageCertificateConverterImpl implements MarriageCertificateConv
     public MarriageCertificateCommand convert(MarriageCertificate source) {
         MarriageCertificateCommand target = new MarriageCertificateCommandImpl();
 
-        target.setId(source.getId());
-        target.setBride(source.getBride());
-        target.setGroom(source.getGroom());
-        target.setWhenMarried(source.getWhenMarried());
-        target.setWhenMarried(source.getWhenMarried());
-        target.setUntrackedWhereMarried(source.getUntrackedWhereMarried());
-        target.setGroomAge(source.getGroomAge());
-        target.setBrideAge(source.getBrideAge());
-        target.setGroomCondition(source.getGroomCondition());
-        target.setBrideCondition(source.getBrideCondition());
-        target.setGroomRank(source.getGroomRank());
-        target.setBrideRank(source.getBrideRank());
         target.setGroomUsualResidence(source.getGroomUsualResidence());
         target.setBrideUsualResidence(source.getBrideUsualResidence());
         target.setGroomUntrackedResidence(source.getGroomUntrackedResidence());
@@ -43,6 +31,19 @@ public class MarriageCertificateConverterImpl implements MarriageCertificateConv
         target.setFirstWitness(source.getFirstWitness());
         target.setSecondWitness(source.getSecondWitness());
         target.setUntrackedFirstWitness(source.getUntrackedFirstWitness());
+        target.setUntrackedSecondWitness(source.getUntrackedSecondWitness());
+        target.setId(source.getId());
+        target.setBride(source.getBride());
+        target.setGroom(source.getGroom());
+        target.setWhenMarried(source.getWhenMarried());
+        target.setWhereMarried(source.getWhereMarried());
+        target.setUntrackedWhereMarried(source.getUntrackedWhereMarried());
+        target.setGroomAge(source.getGroomAge());
+        target.setBrideAge(source.getBrideAge());
+        target.setGroomCondition(source.getGroomCondition());
+        target.setBrideCondition(source.getBrideCondition());
+        target.setGroomRank(source.getGroomRank());
+        target.setBrideRank(source.getBrideRank());
 
         return target;
     }

src/test/java/scot/carricksoftware/grants/GenerateRandomPlaceValues.java

@@ -29,6 +29,7 @@ public class GenerateRandomPlaceValues {
     public static Place GetRandomPlace() {
         Place place = new Place();
         place.setName(GetRandomString());
+        place.setRegion(GetRandomRegion());
         return place;
     }
 
@@ -36,6 +37,7 @@ public class GenerateRandomPlaceValues {
     public static PlaceCommand GetRandomPlaceCommand() {
         PlaceCommand placeCommand = new PlaceCommandImpl();
         placeCommand.setName(GetRandomString());
+        placeCommand.setRegion(GetRandomRegion());
         return placeCommand;
     }
 
@@ -55,6 +57,7 @@ public class GenerateRandomPlaceValues {
     public static Region GetRandomRegion() {
         Region region = new Region();
         region.setName(GetRandomString());
+        region.setCountry(GetRandomCountry());
         return region;
     }
 
@@ -62,6 +65,7 @@ public class GenerateRandomPlaceValues {
     public static RegionCommand GetRandomRegionCommand() {
         RegionCommand regionCommand = new RegionCommandImpl();
         regionCommand.setName(GetRandomString());
+        regionCommand.setCountry(GetRandomCountry());
         return regionCommand;
     }
 

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

@@ -11,11 +11,12 @@ import org.junit.jupiter.api.Test;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.domains.certificates.MarriageCertificate;
-import scot.carricksoftware.grants.domains.people.Person;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 class MarriageCertificateCommandConverterTest {
 
@@ -28,20 +29,61 @@ class MarriageCertificateCommandConverterTest {
 
     @Test
     void convertTest() {
-        Long id = GetRandomLong();
-        Person bride = GetRandomPerson();
-        Person groom = GetRandomPerson();
+
         MarriageCertificateCommand source = new MarriageCertificateCommandImpl();
 
-        source.setId(id);
-        source.setBride(bride);
-        source.setGroom(groom);
+        source.setId(GetRandomLong());
+        source.setBride(GetRandomPerson());
+        source.setGroom(GetRandomPerson());
+        source.setGroomUsualResidence(GetRandomPlace());
+        source.setBrideUsualResidence(GetRandomPlace());
+        source.setGroomUntrackedResidence(GetRandomString());
+        source.setBrideUntrackedResidence(GetRandomString());
+        source.setGroomFather(GetRandomPerson());
+        source.setBrideFather(GetRandomPerson());
+        source.setGroomUntrackedFather(GetRandomString());
+        source.setBrideUntrackedFather(GetRandomString());
+        source.setBrideFatherRank(GetRandomString());
+        source.setFirstWitness(GetRandomPerson());
+        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());
 
         MarriageCertificate target = converter.convert(source);
 
         assert target != null;
-        assertEquals(id, target.getId());
-        assertEquals(bride, target.getBride());
-        assertEquals(groom, target.getGroom());
+        assertEquals(source.getId(), target.getId());
+        assertEquals(source.getBride(), target.getBride());
+        assertEquals(source.getGroom(), target.getGroom());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+        assertEquals(source.getGroomFather(), target.getGroomFather());
+        assertEquals(source.getBrideFather(), target.getBrideFather());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getGroomAge(), target.getGroomAge());
+        assertEquals(source.getBrideAge(), target.getBrideAge());
+        assertEquals(source.getGroomCondition(), target.getGroomCondition());
+        assertEquals(source.getBrideCondition(), target.getBrideCondition());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+
     }
 }

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

@@ -10,11 +10,12 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.domains.certificates.MarriageCertificate;
-import scot.carricksoftware.grants.domains.people.Person;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 class MarriageCertificateConverterTest {
 
@@ -27,20 +28,61 @@ class MarriageCertificateConverterTest {
 
     @Test
     void convertTest() {
-        Long id = GetRandomLong();
-        Person bride = GetRandomPerson();
-        Person groom = GetRandomPerson();
         MarriageCertificate source = new MarriageCertificate();
 
-        source.setId(id);
-        source.setBride(bride);
-        source.setGroom(groom);
+        source.setId(GetRandomLong());
+        source.setBride(GetRandomPerson());
+        source.setGroom(GetRandomPerson());
+        source.setGroomUsualResidence(GetRandomPlace());
+        source.setBrideUsualResidence(GetRandomPlace());
+        source.setGroomUntrackedResidence(GetRandomString());
+        source.setBrideUntrackedResidence(GetRandomString());
+        source.setGroomFather(GetRandomPerson());
+        source.setBrideFather(GetRandomPerson());
+        source.setGroomUntrackedFather(GetRandomString());
+        source.setBrideUntrackedFather(GetRandomString());
+        source.setBrideFatherRank(GetRandomString());
+        source.setFirstWitness(GetRandomPerson());
+        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());
 
         MarriageCertificateCommand target = converter.convert(source);
 
         assert target != null;
-        assertEquals(id, target.getId());
-        assertEquals(bride, target.getBride());
-        assertEquals(groom, target.getGroom());
+        assertEquals(source.getId(), target.getId());
+        assertEquals(source.getBride(), target.getBride());
+        assertEquals(source.getGroom(), target.getGroom());
+        assertEquals(source.getGroomUsualResidence(), target.getGroomUsualResidence());
+        assertEquals(source.getBrideUsualResidence(), target.getBrideUsualResidence());
+        assertEquals(source.getGroomFather(), target.getGroomFather());
+        assertEquals(source.getBrideFather(), target.getBrideFather());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getGroomAge(), target.getGroomAge());
+        assertEquals(source.getBrideAge(), target.getBrideAge());
+        assertEquals(source.getGroomCondition(), target.getGroomCondition());
+        assertEquals(source.getBrideCondition(), target.getBrideCondition());
+        assertEquals(source.getGroomRank(), target.getGroomRank());
+        assertEquals(source.getBrideRank(), target.getBrideRank());
+        assertEquals(source.getFirstWitness(), target.getFirstWitness());
+        assertEquals(source.getSecondWitness(), target.getSecondWitness());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+        assertEquals(source.getWhereMarried(), target.getWhereMarried());
+
+
     }
 }