Merge pull request #71

tests-fix

src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java

@@ -43,7 +43,7 @@ public class Sustenance extends EventCard {
      * If the resulting Food debt is positive, the player must pay it with available Food.
      * If the player does not have enough Food, all remaining Food is removed and the player
      * loses Prestige equal to the unpaid Food debt multiplied by {@code PrestigeDebt}.
-     * This event is intended to be executed last among event effects.
+     * <b>This event is intended to be executed last among event effects.</b>
      *
      * @param playerList the list of players affected by the event.
      * @throws NullPointerException if {@code playerList} or one of its required elements is {@code null}.

src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/InventorTest.java

@@ -24,9 +24,8 @@ class InventorTest {
         String s = i.toString();
 
         assertNotNull(s);
-        assertTrue(s.contains(CharacterType.INVENTOR.toString()));
+        assertFalse(s.contains(CharacterType.INVENTOR.toString()));
-        assertTrue(s.contains("Symbol:"));
+        assertEquals("⎕:" + " I_ID:" + i.Icon(), i.toString());
-        assertTrue(s.contains("5"));
     }
 
     @Test

src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/ShamanTest.java

@@ -21,8 +21,8 @@ class ShamanTest {
         String str = s.toString();
 
         assertNotNull(str);
-        assertTrue(str.contains(CharacterType.SHAMAN.toString()));
+        assertFalse(str.contains(CharacterType.SHAMAN.toString()));
-        assertTrue(str.contains("Icon: 4"));
+        assertEquals("⎕: *:" + s.getIcon(), str);
     }
 
     @Test

src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java

@@ -111,6 +111,6 @@ class CavePaintingsTest {
     void toStringTest() {
         CavePaintings cv1 = new CavePaintings(1, 1,1,1);
 
-        assertEquals("Era:1, CAVE_PAINTINGS", cv1.toString());
+        assertEquals("⎕:(Event)CAVE_PAINTINGS", cv1.toString());
     }
 }

src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java

@@ -41,8 +41,8 @@ class HuntTest {
         new Hunter(1, false).insert(p2);
 
         h1.activateEvent(players);
-        assertEquals(6, p1.getPrestigeValue());
+        assertEquals(3*2, p1.getPrestigeValue());
-        assertEquals(2, p1.getFoodValue());
+        assertEquals(1+2, p1.getFoodValue());
         assertEquals(3, p2.getPrestigeValue());
         assertEquals(1, p2.getFoodValue());
     }
@@ -73,20 +73,25 @@ class HuntTest {
         ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2, p3));
         Hunt h1 = new Hunt(1, 3);
 
+        assertEquals(0, p1.getFoodValue());
+
         new Hunter(1, true).insert(p1);
         new Hunter(1, false).insert(p1);
         new Hunter(1, false).insert(p2);
 
         BuildingCard bc = new BuildingCard(7, 1, 5, 5);
         p2.addFood(5);
+
         bc.buy(p2);
+        assertEquals(5 - bc.getPrice(), p2.getFoodValue());
+        assertEquals(0, p2.getFoodValue());
 
         new Hunter(1, false).insert(p3);
-
+        assertEquals(0, p3.getFoodValue());
 
         h1.activateEvent(players);
-        assertEquals(6, p1.getPrestigeValue());
+        assertEquals(3*2, p1.getPrestigeValue());
-        assertEquals(2, p1.getFoodValue());
+        assertEquals(1 + 2, p1.getFoodValue());
         assertEquals(4, p2.getPrestigeValue());
         assertEquals(2, p2.getFoodValue());
         assertEquals(3, p3.getPrestigeValue());
@@ -113,6 +118,6 @@ class HuntTest {
     void toStringTest() {
         Hunt h1 = new Hunt(1, 3);
 
-        assertEquals("Era:1, HUNT", h1.toString());
+        assertEquals("⎕:(Event)HUNT", h1.toString());
     }
 }

src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java

@@ -212,6 +212,6 @@ class ShamanicRitualTest {
     void toStringTest() {
         ShamanicRitual sr1 = new ShamanicRitual(1, 5,2);
 
-        assertEquals("Era:1, SHAMANIC_RITUAL", sr1.toString());
+        assertEquals("⎕:(Event)SHAMANIC_RITUAL", sr1.toString());
     }
 }

src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java

