Merge pull request #51 from rubenpirreram/toString-fixes
To string fixes
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package it.polimi.ingsw.gc14.Model;
|
||||
|
||||
import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.*;
|
||||
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.*;
|
||||
@@ -206,8 +207,38 @@ class PlayerTest {
|
||||
p.artists.add(new Artist(1));
|
||||
p.artists.add(new Artist(1));
|
||||
p.artists.add(new Artist(2));
|
||||
p.builders.add(new Builder(2, 5, 1));
|
||||
p.gatherers.add(new Gatherer(1, 3));
|
||||
p.shamans.add(new Shaman(2, 3, 3));
|
||||
p.shamans.add(new Shaman(2, 3, 4));
|
||||
p.inventors.add(new Inventor(3, 1));
|
||||
p.hunters.add(new Hunter(3, true));
|
||||
p.hunters.add(new Hunter(2, false));
|
||||
|
||||
p.buildingCards.add(new BuildingCard(2, 1,2, 5));
|
||||
p.buildingCards.add(new BuildingCard(2, 2,3, 6));
|
||||
System.out.println(p.toString());
|
||||
p.buildingCards.add(new Building1(2, 5, 5, CharacterType.INVENTOR));
|
||||
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());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user