瀏覽代碼

Five attributes added to CensusEntry converters

Andrew Grant 7 月之前
父節點
當前提交
7a3dd8f6b7

+ 4 - 0
src/main/java/scot/carricksoftware/grants/converters/census/CensusEntryCommandConverterImpl.java

@@ -31,6 +31,10 @@ public class CensusEntryCommandConverterImpl implements CensusEntryCommandConver
         result.setBirthDay(source.getBirthDay());
         result.setPersonalOccupation(source.getPersonalOccupation());
         result.setNotes(source.getNotes());
+        result.setChildrenBornAlive(source.getChildrenBornAlive());
+        result.setChildrenWhoHaveDied(source.getChildrenWhoHaveDied());
+        result.setYearsCompletedMarriage(source.getYearsCompletedMarriage());
+        result.setChildrenStillAlive(source.getChildrenStillAlive());
         return result;
     }
 

+ 4 - 0
src/main/java/scot/carricksoftware/grants/converters/census/CensusEntryConverterImpl.java

@@ -32,6 +32,10 @@ public class CensusEntryConverterImpl implements CensusEntryConverter {
         result.setBirthDay(source.getBirthDay());
         result.setPersonalOccupation(source.getPersonalOccupation());
         result.setNotes(source.getNotes());
+        result.setChildrenBornAlive(source.getChildrenBornAlive());
+        result.setChildrenWhoHaveDied(source.getChildrenWhoHaveDied());
+        result.setYearsCompletedMarriage(source.getYearsCompletedMarriage());
+        result.setChildrenStillAlive(source.getChildrenStillAlive());
         return result;
     }
 }

+ 13 - 0
src/test/java/scot/carricksoftware/grants/converters/census/CensusEntryCommandConverterTest.java

@@ -48,6 +48,10 @@ class CensusEntryCommandConverterTest {
         String birthDay = GetRandomString();
         String personalOccupation = GetRandomString();
         String notes = GetRandomString();
+        String childrenBornAlive = GetRandomString();
+        String childrenWhoHaveDied = GetRandomString();
+        String yearsCompletedMarriage = GetRandomString();
+        String childrenStillAlive = GetRandomString();
 
 
         source.setId(id);
@@ -65,6 +69,11 @@ class CensusEntryCommandConverterTest {
         source.setBirthDay(birthDay);
         source.setPersonalOccupation(personalOccupation);
         source.setNotes(notes);
+        source.setChildrenBornAlive(childrenBornAlive);
+        source.setChildrenWhoHaveDied(childrenWhoHaveDied);
+        source.setYearsCompletedMarriage(yearsCompletedMarriage);
+        source.setChildrenStillAlive(childrenStillAlive);
+
 
         CensusEntry target = converter.convert(source);
 
@@ -84,5 +93,9 @@ class CensusEntryCommandConverterTest {
         assertEquals(birthDay, target.getBirthDay());
         assertEquals(personalOccupation, target.getPersonalOccupation());
         assertEquals(notes, target.getNotes());
+        assertEquals(childrenBornAlive, target.getChildrenBornAlive());
+        assertEquals(childrenStillAlive, target.getChildrenStillAlive());
+        assertEquals(yearsCompletedMarriage, target.getYearsCompletedMarriage());
+        assertEquals(childrenWhoHaveDied, target.getChildrenWhoHaveDied());
     }
 }

+ 12 - 0
src/test/java/scot/carricksoftware/grants/converters/census/CensusEntryConverterTest.java

@@ -47,6 +47,10 @@ class CensusEntryConverterTest {
         String birthDay = GetRandomString();
         String personalOccupation = GetRandomString();
         String notes = GetRandomString();
+        String childrenBornAlive = GetRandomString();
+        String childrenWhoHaveDied = GetRandomString();
+        String yearsCompletedMarriage = GetRandomString();
+        String childrenStillAlive = GetRandomString();
 
         source.setId(id);
         source.setName(name);
@@ -63,6 +67,10 @@ class CensusEntryConverterTest {
         source.setBirthDay(birthDay);
         source.setPersonalOccupation(personalOccupation);
         source.setNotes(notes);
+        source.setChildrenBornAlive(childrenBornAlive);
+        source.setChildrenWhoHaveDied(childrenWhoHaveDied);
+        source.setYearsCompletedMarriage(yearsCompletedMarriage);
+        source.setChildrenStillAlive(childrenStillAlive);
 
         CensusEntryCommand target = converter.convert(source);
 
@@ -82,5 +90,9 @@ class CensusEntryConverterTest {
         assertEquals(birthDay, target.getBirthDay());
         assertEquals(personalOccupation, target.getPersonalOccupation());
         assertEquals(notes, target.getNotes());
+        assertEquals(childrenBornAlive, target.getChildrenBornAlive());
+        assertEquals(childrenStillAlive, target.getChildrenStillAlive());
+        assertEquals(yearsCompletedMarriage, target.getYearsCompletedMarriage());
+        assertEquals(childrenWhoHaveDied, target.getChildrenWhoHaveDied());
     }
 }