diff --git a/src/main/java/model/Cloud.java b/src/main/java/model/Cloud.java index 5546698d631cecadb401478149904917bd673a62..d13834a5d62f7778ce793ff7a9158d69aac45c54 100644 --- a/src/main/java/model/Cloud.java +++ b/src/main/java/model/Cloud.java @@ -27,3 +27,4 @@ public class Cloud implements Elements<List<Position>> { return initialCloudCount; } } + diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java deleted file mode 100644 index 25cc8dbca8acea698879df68a5006a179f281ecc..0000000000000000000000000000000000000000 --- a/src/test/java/model/FirefighterBoardTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package model; - -import org.junit.jupiter.api.Test; -import util.Position; - -import java.util.List; - -import static org.assertj.core.api.Assertions.*; - -public class FirefighterBoardTest { - @Test - void testColumnCount(){ - Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3); - assertThat(board.columnCount()).isEqualTo(20); - } - @Test - void testRowCount(){ - Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3); - assertThat(board.rowCount()).isEqualTo(10); - } - @Test - void testStepNumber(){ - Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3); - for(int index = 0; index < 10; index++){ - assertThat(board.stepNumber()).isEqualTo(index); - board.updateToNextGeneration(); - } - assertThat(board.stepNumber()).isEqualTo(10); - } - @Test - void testGetState_afterSet(){ - Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0); - Position position = new Position(1,2); - assertThat(board.getState(position)).isEmpty(); - board.setState(List.of(ModelElement.FIRE), position); - assertThat(board.getState(position)).containsExactly(ModelElement.FIRE); - } - -} diff --git a/src/test/java/view/FirefighterGridTest.java b/src/test/java/view/FirefighterGridTest.java deleted file mode 100644 index 4b45ebdca3b936b42c2b322b1294488341d180bb..0000000000000000000000000000000000000000 --- a/src/test/java/view/FirefighterGridTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package view; - -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -public class FirefighterGridTest { - @Test - void testColumnCount(){ - Grid<ViewElement> grid = new FirefighterGrid(); - grid.setDimensions(20,10,10,10); - assertThat(grid.columnCount()).isEqualTo(20); - } - @Test - void testRowCount(){ - Grid<ViewElement> grid = new FirefighterGrid(); - grid.setDimensions(20,10,10,10); - assertThat(grid.rowCount()).isEqualTo(10); - } -}