diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index cf2a8f4..4985a2d 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -707,10 +707,11 @@ public class Game implements Serializable { public String toString() { var table = new AsciiTable(BorderStyle.UNICODE, slotMap.size()); List stringUp=new ArrayList<>(); + List stringEmpty=new ArrayList<>(); List stringDown=new ArrayList<>(); for(Map.Entry entry:slotMap.entrySet()) { - + stringEmpty.add(" "); stringDown.add(entry.getKey().toStringTUI()); if(entry.getValue()!=null) stringUp.add(entry.getValue().getUserName()); @@ -718,7 +719,23 @@ public class Game implements Serializable { stringUp.add(" "); } table.addRow(stringUp); + table.addRow(stringEmpty); table.addRow(stringDown); - return orderLogicCard.toString()+"\nOFFER TRACK\n"+ table.build(); + StringBuilder s=new StringBuilder(); + ListtempLines=new ArrayList<>(); + List> playersString=new ArrayList<>(); + for(Player p:playersList) + { + tempLines=List.of(p.toString().split("\n")); + playersString.add(tempLines); + } + + + Listlines=List.of(orderLogicCard.toString().split("\n")); + List lines2=new ArrayList<>(); + lines2.add("OFFER TRACK"); + lines2.addAll(List.of(table.build().split("\n"))); + return AsciiTable.sideBySide(lines,lines2,1)+AsciiTable.sideBySide(playersString.get(0),playersString.get(1),1); + //return s.toString()+"\n"++"\nOFFER TRACK\n"+ table.build()+"\n" ; } } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java index 98db8ee..5c57dcf 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/GameTest.java @@ -115,7 +115,7 @@ class GameTest { assertTrue(game.SlotChoiceByIndex(game.getCurrentState().getCurrentPlayer(), i)); } Player temp_player; - + System.out.println(game); temp_player=players.poll(); assertEquals(temp_player,game.getCurrentState().getCurrentPlayer()); @@ -156,6 +156,7 @@ class GameTest { index=cards.indexOf(cards.stream().filter(x->!x.IsEventCard()).findFirst().get()); assertFalse(game.DrawUpperTribeCardByIndex(temp_player,index)); + System.out.println(game); } private void drawTribeTest(HashMapnCardsByType,int nCards,int countCards,TribeCard temp_card,Player temp_player,Game game) { @@ -201,24 +202,20 @@ class GameTest { @Test void toStringModel() { - Game game=new Game(5); + Game game=new Game(3); Player p1=new Player("p1"); Player p2=new Player("p2"); Player p3=new Player("p3"); - Player p4=new Player("p4"); - Player p5=new Player("p5"); assertTrue(game.addPlayer(p1)); assertTrue(game.addPlayer(p2)); assertTrue(game.addPlayer(p3)); - assertTrue(game.addPlayer(p4)); - assertTrue(game.addPlayer(p5)); Queueplayers=new LinkedList<>(); - for(int i=0;i<5;i++) { + for(int i=0;i<3;i++) { players.add( game.getCurrentState().getCurrentPlayer()); assertTrue(game.SlotChoiceByIndex(game.getCurrentState().getCurrentPlayer(), i)); } - System.out.println(game); + //System.out.println(game); } } \ No newline at end of file