From 6d5a52f2a43768001d0dd9a2dd0af617b14cdac9 Mon Sep 17 00:00:00 2001
From: rubenpirreram <rubenpirreram@gmail.com>
Date: Sat, 2 May 2026 17:31:46 +0200
Subject: [PATCH] Fix: BoardTest

---
 .../gc14/Model/GamePackage/BoardTest.java     | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java
index ce03ea4..dd9db49 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java
+++ b/src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java
@@ -125,11 +125,11 @@ class BoardTest {
     void removeUpperTribeCard() {
         Board bd = new Board(3);
 
-        List<TribeCard> before = bd.upperListTribe;
-        TribeCard cardToRemove = before.get(2);
+        List<TribeCard> before = new ArrayList<>( bd.upperListTribe);
+        TribeCard cardToRemove = before.get(0);
 
-        before.remove(2);
-        bd.removeUpperTribeCard(cardToRemove);
+        assertEquals(cardToRemove, before.remove(0));
+        assertTrue( bd.removeUpperTribeCard(cardToRemove));
 
         assertEquals(before, bd.upperListTribe);
     }
@@ -139,11 +139,11 @@ class BoardTest {
     void removeLowerTribeCard() {
         Board bd = new Board(3);
 
-        List<TribeCard> before = bd.lowerListTribe;
-        TribeCard cardToRemove = before.get(2);
+        List<TribeCard> before = new ArrayList<>(bd.lowerListTribe);
+        TribeCard cardToRemove = before.get(0);
 
-        before.remove(2);
-        bd.removeLowerTribeCard(cardToRemove);
+        assertEquals(cardToRemove, before.remove(0));
+        assertTrue( bd.removeLowerTribeCard(cardToRemove));
 
         assertEquals(before, bd.lowerListTribe);
     }
@@ -153,11 +153,11 @@ class BoardTest {
     void removeUpperBuildingCard() {
         Board bd = new Board(3);
 
-        List<BuildingCard> before = bd.upperListBuilding;
+        List<BuildingCard> before = new ArrayList<>(bd.upperListBuilding);
         BuildingCard cardToRemove = before.get(0);
 
-        before.remove(0);
-        bd.removeUpperBuildingCard(cardToRemove);
+        assertEquals(cardToRemove, before.remove(0));
+        assertTrue( bd.removeUpperBuildingCard(cardToRemove));
 
         assertEquals(before, bd.upperListBuilding);
     }
@@ -171,12 +171,10 @@ class BoardTest {
             bd.nextRound();    // Skip to era 2
         }
 
-        List<BuildingCard> before = bd.lowerListBuilding;
+        List<BuildingCard> before = new ArrayList<>( bd.lowerListBuilding);
         BuildingCard cardToRemove = before.get(0);
-
-        before.remove(0);
-        bd.removeLowerBuildingCard(cardToRemove);
-
+        assertEquals(cardToRemove, before.remove(0));
+        assertTrue(bd.removeLowerBuildingCard(cardToRemove));
         assertEquals(before, bd.lowerListBuilding);
     }