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

Fix: Fixed Various "toString" Method Issues + Relative Tests.

Browse Source
This commit is contained in:
GabrieleRadice
2026-04-29 16:39:26 +02:00
parent c3bdcdcc36
commit 87d7cf6a5f
9 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building1.java
+1 -1
View File
@@ -46,6 +46,6 @@ public class Building1 extends BuildingCard {
@Override @Override
public String toString() { public String toString() {
return super.toString() + " Icon: " + this.icon.toString(); return super.toString() + " Icon: " + this.icon.toString().charAt(0);
} }
} }
src/main/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11.java
+1 -1
View File
@@ -70,6 +70,6 @@ public class Building11 extends BuildingCard {
@Override @Override
public String toString() { public String toString() {
return super.toString() + " Icon: " + this.icon.toString(); return super.toString() + " Icon: " + this.icon.toString().charAt(0) + " MP: " + this.PrestigeMul;
} }
} }
src/main/java/it/polimi/ingsw/gc14/Model/Cards/BuildingCard.java
+1 -1
View File
@@ -182,6 +182,6 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf
*/ */
@Override @Override
public String toString() { public String toString() {
return "Era:"+String.valueOf(getEra())+" P:"+String.valueOf(getPrice())+" PR:"+String.valueOf(getPrestigeValue()); return "⎕:" + " ID:" + String.valueOf(getEffectId())+ " $:"+String.valueOf(getPrice())+" PV:"+String.valueOf(getPrestigeValue());
} }
} }
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Builder.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class Builder extends Character
*/ */
@Override @Override
public String toString() { public String toString() {
return super.toString() + " RV: " + String.valueOf(reductionValue) + " PV: " + String.valueOf(prestigeValue); return super.toString() + " RV:" + String.valueOf(reductionValue) + " PV:" + String.valueOf(prestigeValue);
} }
/** /**
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Hunter.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class Hunter extends Character {
public String toString() { public String toString() {
String toPrint = super.toString(); String toPrint = super.toString();
if(this.icon){ if(this.icon){
toPrint += " 🏹"; toPrint += " I";
} }
return toPrint; return toPrint;
} }
src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Shaman.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class Shaman extends Character {
*/ */
@Override @Override
public String toString() { public String toString() {
return super.toString() + " ★: " + String.valueOf(icon); return super.toString() + " *:" + String.valueOf(icon);
} }
/** /**
src/main/java/it/polimi/ingsw/gc14/Model/PlayableCard.java
+1 -1
View File
@@ -43,6 +43,6 @@ public abstract class PlayableCard implements Serializable {
*/ */
@Override @Override
public String toString() { public String toString() {
return "⌛:"+String.valueOf(Era); return "⎕:";
} }
} }
src/main/java/it/polimi/ingsw/gc14/View/TUI/AsciiTable.java
+1 -1
View File
@@ -45,6 +45,6 @@ public class AsciiTable {
private String rpad(String s, int w) { private String rpad(String s, int w) {
if (s.length() >= w) return s.substring(0, w); if (s.length() >= w) return s.substring(0, w);
return s + " ".repeat(w - s.length()) + "\t"; return s + " ".repeat(w - s.length());
} }
} }
src/test/java/it/polimi/ingsw/gc14/Model/PlayerTest.java
+23 -2
View File
@@ -1,6 +1,6 @@
package it.polimi.ingsw.gc14.Model; package it.polimi.ingsw.gc14.Model;
import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building1; import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.*;
import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; 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.CharacterType;
import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*;
@@ -218,6 +218,27 @@ class PlayerTest {
p.buildingCards.add(new BuildingCard(2, 1,2, 5)); p.buildingCards.add(new BuildingCard(2, 1,2, 5));
p.buildingCards.add(new BuildingCard(2, 2,3, 6)); p.buildingCards.add(new BuildingCard(2, 2,3, 6));
p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR)); p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR));
System.out.println(p.toString()); p.buildingCards.add(new Building1(2, 5, 5, CharacterType.SHAMAN));
p.buildingCards.add(new Building11(1, 5, 7, CharacterType.ARTIST , 3));
//System.out.println(p.toString());
assertEquals(""+
"╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗\n" +
"║ test_usr ║\n" +
"├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" +
"║ RESOURCES: ║\n" +
"║ Food: 7 ║\n" +
"║ Prestige: 15 ║\n" +
"├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" +
"║ CHARACTERS: ║\n" +
"║ Artists: [⎕:, ⎕:, ⎕:, ⎕:, ⎕:, ⎕:, ⎕:] ║\n" +
"║ Builders: [⎕: RV:5 PV:1] ║\n" +
"║ Gatherers: [⎕:] ║\n" +
"║ Shamans: [⎕: *:3, ⎕: *:3] ║\n" +
"║ Inventors: [⎕: I_ID:1] ║\n" +
"║ Hunters: [⎕: I, ⎕:] ║\n" +
"├═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════┤\n" +
"║ BUILDING CARDS: ║\n" +
"║ Buildings: [⎕: ID:2 $:2 PV:5, ⎕: ID:2 $:3 PV:6, ⎕: ID:1 $:5 PV:5 Icon: I, ⎕: ID:1 $:5 PV:5 Icon: S, ⎕: ID:11 $:5 PV:7 Icon: A MP: 3]║\n" +
"╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝", p.toString());
} }
} }