From 40933e2e945bd4246cc9e12e5a17cd0756d55919 Mon Sep 17 00:00:00 2001 From: AleandroPagani Date: Tue, 7 Apr 2026 19:38:19 +0200 Subject: [PATCH] Changed characters insert for CavePaintingTest, HuntTest, SustenanceTest --- .../TribeCards/Events/CavePaintingsTest.java | 12 +++---- .../Cards/TribeCards/Events/HuntTest.java | 22 ++++-------- .../TribeCards/Events/SustenanceTest.java | 34 +++++++++---------- 3 files changed, 30 insertions(+), 38 deletions(-) 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 95e48b5..f8b1113 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 @@ -33,7 +33,7 @@ class CavePaintingsTest { ArrayList players = new ArrayList<>(Arrays.asList(p1, p2)); CavePaintings cp1 = new CavePaintings(1, 1, 3, 2); - p2.artists.add(new Artist(1)); + new Artist(1).insert(p2); cp1.activateEvent(players); assertEquals(-3, p1.getPrestigeValue()); @@ -55,8 +55,8 @@ class CavePaintingsTest { assertEquals(-3, p1.getPrestigeValue()); assertEquals(0, p1.getFoodValue()); - p1.artists.add(new Artist(1)); - p1.artists.add(new Artist(1)); + new Artist(1).insert(p1); + new Artist(1).insert(p1); cp2.activateEvent(players); assertEquals(5, p1.getPrestigeValue()); assertEquals(0, p1.getFoodValue()); @@ -76,7 +76,7 @@ class CavePaintingsTest { BuildingCard bc1 = new BuildingCard(9,1,5,5); p1.addFood(5); bc1.buy(p1); - p1.artists.add(new Artist(1)); + new Artist(1).insert(p1); cp1.activateEvent(players); assertEquals(2, p1.getPrestigeValue()); @@ -86,8 +86,8 @@ class CavePaintingsTest { BuildingCard bc2 = new BuildingCard(9,1,5,5); p1.addFood(5); bc2.buy(p1); - p1.artists.add(new Artist(1)); - p1.artists.add(new Artist(1)); + new Artist(1).insert(p1); + new Artist(1).insert(p1); cp1.activateEvent(players); assertEquals(8, p1.getPrestigeValue()); 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 ff8d912..3869b08 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 @@ -36,13 +36,9 @@ class HuntTest { ArrayList players = new ArrayList<>(Arrays.asList(p1, p2)); Hunt h1 = new Hunt(1, 3); - Hunter hunter1 = new Hunter(1, true); - Hunter hunter2 = new Hunter(1, false); - p1.hunters.add(hunter1); - p1.hunters.add(hunter2); - - Hunter hunter3 = new Hunter(1, false); - p2.hunters.add(hunter3); + new Hunter(1, true).insert(p1); + new Hunter(1, false).insert(p1); + new Hunter(1, false).insert(p2); h1.activateEvent(players); assertEquals(6, p1.getPrestigeValue()); @@ -77,19 +73,15 @@ class HuntTest { ArrayList players = new ArrayList<>(Arrays.asList(p1, p2, p3)); Hunt h1 = new Hunt(1, 3); - Hunter hunter1 = new Hunter(1, true); - Hunter hunter2 = new Hunter(1, false); - p1.hunters.add(hunter1); - p1.hunters.add(hunter2); + new Hunter(1, true).insert(p1); + new Hunter(1, false).insert(p1); + new Hunter(1, false).insert(p2); - Hunter hunter3 = new Hunter(1, false); - p2.hunters.add(hunter3); BuildingCard bc = new BuildingCard(7, 1, 5, 5); p2.addFood(5); bc.buy(p2); - Hunter hunter4 = new Hunter(1, false); - p3.hunters.add(hunter4); + new Hunter(1, false).insert(p3); h1.activateEvent(players); 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 50c077f..4e3b950 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 @@ -45,16 +45,16 @@ class SustenanceTest { ArrayList players = new ArrayList<>(Arrays.asList(p1,p2)); p1.addFood(4); - p1.inventors.add(new Inventor(1, 1)); - p1.shamans.add(new Shaman(1, 5)); - p1.builders.add(new Builder(1, 5, 5)); - p1.artists.add(new Artist(1)); - p1.hunters.add(new Hunter(1, true)); - p1.gatherers.add(new Gatherer(1)); + new Inventor(1, 1).insert(p1); + 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 Gatherer(1).insert(p1); p2.addFood(1); - p2.artists.add(new Artist(1)); - p2.hunters.add(new Hunter(1, true)); + new Artist(1).insert(p2); + new Hunter(1, true).insert(p2); Sustenance s = new Sustenance(1,2); @@ -73,17 +73,17 @@ class SustenanceTest { ArrayList players = new ArrayList<>(Arrays.asList(p1,p2)); p1.addFood(5); - p1.inventors.add(new Inventor(1, 1)); - p1.shamans.add(new Shaman(1, 5)); - p1.builders.add(new Builder(1, 5, 5)); - p1.artists.add(new Artist(1)); - p1.hunters.add(new Hunter(1, true)); - p1.gatherers.add(new Gatherer(1)); + new Inventor(1, 1).insert(p1); + 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 Gatherer(1).insert(p1); p2.addFood(2); - p2.artists.add(new Artist(1)); - p2.artists.add(new Artist(1)); - p2.artists.add(new Artist(1)); + new Artist(1).insert(p2); + new Artist(1).insert(p2); + new Artist(1).insert(p2); Building1 bd1 = new Building1(1, 1, 1, CharacterType.SHAMAN);