Fix: DecksCreator, Board, Slot, BoardTest

src/main/java/it/polimi/ingsw/gc14/Model/DecksCreator.java

@@ -22,9 +22,9 @@ public class DecksCreator {
     public static List<TribeCard> loadTribeDeckByEra(int era) throws IllegalArgumentException
     {
         return switch (era) {
-            case 1 -> loadTribeDeck("/Cards/cards_era1.json");
+            case 1 -> loadTribeDeck("/Cards/tribe_era1.json");
-            case 2 -> loadTribeDeck("/Cards/cards_era2.json");
+            case 2 -> loadTribeDeck("/Cards/tribe_era2.json");
-            case 3 -> loadTribeDeck("/Cards/cards_era3.json");
+            case 3 -> loadTribeDeck("/Cards/tribe_era3.json");
             default -> throw new IllegalArgumentException();
         };
     }

src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java

@@ -25,7 +25,7 @@ public class Board {
     private List<BuildingCard> lowerListBuilding;
     private int nTotem;
     private int era;
-    public List<Slot> getSlotList(){//Da chiedere
+    public List<Slot> getSlotList(){
         return slotList.stream().map(x->new Slot(x.getSlotId())).collect(Collectors.toList());
     }
 
@@ -66,11 +66,12 @@ public class Board {
 
     private Queue<TribeCard>  getTribeDeck(int nPlayers) {
         ArrayList<TribeCard> era1= DecksCreator.loadTribeDeckByEra(1).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
-        List<TribeCard> era2= DecksCreator.loadTribeDeckByEra(2).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<TribeCard> era2= DecksCreator.loadTribeDeckByEra(2).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
-        List<TribeCard> era3= DecksCreator.loadTribeDeckByEra(3).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
+        ArrayList<TribeCard> era3= DecksCreator.loadTribeDeckByEra(3).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
         Collections.shuffle(era1);
         Collections.shuffle(era2);
         Collections.shuffle(era3);
+
         Queue<TribeCard> tribeDeck_temp=new LinkedList<>();
         tribeDeck_temp.addAll(era1);
         tribeDeck_temp.addAll(era2);
@@ -96,15 +97,11 @@ public class Board {
     public boolean removeLowerTribeCard(TribeCard tribeCard) {
         return upperListTribe.remove(tribeCard);
     }
-    public boolean containsUpperBuildingCard(BuildingCard buildingCard) {
+    public boolean containsUpperBuildingCard(BuildingCard buildingCard) {return  upperListTribe.contains(buildingCard);}
-        return  upperListTribe.contains(buildingCard);
-    }
     public boolean removeUpperBuildingCard(BuildingCard buildingCard) {
         return upperListTribe.remove(buildingCard);
     }
-    public boolean containsLowerBuildingCard(BuildingCard buildingCard) {
+    public boolean containsLowerBuildingCard(BuildingCard buildingCard) {return  upperListTribe.contains(buildingCard);}
-        return  upperListTribe.contains(buildingCard);
-    }
     public boolean removeLowerBuildingCard(BuildingCard buildingCard) {
         return upperListTribe.remove(buildingCard);
     }

src/main/java/it/polimi/ingsw/gc14/Model/Slot.java

@@ -77,6 +77,11 @@ public class Slot {
                 throw new IllegalArgumentException();
         }
     }
+
+    @Override
+    public String toString() {
+        return ("SlotID: "+this.getSlotId()+"\nNUpper: "+this.getNUpper()+"\nNLower: "+this.getNLower()+"\nFood: "+this.getFood()+"\nNMinPlayer: "+this.getNMinPlayer()+"\n");
+    }
     // End Constructors
 
     // Functions

src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java

@@ -0,0 +1,54 @@
+package it.polimi.ingsw.gc14.Model.GamePackage;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class BoardTest {
+
+    @Test
+    void getSlotList() {
+        //Board board = new Board(3);
+        //assertEquals("Ciao", board.getSlotList().toString());
+    }
+
+    @Test
+    void getPendingEvents() {
+    }
+
+    @Test
+    void containsUpperTribeCard() {
+    }
+
+    @Test
+    void removeUpperTribeCard() {
+    }
+
+    @Test
+    void containsLowerTribeCard() {
+    }
+
+    @Test
+    void removeLowerTribeCard() {
+    }
+
+    @Test
+    void containsUpperBuildingCard() {
+    }
+
+    @Test
+    void removeUpperBuildingCard() {
+    }
+
+    @Test
+    void containsLowerBuildingCard() {
+    }
+
+    @Test
+    void removeLowerBuildingCard() {
+    }
+
+    @Test
+    void nextRound() {
+    }
+}