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

Merge branch 'main' of https://github.com/rubenpirreram/ing-sw-2026-pirrera-radice-pagani-pellegrino into tests-fix

Browse Source
This commit is contained in:
GabrieleRadice
2026-05-02 16:08:10 +02:00
parent c91cbb3031 28d371b87f
commit 56fcf4dada
3 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java
+3
View File
@@ -98,6 +98,9 @@ public class Hunter extends Character {
@Override @Override
public void insert(Player player) { public void insert(Player player) {
player.hunters.add(this); player.hunters.add(this);
if(this.getIcon()){
player.addFood(player.hunters.size());
}
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java
+24 -13
View File
@@ -96,7 +96,7 @@ class Building11Test {
p3.addFood(b3.getPrice()); p3.addFood(b3.getPrice());
assertTrue(b3.buy(p3)); assertTrue(b3.buy(p3));
p4.addFood(b3.getPrice()); p4.addFood(b3.getPrice());
assertEquals(false, b3.buy(p4)); assertFalse(b3.buy(p4));
} }
@@ -112,22 +112,33 @@ class Building11Test {
@Test @Test
@DisplayName("toString") @DisplayName("toString")
void testToString(){ void testToString(){
Building11 b11 = new Building11(1,2,3, CharacterType.INVENTOR, 1); int era = 1;
assertEquals("Era:1 Price:2 Prestige:3 Icon: INVENTOR", b11.toString()); int price = 1;
int prestigeValue = 3;
CharacterType ct = CharacterType.ARTIST;
int pm = 5;
b11 = new Building11(1,2,3, CharacterType.BUILDER, 1); Building11 b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("Era:1 Price:2 Prestige:3 Icon: BUILDER", b11.toString()); assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
b11 = new Building11(1,2,3, CharacterType.GATHERER, 1); ct = CharacterType.BUILDER;
assertEquals("Era:1 Price:2 Prestige:3 Icon: GATHERER", b11.toString()); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
b11 = new Building11(1,2,3, CharacterType.ARTIST, 1); ct = CharacterType.GATHERER;
assertEquals("Era:1 Price:2 Prestige:3 Icon: ARTIST", b11.toString()); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
b11 = new Building11(1,2,3, CharacterType.SHAMAN, 1); ct = CharacterType.HUNTER;
assertEquals("Era:1 Price:2 Prestige:3 Icon: SHAMAN", b11.toString()); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
b11 = new Building11(1,2,3, CharacterType.HUNTER, 1); ct = CharacterType.INVENTOR;
assertEquals("Era:1 Price:2 Prestige:3 Icon: HUNTER", b11.toString()); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
ct = CharacterType.SHAMAN;
b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/HunterTest.java
+18 -2
View File
@@ -21,8 +21,10 @@ class HunterTest {
String s = h.toString(); String s = h.toString();
assertNotNull(s); assertNotNull(s);
assertTrue(s.contains(CharacterType.HUNTER.toString())); assertTrue(s.contains(" I"));
assertTrue(s.contains("Icon: true"));
Hunter h2 = new Hunter(3, false);
assertTrue(!h2.toString().contains("I"));
} }
@Test @Test
@@ -55,6 +57,20 @@ class HunterTest {
assertEquals(2, p.hunters.size()); assertEquals(2, p.hunters.size());
assertTrue(p.hunters.contains(h2)); assertTrue(p.hunters.contains(h2));
Player p2 = new Player("test2");
Hunter h3 = new Hunter(1, true);
assertEquals(0, p2.getFoodValue());
h.insert(p2);
assertEquals(1, p2.getFoodValue());
h2.insert(p2);
assertEquals(1, p2.getFoodValue());
h3.insert(p2);
assertEquals(4, p2.getFoodValue());
} }
@Test @Test