Rooms Occupied, Inhabited Houses, Uninhabited Houses to census command

src/main/java/scot/carricksoftware/grants/commands/census/CensusCommand.java

@@ -48,4 +48,16 @@ public interface CensusCommand {
     String getTotalRooms();
 
     void setTotalRooms(String totalRooms);
+
+    String getRoomsOccupied();
+
+    void setRoomsOccupied(String roomsOccupied);
+
+    String getInhabitedHouses();
+
+    void setInhabitedHouses(String inhabitedHouses);
+
+    String getUninhabitedHouses();
+
+    void setUninhabitedHouses(String uninhabitedHouses);
 }

src/main/java/scot/carricksoftware/grants/commands/census/CensusCommandImpl.java

@@ -33,6 +33,12 @@ public class CensusCommandImpl implements CensusCommand {
 
     private String totalRooms;
 
+    private String roomsOccupied;
+
+    private String inhabitedHouses;
+
+    private String uninhabitedHouses;
+
     @Override
     public Long getId() {
         return id;
@@ -122,4 +128,34 @@ public class CensusCommandImpl implements CensusCommand {
     public void setTotalRooms(String totalRooms) {
         this.totalRooms = totalRooms;
     }
+
+    @Override
+    public String getRoomsOccupied() {
+        return roomsOccupied;
+    }
+
+    @Override
+    public void setRoomsOccupied(String roomsOccupied) {
+        this.roomsOccupied = roomsOccupied;
+    }
+
+    @Override
+    public String getInhabitedHouses() {
+        return inhabitedHouses;
+    }
+
+    @Override
+    public void setInhabitedHouses(String inhabitedHouses) {
+        this.inhabitedHouses = inhabitedHouses;
+    }
+
+    @Override
+    public String getUninhabitedHouses() {
+        return uninhabitedHouses;
+    }
+
+    @Override
+    public void setUninhabitedHouses(String uninhabitedHouses) {
+        this.uninhabitedHouses = uninhabitedHouses;
+    }
 }

src/main/java/scot/carricksoftware/grants/repositories/people/PersonRepository.java

@@ -22,5 +22,6 @@ public interface PersonRepository extends PagingAndSortingRepository<Person, Lon
 
     Optional<Person> findById(Long id);
 
+    @SuppressWarnings("unused")
     Iterable<Person> findAll();
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandTest.java → src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandPartOneTest.java

@@ -18,7 +18,7 @@ import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRan
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensusEntry;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
-class CensusCommandTest {
+class CensusCommandPartOneTest {
 
     private CensusCommand command;
 
@@ -65,41 +65,6 @@ class CensusCommandTest {
         assertEquals(string, command.getInhabitedRooms());
     }
 
-    @Test
-    public void getRoomsWithWidowsTest() {
-        assertNull(command.getRoomsWithWindows());
-    }
-
-    @Test
-    public void setRoomsWithWidowsTest() {
-        String string = GetRandomString();
-        command.setRoomsWithWindows(string);
-        assertEquals(string, command.getRoomsWithWindows());
-    }
-
-    @Test
-    public void getFilledInByTest() {
-        assertNull(command.getFilledInBy());
-    }
-
-    @Test
-    public void setFilledInByTest() {
-        String filledInBy = GetRandomString();
-        command.setFilledInBy(filledInBy);
-        assertEquals(filledInBy, command.getFilledInBy());
-    }
-
-    @Test
-    public void getTotalRoomsTest() {
-        assertNull(command.getTotalRooms());
-    }
-
-    @Test
-    public void setTotalRoomsTest() {
-        String totalRooms = GetRandomString();
-        command.setTotalRooms(totalRooms);
-        assertEquals(totalRooms, command.getTotalRooms());
-    }
 
 
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandPartTwoTest.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 02:05. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.commands.census;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+
+class CensusCommandPartTwoTest {
+
+    private CensusCommand command;
+
+    @BeforeEach
+    void setUp() {
+        command = new CensusCommandImpl();
+    }
+
+    @Test
+    public void getRoomsWithWidowsTest() {
+        assertNull(command.getRoomsWithWindows());
+    }
+
+    @Test
+    public void setRoomsWithWidowsTest() {
+        String string = GetRandomString();
+        command.setRoomsWithWindows(string);
+        assertEquals(string, command.getRoomsWithWindows());
+    }
+
+    @Test
+    public void getFilledInByTest() {
+        assertNull(command.getFilledInBy());
+    }
+
+    @Test
+    public void setFilledInByTest() {
+        String filledInBy = GetRandomString();
+        command.setFilledInBy(filledInBy);
+        assertEquals(filledInBy, command.getFilledInBy());
+    }
+
+    @Test
+    public void getTotalRoomsTest() {
+        assertNull(command.getTotalRooms());
+    }
+
+    @Test
+    public void setTotalRoomsTest() {
+        String totalRooms = GetRandomString();
+        command.setTotalRooms(totalRooms);
+        assertEquals(totalRooms, command.getTotalRooms());
+    }
+
+    @Test
+    public void getRoomsOccupiedTest() {
+        assertNull(command.getRoomsOccupied());
+    }
+
+    @Test
+    public void setRoomOccupiedTest() {
+        String roomsOccupied = GetRandomString();
+        command.setRoomsOccupied(roomsOccupied);
+        assertEquals(roomsOccupied, command.getRoomsOccupied());
+    }
+
+    @Test
+    public void getInhabitedHousesTest() {
+        assertNull(command.getInhabitedRooms());
+    }
+
+    @Test
+    public void setInhabitedHousesTest() {
+        String inhabitedHouses = GetRandomString();
+        command.setInhabitedHouses(inhabitedHouses);
+        assertEquals(inhabitedHouses, command.getInhabitedHouses());
+    }
+
+    @Test
+    public void getUninhabitedHousesTest() {
+        assertNull(command.getUninhabitedHouses());
+    }
+
+    @Test
+    public void setUninhabitedHousesTest() {
+        String uninhabitedHouses = GetRandomString();
+        command.setUninhabitedHouses(uninhabitedHouses);
+        assertEquals(uninhabitedHouses, command.getUninhabitedHouses());
+    }
+
+}