From 071752e2568a35804fa80f5f085ba7062963696c Mon Sep 17 00:00:00 2001
From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com>
Date: Sat, 2 May 2026 18:39:08 +0200
Subject: [PATCH] Fix: Fixed "toString" Method Tests In CavePaintingsTest.java,
HuntTest.java, ShamanicRitualTest.java, SustenanceTest.java. Fix: Fixed
"activateEvent" Method Tests In HuntTest.java, SustenanceTest.java. Fix:
Refactor In Sustenance.java.
---
.../Cards/TribeCards/Events/Sustenance.java | 2 +-
.../TribeCards/Events/CavePaintingsTest.java | 2 +-
.../Model/Cards/TribeCards/Events/HuntTest.java | 17 +++++++++++------
.../TribeCards/Events/ShamanicRitualTest.java | 2 +-
.../Cards/TribeCards/Events/SustenanceTest.java | 12 ++++++------
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java
index 164f779..add51ff 100644
--- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java
+++ b/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.
+ * This event is intended to be executed last among event effects.
*
* @param playerList the list of players affected by the event.
* @throws NullPointerException if {@code playerList} or one of its required elements is {@code null}.
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java
index d0c695a..df51011 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java
+++ b/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());
}
}
\ No newline at end of file
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java
index c38d1b0..f3b5cdb 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java
+++ b/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(2, p1.getFoodValue());
+ assertEquals(3*2, p1.getPrestigeValue());
+ assertEquals(1+2, p1.getFoodValue());
assertEquals(3, p2.getPrestigeValue());
assertEquals(1, p2.getFoodValue());
}
@@ -73,20 +73,25 @@ class HuntTest {
ArrayList 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(2, p1.getFoodValue());
+ assertEquals(3*2, p1.getPrestigeValue());
+ 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());
}
}
\ No newline at end of file
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java
index 0b7fd6c..f7be0b1 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java
+++ b/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());
}
}
\ No newline at end of file
diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java
index 7dc452d..2d08763 100644
--- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java
+++ b/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, true).insert(p2);
+ new Hunter(1, false).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());
}
}