From 6e4e71f21eb2342b46106e652076184019bd00c9 Mon Sep 17 00:00:00 2001 From: AleandroPagani Date: Fri, 27 Mar 2026 17:29:18 +0100 Subject: [PATCH] Fix: Building13, Building0Test, Building13Test, BuildingCard, BuildingCarsTest --- .../gc14/Model/Cards/Building/Effects/Building13.java | 5 +---- .../it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java | 5 +++++ .../gc14/Model/Cards/Building/Effects/Building0Test.java | 1 - .../Model/Cards/Building/Effects/Building13Test.java | 8 -------- .../polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java | 9 +++++++++ 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13.java index 13cbae7..852a21f 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13.java @@ -20,8 +20,5 @@ public class Building13 extends BuildingCard{ throw new IllegalArgumentException(); player.addPrestige(25); } - @Override - public String toString() { - return "Era:"+String.valueOf(getEra())+"\nPrice:"+String.valueOf(getPrice())+"\nPrestige:"+String.valueOf(getPrestigeValue()+"\n"); - } + } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java index e86e332..04e68b0 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java @@ -86,4 +86,9 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf return true; } public void applyEffect(Player player){}; + + @Override + public String toString() { + return "Era:"+String.valueOf(getEra())+"\nPrice:"+String.valueOf(getPrice())+"\nPrestige:"+String.valueOf(getPrestigeValue()+"\n"); + } } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java index 56053e7..5420c00 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java @@ -3,7 +3,6 @@ package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; import it.polimi.ingsw.gc14.Model.Player; -import jdk.jshell.spi.SPIResolutionException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java index c374bf0..7a1ed5c 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java @@ -69,12 +69,4 @@ class Building13Test { b13.buy(p1); assertFalse(b13.buy(p2)); } - - @Test - @DisplayName("Testing toString method") - void testToString() { - Building13 b0 = new Building13(1, 2,3); - - assertEquals("Era:1\nPrice:2\nPrestige:3\n", b0.toString()); - } } \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java index 441eba4..24b4f81 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCardTest.java @@ -2,6 +2,7 @@ package it.polimi.ingsw.gc14.Model.Cards; import it.polimi.ingsw.gc14.Model.Cards.Building.EffectType; import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building0; +import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building13; import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -148,4 +149,12 @@ class BuildingCardTest { assertEquals(false, bc0.buy(p1)); assertEquals(false, bc0.buy(p2)); } + + @Test + @DisplayName("Testing toString method") + void testToString() { + Building13 b0 = new Building13(1, 2,3); + + assertEquals("Era:1\nPrice:2\nPrestige:3\n", b0.toString()); + } } \ No newline at end of file