diff --git a/src/main/java/l_1/House.java b/src/main/java/l_1/House.java index 2bbcc0a60df76d6995966e9f73f990d0f8c97e24..e086f98505d2b4c51ebd71afe143d6d1585c3882 100644 --- a/src/main/java/l_1/House.java +++ b/src/main/java/l_1/House.java @@ -32,8 +32,11 @@ public class House { public double getTotalArea() { double total = 0.0; - // missing the loop.... - + + for (Room room: this.rooms) { + total += room.getArea(); + } + return total; } } diff --git a/src/test/java/l_1/HouseTest.java b/src/test/java/l_1/HouseTest.java index 1dd72eb8f801fafe6d13b41ab8facda141d8eaab..b9bb0edb7db4d7019c1a856ad27b7ba72785ced8 100644 --- a/src/test/java/l_1/HouseTest.java +++ b/src/test/java/l_1/HouseTest.java @@ -27,10 +27,12 @@ class HouseTest { Lounge lounge1 = new Lounge(10.0); Lounge lounge2 = new Lounge(15.0); DiningRoom dining1 = new DiningRoom(16.0); + Bedroom bedroom = new Bedroom(10); house.addRoom(lounge1); house.addRoom(lounge2); house.addRoom(dining1); + house.addRoom(bedroom); } /** @@ -38,7 +40,7 @@ class HouseTest { */ @Test void testRequirement3() { - assertEquals(house.howManyRooms(), 3); + assertEquals(house.howManyRooms(), 4); } /** @@ -46,7 +48,7 @@ class HouseTest { */; @Test void testRequirement4() { - assertEquals(house.getTotalArea(), 41.0); + assertEquals(house.getTotalArea(), 51.0); } @AfterEach