diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java index c5ad8c70..25fe769a 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java @@ -261,6 +261,7 @@ public void testDialogsToGame() { @Test public void testDialogsToClientStateEndState() { //Todo Implementation goes here + //TODO how????????? } /** @@ -270,8 +271,6 @@ public void testDialogsToClientStateEndState() { public void testClientGameToCeremony() { //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); - - //tests if the client is in GameState assertTrue(clientAutomaton.getState() instanceof GameState); //sends the Ceremony-Message to the client @@ -317,10 +316,8 @@ public void testGameToDialogs() { */ @Test public void testStayInInterrupt() { - //sends the ClientAutomaton in GameState + //sends the ClientAutomaton in Interrupt clientAutomaton.gotoState(interrupt); - - //tests if the client is in GameState assertTrue(clientAutomaton.getState() instanceof Interrupt); //Todo send all messages except the continue-message @@ -333,10 +330,8 @@ public void testStayInInterrupt() { */ @Test public void testClientInterruptToGame() { - //sends the ClientAutomaton in GameState + //sends the ClientAutomaton in Interrupt clientAutomaton.gotoState(interrupt); - - //tests if the client is in GameState assertTrue(clientAutomaton.getState() instanceof Interrupt); //Todo sends the continue-message @@ -350,9 +345,8 @@ public void testClientInterruptToGame() { */ @Test public void testInterruptToDialogs() { - //sends the ClientAutomaton in GameState + //sends the ClientAutomaton in Interrupt clientAutomaton.gotoState(interrupt); - //tests if the client is in GameState assertTrue(clientAutomaton.getState() instanceof Interrupt); //Todo send the server-closed message and the leave option @@ -373,9 +367,8 @@ public void testCeremonyToDialogs() { assertTrue(clientAutomaton.getState() instanceof Ceremony); //sends the ceremony machine in the statistics - CeremonyStateMachine ceremonyStateMachine1 = ceremony.getCeremonyStateMachine(); - ceremonyStateMachine1.gotoState(statistics); - assertTrue(ceremonyStateMachine1.getState() instanceof Statistics); + ceremonyStateMachine.gotoState(statistics); + assertTrue(ceremonyStateMachine.getState() instanceof Statistics); //Todo simulate the button next @@ -395,14 +388,13 @@ public void testStartDialogToNetworkDialog1() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in StartDialog - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(startDialog); - assertTrue(dialogsStateMachine1.getState() instanceof StartDialog); + dialogsStateMachine.gotoState(startDialog); + assertTrue(dialogsStateMachine.getState() instanceof StartDialog); //todo simulate pushBtn as client or host assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); } /** @@ -415,14 +407,13 @@ public void testStartDialogToNetworkDialog2() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in StartDialog - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(startDialog); - assertTrue(dialogsStateMachine1.getState() instanceof StartDialog); + dialogsStateMachine.gotoState(startDialog); + assertTrue(dialogsStateMachine.getState() instanceof StartDialog); //todo simulate pushBtn as client or host assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); } /** @@ -444,14 +435,13 @@ public void testNetworkDialogToStartDialog() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in NetworkDialog - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(networkDialog); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + dialogsStateMachine.gotoState(networkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); //todo simulate pushBtn assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof StartDialog); + assertTrue(dialogsStateMachine.getState() instanceof StartDialog); } /** @@ -464,14 +454,13 @@ public void testNetworkDialogToNetworkDialog1() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in NetworkDialog - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(networkDialog); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + dialogsStateMachine.gotoState(networkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); //todo test receiving all messages and making input assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); } /** @@ -484,19 +473,18 @@ public void testNetworkDialogToNetworkDialog2() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in NetworkDialog - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(networkDialog); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + dialogsStateMachine.gotoState(networkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); //todo simulate try connect to server ith wrong variables assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); //todo simulate try connect to server with send: join-lobby and receive lobby-refuse-message assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); } /** @@ -509,14 +497,13 @@ public void testNetworkDialogToLobby() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in NetworkDialog - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(networkDialog); - assertTrue(dialogsStateMachine1.getState() instanceof NetworkDialog); + dialogsStateMachine.gotoState(networkDialog); + assertTrue(dialogsStateMachine.getState() instanceof NetworkDialog); //todo simulate connect to server with send lobby request assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof Lobby); + assertTrue(dialogsStateMachine.getState() instanceof Lobby); } /** @@ -529,14 +516,13 @@ public void testLobbyToStartDialog() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in Lobby - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(lobby); - assertTrue(dialogsStateMachine1.getState() instanceof Lobby); + dialogsStateMachine.gotoState(lobby); + assertTrue(dialogsStateMachine.getState() instanceof Lobby); //todo simulate leave the lobby assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof StartDialog); + assertTrue(dialogsStateMachine.getState() instanceof StartDialog); } /** @@ -549,14 +535,13 @@ public void testStayInLobby() { assertTrue(clientAutomaton.getState() instanceof Dialogs); //sends the DialogsStateMachine in Lobby - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(lobby); - assertTrue(dialogsStateMachine1.getState() instanceof Lobby); + dialogsStateMachine.gotoState(lobby); + assertTrue(dialogsStateMachine.getState() instanceof Lobby); //todo send all messages that dont indicate a change-state assertTrue(clientAutomaton.getState() instanceof Dialogs); - assertTrue(dialogsStateMachine1.getState() instanceof Lobby); + assertTrue(dialogsStateMachine.getState() instanceof Lobby); } /** @@ -564,12 +549,13 @@ public void testStayInLobby() { */ @Test public void testLobbyToRollRankingDice() { - //sends the clientStatemachine in Lobby + //sends the clientStatemachine in Dialogs + clientAutomaton.gotoState(dialogs); assertTrue(clientAutomaton.getState() instanceof Dialogs); - Dialogs dialogs1 = (Dialogs) clientAutomaton.getState(); - DialogsStateMachine dialogsStateMachine1 = dialogs.getDialogsStateMachine(); - dialogsStateMachine1.gotoState(lobby); - assertTrue(dialogsStateMachine1.getState() instanceof Lobby); + + //sends the clientStatemachine in Lobby + dialogsStateMachine.gotoState(lobby); + assertTrue(dialogsStateMachine.getState() instanceof Lobby); //sends the message to start the game clientGameLogic.receive();//TODO message @@ -593,7 +579,7 @@ public void testLobbyToRollRankingDice() { */ @Test public void testDetermineStartPlayerToWait() { - // Implementation goes here + // Todo Implementation goes here } /** @@ -601,40 +587,36 @@ public void testDetermineStartPlayerToWait() { */ @Test public void testWaitToAnimation() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); - - //tests if the client is in GameState assertTrue(clientAutomaton.getState() instanceof GameState); //sends the client in WaitState - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(waiting); - assertTrue(gameStateMachine1.getState() instanceof Waiting); + gameStateMachine.gotoState(waiting); + assertTrue(gameStateMachine.getState() instanceof Waiting); //tests if a piece is moved,that the client goes into Animation clientGameLogic.receive(moveMessage); //Todo ??? richtige message assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Animation); + assertTrue(gameStateMachine.getState() instanceof Animation); //sends the client in WaitState - gameStateMachine1.gotoState(waiting); - assertTrue(gameStateMachine1.getState() instanceof Waiting); + gameStateMachine.gotoState(waiting); + assertTrue(gameStateMachine.getState() instanceof Waiting); //tests if a powerCard is played,that the client goes into Animation clientGameLogic.receive(playCard); //Todo ??? richtige message assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Animation); + assertTrue(gameStateMachine.getState() instanceof Animation); //sends the client in WaitState - gameStateMachine1.gotoState(waiting); - assertTrue(gameStateMachine1.getState() instanceof Waiting); + gameStateMachine.gotoState(waiting); + assertTrue(gameStateMachine.getState() instanceof Waiting); //tests if a die is rolled,that the client goes into Animation clientGameLogic.receive(dice); //Todo ??? richtige message assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Animation); + assertTrue(gameStateMachine.getState() instanceof Animation); } /** @@ -642,15 +624,13 @@ public void testWaitToAnimation() { */ @Test public void testWaitToTurn() { - //TODo //sends client in gameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); - //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(waiting); - assertTrue(gameStateMachine1.getState() instanceof Turn); + //sends the gameStateMachine in the Waiting + gameStateMachine.gotoState(waiting); + assertTrue(gameStateMachine.getState() instanceof Waiting); //the client receives the message ActivePlayer clientGameLogic.receive(activePlayer); @@ -659,7 +639,7 @@ public void testWaitToTurn() { assertTrue(clientAutomaton.getState() instanceof GameState); //tests if Client is in Turn - assertTrue(gameStateMachine1.getState() instanceof Turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //tests if Client is in PowerCard TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); @@ -731,28 +711,24 @@ public void testPowerCardSubStatesToRollDice() { */ @Test public void testStayInPlayPowerCard() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PlayPowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(playPowerCard); - assertTrue(turnStateMachine1.getState() instanceof PlayPowerCard); + turnStateMachine.gotoState(playPowerCard); + assertTrue(turnStateMachine.getState() instanceof PlayPowerCard); //Todo send messages to test to stay in playPowerCard //tests if the client is in PlayPowerCard assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof PlayPowerCard); - + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof PlayPowerCard); } /** @@ -760,28 +736,25 @@ public void testStayInPlayPowerCard() { */ @Test public void testPlayPowerCardToRollDice() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PlayPowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(playPowerCard); - assertTrue(turnStateMachine1.getState() instanceof PlayPowerCard); + turnStateMachine.gotoState(playPowerCard); + assertTrue(turnStateMachine.getState() instanceof PlayPowerCard); //Todo send messages to test the transition in rollDice //Todo test other messages, that there is no state change //tests if the client is in RollDice assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof RollDice); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof RollDice); } /** @@ -868,26 +841,23 @@ public void testChoosePowerCardToRollDice() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(powerCard); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); + turnStateMachine.gotoState(powerCard); + assertTrue(turnStateMachine.getState() instanceof PowerCard); //sends the turnStatemachine in ChoosePiece - PowerCardStateMachine powerCardStateMachine1 = powerCard.getPowerCardStateMachine(); - powerCardStateMachine1.gotoState(choosePowerCard); - assertTrue(powerCardStateMachine1.getState() instanceof ChoosePowerCard); + powerCardStateMachine.gotoState(choosePowerCard); + assertTrue(powerCardStateMachine.getState() instanceof ChoosePowerCard); //todo send the messages, to force a state change to rollDice //tests if the turnStateMachine is in RollDice assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof RollDice); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof RollDice); } /** @@ -895,33 +865,29 @@ public void testChoosePowerCardToRollDice() { */ @Test public void testChoosePowerCardToSwap() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(powerCard); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); + turnStateMachine.gotoState(powerCard); + assertTrue(turnStateMachine.getState() instanceof PowerCard); //sends the turnStatemachine in ChoosePiece - PowerCardStateMachine powerCardStateMachine1 = powerCard.getPowerCardStateMachine(); - powerCardStateMachine1.gotoState(choosePowerCard); - assertTrue(powerCardStateMachine1.getState() instanceof ChoosePowerCard); + powerCardStateMachine.gotoState(choosePowerCard); + assertTrue(powerCardStateMachine.getState() instanceof ChoosePowerCard); //todo send the messages, to force a state change to swap //tests if the client is in Swap assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); - assertTrue(powerCardStateMachine1.getState() instanceof Swap); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof PowerCard); + assertTrue(powerCardStateMachine.getState() instanceof Swap); } /** @@ -929,33 +895,29 @@ public void testChoosePowerCardToSwap() { */ @Test public void testChoosePowerCardToShield() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(powerCard); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); + turnStateMachine.gotoState(powerCard); + assertTrue(turnStateMachine.getState() instanceof PowerCard); //sends the turnStatemachine in ChoosePiece - PowerCardStateMachine powerCardStateMachine1 = powerCard.getPowerCardStateMachine(); - powerCardStateMachine1.gotoState(choosePowerCard); - assertTrue(powerCardStateMachine1.getState() instanceof ChoosePowerCard); + powerCardStateMachine.gotoState(choosePowerCard); + assertTrue(powerCardStateMachine.getState() instanceof ChoosePowerCard); //todo send the messages, to force a state change to shield //tests if the client is in Shield assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); - assertTrue(powerCardStateMachine1.getState() instanceof Shield); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof PowerCard); + assertTrue(powerCardStateMachine.getState() instanceof Shield); } /** @@ -963,33 +925,29 @@ public void testChoosePowerCardToShield() { */ @Test public void testStayInShield() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(powerCard); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); + turnStateMachine.gotoState(powerCard); + assertTrue(turnStateMachine.getState() instanceof PowerCard); //sends the turnStatemachine in Shield - PowerCardStateMachine powerCardStateMachine1 = powerCard.getPowerCardStateMachine(); - powerCardStateMachine1.gotoState(shield); - assertTrue(powerCardStateMachine1.getState() instanceof Shield); + powerCardStateMachine.gotoState(shield); + assertTrue(powerCardStateMachine.getState() instanceof Shield); //todo send the messages, which dont force a statechange //tests if the client is in PlayPowerCard assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); - assertTrue(powerCardStateMachine1.getState() instanceof PlayPowerCard); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof PowerCard); + assertTrue(powerCardStateMachine.getState() instanceof PlayPowerCard); } /** @@ -997,20 +955,17 @@ public void testStayInShield() { */ @Test public void testShieldToPowerCardEndState() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(powerCard); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); + turnStateMachine.gotoState(powerCard); + assertTrue(turnStateMachine.getState() instanceof PowerCard); //sends the turnStatemachine in Shield PowerCardStateMachine powerCardStateMachine1 = powerCard.getPowerCardStateMachine(); @@ -1021,8 +976,8 @@ public void testShieldToPowerCardEndState() { //tests if the client is in PlayPowerCard assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof PlayPowerCard); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof PlayPowerCard); } /** @@ -1030,32 +985,28 @@ public void testShieldToPowerCardEndState() { */ @Test public void testSwapToPowerCardEndState() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in PowerCard - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(powerCard); - assertTrue(turnStateMachine1.getState() instanceof PowerCard); + turnStateMachine.gotoState(powerCard); + assertTrue(turnStateMachine.getState() instanceof PowerCard); //sends the turnStatemachine in Swap - PowerCardStateMachine powerCardStateMachine1 = powerCard.getPowerCardStateMachine(); - powerCardStateMachine1.gotoState(swap); - assertTrue(powerCardStateMachine1.getState() instanceof Swap); + powerCardStateMachine.gotoState(swap); + assertTrue(powerCardStateMachine.getState() instanceof Swap); //todo send the message to force the statechange //tests if the client is in PlayPowerCard assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof PlayPowerCard); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof PlayPowerCard); } /** @@ -1063,24 +1014,21 @@ public void testSwapToPowerCardEndState() { */ @Test public void testNoPieceInWaitingPiece() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in NoPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - assertTrue(choosePieceStateMachine1.getState() instanceof NoPiece); + turnStateMachine.gotoState(noPiece); + assertTrue(choosePieceStateMachine.getState() instanceof NoPiece); //Todo test other messages, that there is no state change @@ -1088,9 +1036,9 @@ public void testNoPieceInWaitingPiece() { clientGameLogic.receive(waitPiece); assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); - assertTrue(choosePieceStateMachine1.getState() instanceof WaitingPiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); + assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece); } /** @@ -1098,24 +1046,21 @@ public void testNoPieceInWaitingPiece() { */ @Test public void testNoPieceInSelectedPiece() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in NoPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - assertTrue(choosePieceStateMachine1.getState() instanceof NoPiece); + choosePieceStateMachine.gotoState(noPiece); + assertTrue(choosePieceStateMachine.getState() instanceof NoPiece); //Todo test other messages, that there is no state change @@ -1123,9 +1068,9 @@ public void testNoPieceInSelectedPiece() { clientGameLogic.receive(selectPiece); assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); - assertTrue(choosePieceStateMachine1.getState() instanceof SelectPiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); + assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece); } /** @@ -1133,24 +1078,21 @@ public void testNoPieceInSelectedPiece() { */ @Test public void testNoPieceInStartPiece() { - //TODO //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in NoPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - assertTrue(choosePieceStateMachine1.getState() instanceof NoPiece); + choosePieceStateMachine.gotoState(noPiece); + assertTrue(choosePieceStateMachine.getState() instanceof NoPiece); //Todo test other messages, that there is no state change @@ -1158,9 +1100,9 @@ public void testNoPieceInStartPiece() { clientGameLogic.receive(startPiece); assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); - assertTrue(choosePieceStateMachine1.getState() instanceof StartPiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); + assertTrue(choosePieceStateMachine.getState() instanceof StartPiece); } /** @@ -1168,24 +1110,21 @@ public void testNoPieceInStartPiece() { */ @Test public void testNoPieceInWait() { - //sends the ClientAutomaton in GameState clientAutomaton.gotoState(gameState); assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in NoPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - assertTrue(choosePieceStateMachine1.getState() instanceof NoPiece); + choosePieceStateMachine.gotoState(noPiece); + assertTrue(choosePieceStateMachine.getState() instanceof NoPiece); //Todo test other messages, that there is no state change @@ -1193,8 +1132,8 @@ public void testNoPieceInWait() { clientGameLogic.receive(noTurn); assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof Waiting); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof Waiting); } /** @@ -1207,26 +1146,23 @@ public void testStayInWaitingPiece() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in WaitingPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - choosePieceStateMachine1.gotoState(waitingPiece); - assertTrue(choosePieceStateMachine1.getState() instanceof WaitingPiece); + choosePieceStateMachine.gotoState(waitingPiece); + assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece); //TODO send all sever-messages except ... to the clientGameLogic to test there are no state change assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); - assertTrue(choosePieceStateMachine1.getState() instanceof WaitingPiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); + assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece); } /** @@ -1239,25 +1175,22 @@ public void testWaitingPieceInChoosePieceEndState() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in WaitingPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - choosePieceStateMachine1.gotoState(waitingPiece); - assertTrue(choosePieceStateMachine1.getState() instanceof WaitingPiece); + choosePieceStateMachine.gotoState(waitingPiece); + assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece); //Todo send the message to the clientGameLogic to force a state change assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof MovePiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof MovePiece); } /** @@ -1270,26 +1203,23 @@ public void testStayInSelectedPiece() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); - //sends the choosePieceStatemachine in SelectPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - choosePieceStateMachine1.gotoState(selectPiece); - assertTrue(choosePieceStateMachine1.getState() instanceof SelectPiece); + //sends the choosePieceStatemachine in SelectPiece; + choosePieceStateMachine.gotoState(selectPiece); + assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece); //Todo send all server messages which dont force a state change here assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); - assertTrue(choosePieceStateMachine1.getState() instanceof SelectPiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); + assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece); } /** @@ -1302,25 +1232,22 @@ public void testSelectedPieceInChoosePieceEndState() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in SelectPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - choosePieceStateMachine1.gotoState(selectPiece); - assertTrue(choosePieceStateMachine1.getState() instanceof SelectPiece); + choosePieceStateMachine.gotoState(selectPiece); + assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece); //Todo send the message which force a state change assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof MovePiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof MovePiece); } /** @@ -1333,26 +1260,23 @@ public void testStayInStartPiece() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in StartPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - choosePieceStateMachine1.gotoState(startPiece); - assertTrue(choosePieceStateMachine1.getState() instanceof StartPiece); + choosePieceStateMachine.gotoState(startPiece); + assertTrue(choosePieceStateMachine.getState() instanceof StartPiece); //todo send all messages which dont force a state change assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); - assertTrue(choosePieceStateMachine1.getState() instanceof StartPiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); + assertTrue(choosePieceStateMachine.getState() instanceof StartPiece); } /** @@ -1365,25 +1289,22 @@ public void testStartPieceToChoosePieceEndState() { assertTrue(clientAutomaton.getState() instanceof GameState); //sends the gameStateMachine in the Turn - GameStateMachine gameStateMachine1 = gameState.getGameStateMachine(); - gameStateMachine1.gotoState(turn); - assertTrue(gameStateMachine1.getState() instanceof Turn); + gameStateMachine.gotoState(turn); + assertTrue(gameStateMachine.getState() instanceof Turn); //sends the turnStatemachine in ChoosePiece - TurnStateMachine turnStateMachine1 = turn.getTurnStateMachine(); - turnStateMachine1.gotoState(choosePiece); - assertTrue(turnStateMachine1.getState() instanceof ChoosePiece); + turnStateMachine.gotoState(choosePiece); + assertTrue(turnStateMachine.getState() instanceof ChoosePiece); //sends the choosePieceStatemachine in StartPiece - ChoosePieceStateMachine choosePieceStateMachine1 = choosePiece.getChoosePieceStateMachine(); - choosePieceStateMachine1.gotoState(startPiece); - assertTrue(choosePieceStateMachine1.getState() instanceof StartPiece); + choosePieceStateMachine.gotoState(startPiece); + assertTrue(choosePieceStateMachine.getState() instanceof StartPiece); //Todo send the message which force a state change assertTrue(clientAutomaton.getState() instanceof GameState); - assertTrue(gameStateMachine1.getState() instanceof Turn); - assertTrue(turnStateMachine1.getState() instanceof MovePiece); + assertTrue(gameStateMachine.getState() instanceof Turn); + assertTrue(turnStateMachine.getState() instanceof MovePiece); } /**