Merge remote-tracking branch 'smasset/master'

elevator-core/src/test/java/elevator/BuildingTest.java

@@ -147,13 +147,11 @@ public class BuildingTest {
 
     @Test
     public void should_throws_exception_if_elevator_goes_up_but_is_already_at_higher_floor() {
-        when(elevator.nextCommand()).thenReturn(UP, UP, UP, UP, UP, UP);
+        when(elevator.nextCommand()).thenAnswer($ -> UP);
         Building building = new Building(elevator, new ConstantMaxNumberOfUsers());
-        building.updateBuildingState();
-        building.updateBuildingState();
-        building.updateBuildingState();
-        building.updateBuildingState();
-        building.updateBuildingState();
+        for (int floor = 0; floor < ElevatorEngine.HIGHER_FLOOR; floor++) {
+            building.updateBuildingState();
+        }
 
         expectedException.expect(ElevatorIsBrokenException.class);
         expectedException.expectMessage("can't go up because current floor is the highest floor");