From 57e49db1f0834779c764ed674d1c2497fb461915 Mon Sep 17 00:00:00 2001 From: schrom01 Date: Fri, 10 Dec 2021 20:15:48 +0100 Subject: [PATCH] reformat Code in SiedlerGameTest --- test/ch/zhaw/catan/SiedlerGameTest.java | 65 +++++++++++++------------ 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/test/ch/zhaw/catan/SiedlerGameTest.java b/test/ch/zhaw/catan/SiedlerGameTest.java index 854fa66..744e1e1 100644 --- a/test/ch/zhaw/catan/SiedlerGameTest.java +++ b/test/ch/zhaw/catan/SiedlerGameTest.java @@ -1,30 +1,35 @@ package ch.zhaw.catan; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import java.awt.*; -import java.util.*; +import java.awt.Point; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertThrows; /** * @class SiedlerGameTest - * + *

* contains all of the test cases for SiedlerGame class. * The Test cases are categorized into - * - Positive TestCases - * Tests the methods of SiedlerGame with the intended values - * - * - Negative TestCases - * Tests the methods of SiedlerGame with values, that results to errors and failure - * - * - SystemTestCases - * Tests the coordination of all methods and simulates a game with programmed moves - * Checks if the methods are being executed and the values are set correctly + * - Positive TestCases + * Tests the methods of SiedlerGame with the intended values + *

+ * - Negative TestCases + * Tests the methods of SiedlerGame with values, that results to errors and failure + *

+ * - SystemTestCases + * Tests the coordination of all methods and simulates a game with programmed moves + * Checks if the methods are being executed and the values are set correctly */ public class SiedlerGameTest { @@ -33,20 +38,20 @@ public class SiedlerGameTest { /** * Property START_SETTLEMENT_POSITIONS - * + *

* Lists all positions of Settlement for every faction in the initialization phase. * Each faction is assigned to a list of specific settlements, which represents as a list of points */ private final static Map> START_SETTLEMENT_POSITIONS = Map.of( - Config.Faction.BLUE, new ArrayList<>(List.of(new Point(4, 4), new Point(5, 7))), - Config.Faction.RED, new ArrayList<>(List.of(new Point(10, 4), new Point(9, 7))), - Config.Faction.GREEN, new ArrayList<>(List.of(new Point(4, 18), new Point(5, 15))), - Config.Faction.YELLOW, new ArrayList<>(List.of(new Point(10, 18), new Point(9, 15))) + Config.Faction.BLUE, new ArrayList<>(List.of(new Point(4, 4), new Point(5, 7))), + Config.Faction.RED, new ArrayList<>(List.of(new Point(10, 4), new Point(9, 7))), + Config.Faction.GREEN, new ArrayList<>(List.of(new Point(4, 18), new Point(5, 15))), + Config.Faction.YELLOW, new ArrayList<>(List.of(new Point(10, 18), new Point(9, 15))) ); /** * Property START_ROADS_POSITION - * + *

* Lists all endpoints of roads for every faction in the initialization phase. * Each faction is assigned to a specific Road, which represents as a tuple of 2 points */ @@ -78,7 +83,7 @@ public class SiedlerGameTest { public void TestGameInitializationWithAllPlayercounts(int playerAmount) { SiedlerGame game = new SiedlerGame(DEFAULT_WINPOINTS, playerAmount); - for (Config.Faction faction: game.getPlayerFactions()) { + for (Config.Faction faction : game.getPlayerFactions()) { HashMap resources = game.getCurrentPlayerResource(); Assertions.assertEquals(0, resources.get(Config.Resource.BRICK)); @@ -94,10 +99,10 @@ public class SiedlerGameTest { /** * Tests if the method throwDice halves the resources of the player * 7 will be passed to the throwDice Method when called - * + *

* Method does not halve a resource, when the amount is below 7. * Player has gotten 8 wool resources and throws a 7 with the dice - * + *

* expected: throwDice with a 7 will halve wool resource, the amount should be 4 */ @Test @@ -123,7 +128,7 @@ public class SiedlerGameTest { /** * @Class NegAtiveTestcases - * + *

* contains all negative test cases */ @Nested @@ -163,7 +168,7 @@ public class SiedlerGameTest { /** * This testcase will test, if the methods placeInitialRoad and placeInitialSettlement are overwritting * already occupied positions if the same faction or any other faction are calling the method with the same positions - * + *

* Expected: Method placeInitialRoad placeInitialSettlement should return false, independent of the current faction playing */ @Test @@ -192,7 +197,7 @@ public class SiedlerGameTest { /** * @Class SystemTestCases - * + *

* This class simulates a running game and tests multiple sequences of this game. */ @Nested @@ -276,9 +281,9 @@ public class SiedlerGameTest { /** * This method will call the method "throwDice" multiple times and passes the set value of the dice * - * @param game Type SiedlerGame, the game itself in a running state - * @param dice Type int, Set Value of dice - * @param amountDiceThrows Type int, The amount of dice throws + * @param game Type SiedlerGame, the game itself in a running state + * @param dice Type int, Set Value of dice + * @param amountDiceThrows Type int, The amount of dice throws */ private static void throwDiceSeveralTimes(SiedlerGame game, int dice, int amountDiceThrows) { for (int i = 0; i < amountDiceThrows; i++) {