Tests updated

src/main/java/model/FirefighterBoard.java

@@ -218,26 +218,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
         return modifiedPositions;
     }
 
-    private Set<Position> spreadFire() {
-        Set<Position> newFirePositions = new HashSet<>();
-        for (Position firePosition : firePositions) {
-            newFirePositions.addAll(neighbors.get(firePosition));  // Spread fire to neighbors
-        }
-        return newFirePositions;
-    }
-
-    private void extinguishNearbyFire(List<Position> modifiedPositions) {
-        for (Position firefighterPosition : firefighterPositions) {
-            List<Position> nearbyFires = neighbors.get(firefighterPosition);
-            for (Position neighbor : nearbyFires) {
-                if (firePositions.contains(neighbor)) {
-                    firePositions.remove(neighbor);  // Extinguish fire in neighboring positions
-                    modifiedPositions.add(neighbor);
-                }
-            }
-        }
-    }
-
     public List<Pair<Position, ModelElement>> getUpdatedElements() {
         List<Pair<Position, ModelElement>> updatedElements = new ArrayList<>();
 

src/main/java/view/FirefighterGrid.java

@@ -75,4 +75,12 @@ public class FirefighterGrid extends Canvas {
             gc.strokeLine(0, row * boxHeight, getWidth(), row * boxHeight);  // Horizontal lines
         }
     }
+
+    public int getColumns() {
+        return columns;
+    }
+
+    public int getRows() {
+        return rows;
+    }
 }

src/main/java/view/ViewElement.java

@@ -3,7 +3,7 @@ package view;
 import javafx.scene.paint.Color;
 
 public enum ViewElement {
- ROAD(Color.GRAY), FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE),CLAUD(Color.YELLOW);
+ ROAD(Color.GRAY), FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE),CLOUD(Color.YELLOW),MOUTAIN(Color.GREEN),ROCKS(Color.LIGHTSKYBLUE);
 
   final Color color;
 

src/test/java/model/FirefighterBoardTest.java

@@ -10,17 +10,17 @@ import static org.assertj.core.api.Assertions.*;
 public class FirefighterBoardTest {
   @Test
   void testColumnCount(){
-    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
     assertThat(board.columnCount()).isEqualTo(20);
   }
   @Test
   void testRowCount(){
-    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
     assertThat(board.rowCount()).isEqualTo(10);
   }
   @Test
   void testStepNumber(){
-    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
     for(int index = 0; index < 10; index++){
       assertThat(board.stepNumber()).isEqualTo(index);
       board.updateToNextGeneration();
@@ -29,7 +29,7 @@ public class FirefighterBoardTest {
   }
   @Test
   void testGetState_afterSet(){
-    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0);
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0,0,0,0,0);
     Position position = new Position(1,2);
     assertThat(board.getState(position)).isEmpty();
     board.setState(List.of(ModelElement.FIRE), position);

src/test/java/view/FirefighterGridTest.java

@@ -7,14 +7,14 @@ 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);
+    FirefighterGrid grid = new FirefighterGrid();
+    grid.initialize(20,10,10,10,null);
+    assertThat(grid.getColumns()).isEqualTo(20);
   }
   @Test
   void testRowCount(){
-    Grid<ViewElement> grid = new FirefighterGrid();
-    grid.setDimensions(20,10,10,10);
-    assertThat(grid.rowCount()).isEqualTo(10);
+    FirefighterGrid grid = new FirefighterGrid();
+    grid.initialize(20,10,10,10,null);
+    assertThat(grid.getRows()).isEqualTo(10);
   }
 }