Add: Added toString To Player.java + Respective Tests And Fixed BuildingCard.java's toString.
This commit is contained in:
@@ -89,6 +89,6 @@ public class BuildingCard extends PlayableCard implements Cloneable , BuildingEf
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Era:"+String.valueOf(getEra())+"\nPrice:"+String.valueOf(getPrice())+"\nPrestige:"+String.valueOf(getPrestigeValue()+"\n");
|
return "Era:"+String.valueOf(getEra())+" Price:"+String.valueOf(getPrice())+" Prestige:"+String.valueOf(getPrestigeValue());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -227,19 +227,16 @@ public class Player {
|
|||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
String toPrint = "";
|
String toPrint = "";
|
||||||
toPrint = this.getUserName() + ":\n\tFood: " + this.getFoodValue()
|
toPrint = this.getUserName()
|
||||||
|
+ ":\n\tFood: " + this.getFoodValue()
|
||||||
+ "\n\tPrestige: " + this.getPrestigeValue()
|
+ "\n\tPrestige: " + this.getPrestigeValue()
|
||||||
+ "\n\tArtists: " + this.artists.toString()
|
+ "\n\tArtists: " + this.artists.toString()
|
||||||
+ "\n\tBuilders: " + this.builders.toString()
|
+ "\n\tBuilders: " + this.builders.toString()
|
||||||
+ "\n\tGatherers: " + this.gatherers.toString()
|
+ "\n\tGatherers: " + this.gatherers.toString()
|
||||||
+ "\n\tShamans: " + this.shamans.toString()
|
+ "\n\tShamans: " + this.shamans.toString()
|
||||||
+ "\n\tHunters: " + this.hunters.toString()
|
+ "\n\tHunters: " + this.hunters.toString()
|
||||||
+ "\n\tBuildings: [\n";
|
+ "\n\tBuildings: "
|
||||||
|
+ this.buildingCards.toString();
|
||||||
for (BuildingCard buildingCard : this.buildingCards) {
|
|
||||||
toPrint += buildingCard.toString().indent(8);
|
|
||||||
}
|
|
||||||
toPrint += "\t\t]";
|
|
||||||
return toPrint;
|
return toPrint;
|
||||||
}
|
}
|
||||||
// endregion functions
|
// endregion functions
|
||||||
|
|||||||
@@ -203,6 +203,14 @@ class PlayerTest {
|
|||||||
p.artists.add(new Artist(2));
|
p.artists.add(new Artist(2));
|
||||||
p.buildingCards.add(new BuildingCard(1,2, 5));
|
p.buildingCards.add(new BuildingCard(1,2, 5));
|
||||||
p.buildingCards.add(new BuildingCard(2,3, 6));
|
p.buildingCards.add(new BuildingCard(2,3, 6));
|
||||||
System.out.println(p.toString());
|
assertEquals("test_usr:"+ "\n\t" +
|
||||||
|
"Food: 7" + "\n\t" +
|
||||||
|
"Prestige: 15" + "\n\t" +
|
||||||
|
"Artists: [Era:1 ARTIST, Era:2 ARTIST]" + "\n\t" + "Builders: []" + "\n\t" +
|
||||||
|
"Gatherers: []" + "\n\t" +
|
||||||
|
"Shamans: []" + "\n\t" +
|
||||||
|
"Hunters: []" + "\n\t" +
|
||||||
|
"Buildings: [Era:1 Price:2 Prestige:5, Era:2 Price:3 Prestige:6]",
|
||||||
|
p.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user