From adfdf755a680b16a5dc76e22c52fe5e9ca1ffe6d Mon Sep 17 00:00:00 2001 From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com> Date: Sun, 12 Apr 2026 19:38:04 +0200 Subject: [PATCH 1/2] Add: Partial Implementation Of The toString Method And Test in Player.java And PlayerTest.java II. --- src/main/java/it/polimi/ingsw/gc14/Model/Player.java | 11 +++++++++-- .../java/it/polimi/ingsw/gc14/Model/PlayerTest.java | 11 +++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index 2331c51..92f2d95 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -226,14 +226,21 @@ public class Player { // TODO tostring usr + food + prestige \n tab foreach(characters.cards + spazio) @Override public String toString() { - return this.getUserName() + ":\n\tFood: " + this.getFoodValue() + String toPrint = ""; + toPrint = this.getUserName() + ":\n\tFood: " + this.getFoodValue() + "\n\tPrestige: " + this.getPrestigeValue() + "\n\tArtists: " + this.artists.toString() + "\n\tBuilders: " + this.builders.toString() + "\n\tGatherers: " + this.gatherers.toString() + "\n\tShamans: " + this.shamans.toString() + "\n\tHunters: " + this.hunters.toString() - + "\n\tBuildings:" + this.buildingCards.toString().indent(1); + + "\n\tBuildings: \n"; + for (BuildingCard buildingCard : this.buildingCards) { + toPrint += buildingCard.toString().indent(8); + toPrint += toPrint.replaceAll("\\n$", "") + "]"; + } + + return toPrint; } // endregion functions } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java index 93e117f..bb09790 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java @@ -1,5 +1,6 @@ package it.polimi.ingsw.gc14.Model; +import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; import org.junit.jupiter.api.DisplayName; @@ -192,4 +193,14 @@ class PlayerTest { Player p = new Player(""); }); } + + @Test + void tostring() { + Player p = new Player("test_usr"); + p.addPrestige(15); + p.addFood(7); + p.buildingCards.add(new BuildingCard(1,2, 5)); + p.buildingCards.add(new BuildingCard(2,3, 6)); + System.out.println(p.toString()); + } } \ No newline at end of file From 2da6642468a4e9c767014837732339ef93d85415 Mon Sep 17 00:00:00 2001 From: GabrieleRadice <265572328+GabrieleRadice@users.noreply.github.com> Date: Sun, 12 Apr 2026 20:07:46 +0200 Subject: [PATCH 2/2] Add: Partial Implementation Of The toString Method And Test in Player.java And PlayerTest.java III. --- src/main/java/it/polimi/ingsw/gc14/Model/Player.java | 6 +++--- src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index 92f2d95..64a3338 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -234,12 +234,12 @@ public class Player { + "\n\tGatherers: " + this.gatherers.toString() + "\n\tShamans: " + this.shamans.toString() + "\n\tHunters: " + this.hunters.toString() - + "\n\tBuildings: \n"; + + "\n\tBuildings: [\n"; + for (BuildingCard buildingCard : this.buildingCards) { toPrint += buildingCard.toString().indent(8); - toPrint += toPrint.replaceAll("\\n$", "") + "]"; } - + toPrint += "\t\t]"; return toPrint; } // endregion functions diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java index bb09790..b82579f 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java @@ -199,6 +199,8 @@ class PlayerTest { Player p = new Player("test_usr"); p.addPrestige(15); p.addFood(7); + p.artists.add(new Artist(1)); + p.artists.add(new Artist(2)); p.buildingCards.add(new BuildingCard(1,2, 5)); p.buildingCards.add(new BuildingCard(2,3, 6)); System.out.println(p.toString());