@@ -49,13 +49,13 @@ class SustenanceTest {
         new Shaman(1, 5).insert(p1);
         new Builder(1, 5, 5).insert(p1);
         new Artist(1).insert(p1);
-        new Hunter(1, true).insert(p1);
+        new Hunter(1, false).insert(p1);
         new Gatherer(1).insert(p1);
 
         p2.addFood(1);
         new Artist(1).insert(p2);
-        new Hunter(1, true).insert(p2);
+        new Hunter(1, false).insert(p2);
-        new Hunter(1, true).insert(p2);
+        new Hunter(1, false).insert(p2);
 
 
 
@@ -79,7 +79,7 @@ class SustenanceTest {
         new Shaman(1, 5).insert(p1);
         new Builder(1, 5, 5).insert(p1);
         new Artist(1).insert(p1);
-        new Hunter(1, true).insert(p1);
+        new Hunter(1, false).insert(p1);
         new Gatherer(1).insert(p1);
 
         p2.addFood(2);
@@ -96,7 +96,7 @@ class SustenanceTest {
 
         Sustenance s = new Sustenance(1,2);
         s.activateEvent(players);
-        assertEquals(2, p1.getFoodValue());
+        assertEquals(3, p1.getFoodValue());
         assertEquals(1, p2.getFoodValue());
         assertEquals(0, p1.getPrestigeValue());
         assertEquals(0, p2.getPrestigeValue());
@@ -122,7 +122,7 @@ class SustenanceTest {
     void toStringTest() {
         Sustenance s1 = new Sustenance(1, 5);
 
-        assertEquals("Era:1, SUSTENANCE", s1.toString());
+        assertEquals("⎕:(Event)SUSTENANCE", s1.toString());
     }
 }
 

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

@@ -359,9 +359,6 @@ class GameTest {
         }
 
         assertNotEquals(thirdPlayer, game.getCurrentState().getCurrentPlayer());
-
-        System.out.println(game);
-
     }
 
     private void drawTribeTest(HashMap<CharacterType, Integer> nCardsByType,

src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order2Test.java

@@ -165,6 +165,5 @@ class Order2Test {
         order.push(p2);
         order.push(p1);
         order.pull().getUserName();
-        System.out.println(order);
     }
 }

src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order3Test.java

@@ -195,11 +195,9 @@ class Order3Test {
         userPulled=order.pull().getUserName();
         userPulled=order.pull().getUserName();
 
-        System.out.println(values);
         order.push(p1);
         order.push(p2);
         values =(ArrayList<OrderPlayer>)field.get(order);
-        System.out.println(order);
 //        assertEquals("TURN ORDER\n" +
 //                "╔════════════════════════════════════╦════════════════════════════════════╦════════════════════════════════════╗\n" +
 //                "║ 0.                                 ║ 1. "+values.get(1).getUserName() +"║ 2. "+values.get(2).getUserName()+"║\n" +

src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order4Test.java

@@ -280,7 +280,6 @@ class Order4Test {
         Player p4 = new Player("wPIshOThiOpRRnIBFfM89s2$@q$9FGbz");
         Order4 order = new Order4(new ArrayList<>(Arrays.asList(p1, p2,p3,p4)));
         String userPulled=order.pull().getUserName();
-        System.out.println(order);
 
     }
 }

src/test/java/it/polimi/ingsw/gc14/Model/Orders/Order5Test.java

@@ -381,7 +381,6 @@ class Order5Test {
         order.pull();
         order.pull();
         order.push(p1);
-        System.out.println(order);
 
     }
 }

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

@@ -220,7 +220,6 @@ class PlayerTest {
         p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR));
         p.buildingCards.add(new Building1(2, 5, 5, CharacterType.SHAMAN));
         p.buildingCards.add(new Building11(1, 5, 7, CharacterType.ARTIST , 3));
-        System.out.println(p.toString());
         assertEquals(""+
                 "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗\n" +
                 "║ test_usr                                                                                                                            ║\n" +

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

@@ -46,7 +46,6 @@ class SlotTest {
         assertEquals(0, s.getNLower());
         assertEquals(0, s.getNUpper());
         assertEquals(5, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());
     }
 
@@ -60,7 +59,6 @@ class SlotTest {
         assertEquals(1, s.getNLower());
         assertEquals(0, s.getNUpper());
         assertEquals(0, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());
     }
 
@@ -74,7 +72,6 @@ class SlotTest {
         assertEquals(0, s.getNLower());
         assertEquals(1, s.getNUpper());
         assertEquals(0, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());    }
 
     @Test
@@ -87,7 +84,6 @@ class SlotTest {
         assertEquals(2, s.getNLower());
         assertEquals(0, s.getNUpper());
         assertEquals(3, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());
     }
 
@@ -101,7 +97,6 @@ class SlotTest {
         assertEquals(1, s.getNLower());
         assertEquals(1, s.getNUpper());
         assertEquals(0, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());
     }
 
@@ -115,7 +110,6 @@ class SlotTest {
         assertEquals(0, s.getNLower());
         assertEquals(2, s.getNUpper());
         assertEquals(0, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());
     }
 
@@ -129,7 +123,6 @@ class SlotTest {
         assertEquals(1, s.getNLower());
         assertEquals(2, s.getNUpper());
         assertEquals(4, s.getNMinPlayer());
-        System.out.println(s);
         assertEquals("SlotID: "+slotID+"\nNUpper: "+s.getNUpper()+"\nNLower: "+s.getNLower()+"\nFood: "+s.getFood()+"\n", s.toString());
     }
 }