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

Refactor.

Browse Source
This commit is contained in:
GabrieleRadice
2026-05-02 17:21:57 +02:00
parent 56fcf4dada
commit 42a6644f8e
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java
+7 -6
View File
@@ -112,6 +112,7 @@ class Building11Test {
@Test @Test
@DisplayName("toString") @DisplayName("toString")
void testToString(){ void testToString(){
int ID = 11;
int era = 1; int era = 1;
int price = 1; int price = 1;
int prestigeValue = 3; int prestigeValue = 3;
@@ -119,26 +120,26 @@ class Building11Test {
int pm = 5; int pm = 5;
Building11 b11 = new Building11(era, price, prestigeValue, ct, pm); Building11 b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
ct = CharacterType.BUILDER; ct = CharacterType.BUILDER;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
ct = CharacterType.GATHERER; ct = CharacterType.GATHERER;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
ct = CharacterType.HUNTER; ct = CharacterType.HUNTER;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
ct = CharacterType.INVENTOR; ct = CharacterType.INVENTOR;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
ct = CharacterType.SHAMAN; ct = CharacterType.SHAMAN;
b11 = new Building11(era, price, prestigeValue, ct, pm); b11 = new Building11(era, price, prestigeValue, ct, pm);
assertEquals("⎕: " + "ID:11" + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0) + " MP: " + pm, b11.toString());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java
+24 -12
View File
@@ -70,22 +70,34 @@ class Building1Test {
@Test @Test
@DisplayName("toString") @DisplayName("toString")
void testToString(){ void testToString(){
Building1 b1 = new Building1(1,2,3, CharacterType.INVENTOR); int ID = 1;
assertEquals("Era:1 Price:2 Prestige:3 Icon: INVENTOR", b1.toString()); int era = 1;
int price = 1;
int prestigeValue = 3;
CharacterType ct = CharacterType.ARTIST;
int pm = 5;
b1 = new Building1(1,2,3, CharacterType.BUILDER); Building1 b1 = new Building1(era, price, prestigeValue, ct);
assertEquals("Era:1 Price:2 Prestige:3 Icon: BUILDER", b1.toString()); assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0), b1.toString());
b1 = new Building1(1,2,3, CharacterType.GATHERER); ct = CharacterType.BUILDER;
assertEquals("Era:1 Price:2 Prestige:3 Icon: GATHERER", b1.toString()); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0), b1.toString());
b1 = new Building1(1,2,3, CharacterType.ARTIST); ct = CharacterType.GATHERER;
assertEquals("Era:1 Price:2 Prestige:3 Icon: ARTIST", b1.toString()); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0), b1.toString());
b1 = new Building1(1,2,3, CharacterType.SHAMAN); ct = CharacterType.HUNTER;
assertEquals("Era:1 Price:2 Prestige:3 Icon: SHAMAN", b1.toString()); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0), b1.toString());
b1 = new Building1(1,2,3, CharacterType.HUNTER); ct = CharacterType.INVENTOR;
assertEquals("Era:1 Price:2 Prestige:3 Icon: HUNTER", b1.toString()); b1 = new Building1(era, price, prestigeValue, ct);
assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0), b1.toString());
ct = CharacterType.SHAMAN;
b1 = new Building1(era, price, prestigeValue, ct);
assertEquals("⎕: " + "ID:" + ID + " $:" + price + " PV:" + prestigeValue + " Icon: " + ct.toString().charAt(0), b1.toString());
} }
} }