Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed characters insert for CavePaintingTest, HuntTest, SustenanceTest

Browse Source
This commit is contained in:
AleandroPagani
2026-04-07 19:38:19 +02:00
parent b63dded777
commit 40933e2e94
3 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintingsTest.java
+6 -6
View File
@@ -33,7 +33,7 @@ class CavePaintingsTest {
ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2)); ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2));
CavePaintings cp1 = new CavePaintings(1, 1, 3, 2); CavePaintings cp1 = new CavePaintings(1, 1, 3, 2);
p2.artists.add(new Artist(1)); new Artist(1).insert(p2);
cp1.activateEvent(players); cp1.activateEvent(players);
assertEquals(-3, p1.getPrestigeValue()); assertEquals(-3, p1.getPrestigeValue());
@@ -55,8 +55,8 @@ class CavePaintingsTest {
assertEquals(-3, p1.getPrestigeValue()); assertEquals(-3, p1.getPrestigeValue());
assertEquals(0, p1.getFoodValue()); assertEquals(0, p1.getFoodValue());
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
cp2.activateEvent(players); cp2.activateEvent(players);
assertEquals(5, p1.getPrestigeValue()); assertEquals(5, p1.getPrestigeValue());
assertEquals(0, p1.getFoodValue()); assertEquals(0, p1.getFoodValue());
@@ -76,7 +76,7 @@ class CavePaintingsTest {
BuildingCard bc1 = new BuildingCard(9,1,5,5); BuildingCard bc1 = new BuildingCard(9,1,5,5);
p1.addFood(5); p1.addFood(5);
bc1.buy(p1); bc1.buy(p1);
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
cp1.activateEvent(players); cp1.activateEvent(players);
assertEquals(2, p1.getPrestigeValue()); assertEquals(2, p1.getPrestigeValue());
@@ -86,8 +86,8 @@ class CavePaintingsTest {
BuildingCard bc2 = new BuildingCard(9,1,5,5); BuildingCard bc2 = new BuildingCard(9,1,5,5);
p1.addFood(5); p1.addFood(5);
bc2.buy(p1); bc2.buy(p1);
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
cp1.activateEvent(players); cp1.activateEvent(players);
assertEquals(8, p1.getPrestigeValue()); assertEquals(8, p1.getPrestigeValue());
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/HuntTest.java
+7 -15
View File
@@ -36,13 +36,9 @@ class HuntTest {
ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2)); ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2));
Hunt h1 = new Hunt(1, 3); Hunt h1 = new Hunt(1, 3);
Hunter hunter1 = new Hunter(1, true); new Hunter(1, true).insert(p1);
Hunter hunter2 = new Hunter(1, false); new Hunter(1, false).insert(p1);
p1.hunters.add(hunter1); new Hunter(1, false).insert(p2);
p1.hunters.add(hunter2);
Hunter hunter3 = new Hunter(1, false);
p2.hunters.add(hunter3);
h1.activateEvent(players); h1.activateEvent(players);
assertEquals(6, p1.getPrestigeValue()); assertEquals(6, p1.getPrestigeValue());
@@ -77,19 +73,15 @@ class HuntTest {
ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2, p3)); ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1, p2, p3));
Hunt h1 = new Hunt(1, 3); Hunt h1 = new Hunt(1, 3);
Hunter hunter1 = new Hunter(1, true); new Hunter(1, true).insert(p1);
Hunter hunter2 = new Hunter(1, false); new Hunter(1, false).insert(p1);
p1.hunters.add(hunter1); new Hunter(1, false).insert(p2);
p1.hunters.add(hunter2);
Hunter hunter3 = new Hunter(1, false);
p2.hunters.add(hunter3);
BuildingCard bc = new BuildingCard(7, 1, 5, 5); BuildingCard bc = new BuildingCard(7, 1, 5, 5);
p2.addFood(5); p2.addFood(5);
bc.buy(p2); bc.buy(p2);
Hunter hunter4 = new Hunter(1, false); new Hunter(1, false).insert(p3);
p3.hunters.add(hunter4);
h1.activateEvent(players); h1.activateEvent(players);
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/SustenanceTest.java
+17 -17
View File
@@ -45,16 +45,16 @@ class SustenanceTest {
ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1,p2)); ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1,p2));
p1.addFood(4); p1.addFood(4);
p1.inventors.add(new Inventor(1, 1)); new Inventor(1, 1).insert(p1);
p1.shamans.add(new Shaman(1, 5)); new Shaman(1, 5).insert(p1);
p1.builders.add(new Builder(1, 5, 5)); new Builder(1, 5, 5).insert(p1);
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
p1.hunters.add(new Hunter(1, true)); new Hunter(1, true).insert(p1);
p1.gatherers.add(new Gatherer(1)); new Gatherer(1).insert(p1);
p2.addFood(1); p2.addFood(1);
p2.artists.add(new Artist(1)); new Artist(1).insert(p2);
p2.hunters.add(new Hunter(1, true)); new Hunter(1, true).insert(p2);
Sustenance s = new Sustenance(1,2); Sustenance s = new Sustenance(1,2);
@@ -73,17 +73,17 @@ class SustenanceTest {
ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1,p2)); ArrayList<Player> players = new ArrayList<>(Arrays.asList(p1,p2));
p1.addFood(5); p1.addFood(5);
p1.inventors.add(new Inventor(1, 1)); new Inventor(1, 1).insert(p1);
p1.shamans.add(new Shaman(1, 5)); new Shaman(1, 5).insert(p1);
p1.builders.add(new Builder(1, 5, 5)); new Builder(1, 5, 5).insert(p1);
p1.artists.add(new Artist(1)); new Artist(1).insert(p1);
p1.hunters.add(new Hunter(1, true)); new Hunter(1, true).insert(p1);
p1.gatherers.add(new Gatherer(1)); new Gatherer(1).insert(p1);
p2.addFood(2); p2.addFood(2);
p2.artists.add(new Artist(1)); new Artist(1).insert(p2);
p2.artists.add(new Artist(1)); new Artist(1).insert(p2);
p2.artists.add(new Artist(1)); new Artist(1).insert(p2);
Building1 bd1 = new Building1(1, 1, 1, CharacterType.SHAMAN); Building1 bd1 = new Building1(1, 1, 1, CharacterType.SHAMAN);