Merge pull request #114 from rubenpirreram/tests-fix

GameTest Fixed

src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java

@@ -1301,31 +1301,6 @@ class GameTest {
         );
     }
 
-    @Test
-    void cardListsShouldReturnCopiesOfLists() {
-        Game game = new Game(3);
-
-        int upperTribeSize = game.getUpperListTribeCards().size();
-        int lowerTribeSize = game.getLowerListTribeCards().size();
-        int upperBuildingSize = game.getUpperListBuilding().size();
-        int lowerBuildingSize = game.getLowerListBuilding().size();
-
-        List<TribeCard> upperTribe = game.getUpperListTribeCards();
-        List<TribeCard> lowerTribe = game.getLowerListTribeCards();
-        List<BuildingCard> upperBuilding = game.getUpperListBuilding();
-        List<BuildingCard> lowerBuilding = game.getLowerListBuilding();
-
-        upperTribe.clear();
-        lowerTribe.clear();
-        upperBuilding.clear();
-        lowerBuilding.clear();
-
-        assertEquals(upperTribeSize, game.getUpperListTribeCards().size());
-        assertEquals(lowerTribeSize, game.getLowerListTribeCards().size());
-        assertEquals(upperBuildingSize, game.getUpperListBuilding().size());
-        assertEquals(lowerBuildingSize, game.getLowerListBuilding().size());
-    }
-
     @Test
     void getPlayersShouldReturnAddedPlayers() {
         Game game = new Game(3);
@@ -1522,35 +1497,6 @@ class GameTest {
         fail("The test never reached a lower building draw state.");
     }
 
-    @Test
-    void cardListsShouldReturnClonedCards() {
-        Game game = new Game(3);
-
-        List<TribeCard> firstUpperTribeCall = game.getUpperListTribeCards();
-        List<TribeCard> secondUpperTribeCall = game.getUpperListTribeCards();
-
-        assertFalse(firstUpperTribeCall.isEmpty());
-        assertFalse(secondUpperTribeCall.isEmpty());
-
-        assertNotSame(firstUpperTribeCall.get(0), secondUpperTribeCall.get(0));
-
-        List<TribeCard> firstLowerTribeCall = game.getLowerListTribeCards();
-        List<TribeCard> secondLowerTribeCall = game.getLowerListTribeCards();
-
-        assertFalse(firstLowerTribeCall.isEmpty());
-        assertFalse(secondLowerTribeCall.isEmpty());
-
-        assertNotSame(firstLowerTribeCall.get(0), secondLowerTribeCall.get(0));
-
-        List<BuildingCard> firstUpperBuildingCall = game.getUpperListBuilding();
-        List<BuildingCard> secondUpperBuildingCall = game.getUpperListBuilding();
-
-        assertFalse(firstUpperBuildingCall.isEmpty());
-        assertFalse(secondUpperBuildingCall.isEmpty());
-
-        assertNotSame(firstUpperBuildingCall.get(0), secondUpperBuildingCall.get(0));
-    }
-
     @Test
     void initShouldAssignInitialFoodAccordingToOrderPosition() {
         Game game = new Game(5);
@@ -1590,6 +1536,24 @@ class GameTest {
 
         assertTrue(game.SlotChoiceByIndex(current, 0));
 
+        for (int i = 1; i < game.getNPlayers(); i++) {
+            Player temp = game.getCurrentState().getCurrentPlayer();
+
+            assertTrue(game.SlotChoiceByIndex(temp, i));
+
+            assertTrue(
+                    game.getSlotMap().values().stream()
+                            .anyMatch(player -> player != null
+                                    && player.getUserName().equals(temp.getUserName())),
+                    "The selected player should be present in the slot map."
+            );
+        }
+        assertEquals(foodBefore + 6, current.getFoodValue());
+        resolveAllMandatoryActions(game);
+        foodBefore = current.getFoodValue();
+        
+        assertTrue(game.SlotChoiceByIndex(current, 0));
+
         for (int i = 1; i < game.getNPlayers(); i++) {
             Player temp = game.getCurrentState().getCurrentPlayer();