From 42a6644f8efa6e12da46893c2c2cd22cd1a787b3 Mon Sep 17 00:00:00 2001 From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com> Date: Sat, 2 May 2026 17:21:57 +0200 Subject: [PATCH] Refactor. --- .../Building/Effects/Building11Test.java | 13 +++---- .../Cards/Building/Effects/Building1Test.java | 36 ++++++++++++------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java index a3d907a..89359e5 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java @@ -112,6 +112,7 @@ class Building11Test { @Test @DisplayName("toString") void testToString(){ + int ID = 11; int era = 1; int price = 1; int prestigeValue = 3; @@ -119,26 +120,26 @@ class Building11Test { int pm = 5; 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; 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; 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; 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; 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; 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()); } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java index cfd9ef4..0019f12 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1Test.java @@ -70,22 +70,34 @@ class Building1Test { @Test @DisplayName("toString") void testToString(){ - Building1 b1 = new Building1(1,2,3, CharacterType.INVENTOR); - assertEquals("Era:1 Price:2 Prestige:3 Icon: INVENTOR", b1.toString()); + int ID = 1; + int era = 1; + int price = 1; + int prestigeValue = 3; + CharacterType ct = CharacterType.ARTIST; + int pm = 5; - b1 = new Building1(1,2,3, CharacterType.BUILDER); - assertEquals("Era:1 Price:2 Prestige:3 Icon: BUILDER", b1.toString()); + Building1 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.GATHERER); - assertEquals("Era:1 Price:2 Prestige:3 Icon: GATHERER", b1.toString()); + ct = CharacterType.BUILDER; + 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); - assertEquals("Era:1 Price:2 Prestige:3 Icon: ARTIST", b1.toString()); + ct = CharacterType.GATHERER; + 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); - assertEquals("Era:1 Price:2 Prestige:3 Icon: SHAMAN", b1.toString()); + ct = CharacterType.HUNTER; + 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); - assertEquals("Era:1 Price:2 Prestige:3 Icon: HUNTER", b1.toString()); + ct = CharacterType.INVENTOR; + 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()); } } \ No newline at end of file