diff --git a/test/ch/zhaw/catan/SiedlerGameTest.java b/test/ch/zhaw/catan/SiedlerGameTest.java index 29fa1e7..1efd9bc 100644 --- a/test/ch/zhaw/catan/SiedlerGameTest.java +++ b/test/ch/zhaw/catan/SiedlerGameTest.java @@ -229,50 +229,25 @@ public class SiedlerGameTest { public void TestGameAfterSetupPhase() { SiedlerGame game = gameAfterSetupPhase(); - System.out.println(game.getBoard().toString()); + //throwDiceSeveralTimes(game, 5, 1); + throwDiceSeveralTimes(game, 8, 1); - throwDiceSeveralTimes(game, 5, 5); - throwDiceSeveralTimes(game, 5, 5); - throwDiceSeveralTimes(game, 5, 5); - throwDiceSeveralTimes(game, 5, 5); - throwDiceSeveralTimes(game, 5, 5); + getResourceTypeFromField(game.getBoard().getFieldsForDiceValue(8), game.getCurrentPlayerFaction()); - //game.switchToNextPlayer(); - - //throwDiceSeveralTimes(game, 6, 5); - //throwDiceSeveralTimes(game, 6, 5); - //throwDiceSeveralTimes(game, 6, 5); - //throwDiceSeveralTimes(game, 6, 5); - //throwDiceSeveralTimes(game, 6, 5); - - soutDistribution(game); - } - - - /** - * tests, if a player wins when reached the amount of points. - */ - @Test - @DisplayName("End of Game test") - public void TestGameEnd() { + //Assertions.assertEquals(game.getCurrentPlayerResource().get(), game.getBoard().getFieldsForDiceValue(8).size()); } - //TEMPORARY METHOD, WILL BE REMOVED SOON - private static void soutDistribution(SiedlerGame game) { - System.out.println("\n\nVerteilung \n\n"); - for (int i = 0 ; i < game.getPlayerFactions().size(); i++) { - HashMap resources = game.getCurrentPlayerResource(); - System.out.println(game.getCurrentPlayerFaction().toString() + "\n"); - System.out.println(" BRICK " + resources.get(Config.Resource.BRICK).toString()); - System.out.println(" GRAIN " + resources.get(Config.Resource.GRAIN)); - System.out.println(" LUMBER " + resources.get(Config.Resource.LUMBER)); - System.out.println(" ORE " + resources.get(Config.Resource.ORE)); - System.out.println(" WOOL " + resources.get(Config.Resource.WOOL)); + private void getResourceTypeFromField(List points, Config.Faction faction) { - game.switchToNextPlayer(); + SiedlerBoard b = new SiedlerBoard(); + + for (Point point: points) { + System.out.println(point.toString()); + b.getFields(point); } } + } /** @@ -311,8 +286,6 @@ public class SiedlerGameTest { game.placeInitialRoad(secondRoad.first, secondRoad.second); } - System.out.println(game.getBoard().toString()); - return game; }