Rooms Occupied, Inhabited Houses, Uninhabited Houses to converters

src/main/java/scot/carricksoftware/grants/converters/census/CensusCommandConverterImpl.java

@@ -26,6 +26,10 @@ public class CensusCommandConverterImpl implements CensusCommandConverter {
         result.setRoomsWithWindows(source.getRoomsWithWindows());
         result.setFilledInBy(source.getFilledInBy());
         result.setTotalRooms(source.getTotalRooms());
+        result.setRoomsOccupied(source.getRoomsOccupied());
+        result.setInhabitedHouses(source.getInhabitedHouses());
+        result.setUninhabitedHouses(source.getUninhabitedHouses());
+
 
 
         return result;

src/main/java/scot/carricksoftware/grants/converters/census/CensusConverterImpl.java

@@ -26,6 +26,9 @@ public class CensusConverterImpl implements CensusConverter {
         result.setRoomsWithWindows(source.getRoomsWithWindows());
         result.setFilledInBy(source.getFilledInBy());
         result.setTotalRooms(source.getTotalRooms());
+        result.setRoomsOccupied(source.getRoomsOccupied());
+        result.setInhabitedHouses(source.getInhabitedHouses());
+        result.setUninhabitedHouses(source.getUninhabitedHouses());
 
         return result;
     }

src/test/java/scot/carricksoftware/grants/converters/census/CensusCommandConverterTest.java

@@ -47,6 +47,9 @@ class CensusCommandConverterTest {
         String inhabitedRooms = GetRandomString();
         String filledInBy = GetRandomString();
         String totalRooms = GetRandomString();
+        String roomsOccupied = GetRandomString();
+        String inhabitedHouses = GetRandomString();
+        String uninhabitedHouses = GetRandomString();
 
         source.setId(id);
         source.setCensusDate(censusDate);
@@ -57,6 +60,9 @@ class CensusCommandConverterTest {
         source.setRoomsWithWindows(roomsWithWindows);
         source.setFilledInBy(filledInBy);
         source.setTotalRooms(totalRooms);
+        source.setRoomsOccupied(roomsOccupied);
+        source.setInhabitedHouses(inhabitedHouses);
+        source.setUninhabitedHouses(uninhabitedHouses);
 
         Census target = converter.convert(source);
 
@@ -70,5 +76,8 @@ class CensusCommandConverterTest {
         assertEquals(inhabitedRooms, target.getInhabitedRooms());
         assertEquals(filledInBy, target.getFilledInBy());
         assertEquals(totalRooms, target.getTotalRooms());
+        assertEquals(roomsOccupied, target.getRoomsOccupied());
+        assertEquals(inhabitedHouses, target.getInhabitedHouses());
+        assertEquals(uninhabitedHouses, target.getUninhabitedHouses());
     }
 }

src/test/java/scot/carricksoftware/grants/converters/census/CensusConverterTest.java

@@ -47,6 +47,9 @@ class CensusConverterTest {
         String inhabitedRooms = GetRandomString();
         String filledInBy = GetRandomString();
         String totalRooms = GetRandomString();
+        String roomsOccupied = GetRandomString();
+        String inhabitedHouses = GetRandomString();
+        String uninhabitedHouses = GetRandomString();
 
 
         source.setId(id);
@@ -58,6 +61,9 @@ class CensusConverterTest {
         source.setRoomsWithWindows(roomsWithWindows);
         source.setFilledInBy(filledInBy);
         source.setTotalRooms(totalRooms);
+        source.setRoomsOccupied(roomsOccupied);
+        source.setInhabitedHouses(inhabitedHouses);
+        source.setUninhabitedHouses(uninhabitedHouses);
 
         CensusCommand target = converter.convert(source);
 
@@ -71,5 +77,8 @@ class CensusConverterTest {
         assertEquals(inhabitedRooms, target.getInhabitedRooms());
         assertEquals(filledInBy, target.getFilledInBy());
         assertEquals(totalRooms, target.getTotalRooms());
+        assertEquals(roomsOccupied, target.getRoomsOccupied());
+        assertEquals(inhabitedHouses, target.getInhabitedHouses());
+        assertEquals(uninhabitedHouses, target.getUninhabitedHouses());
     }
 }