added some more testmethods

Projekte/mdga/model/src/test/java/pp/mdga/client/clientState/ClientStateTest.java

@@ -20,8 +20,6 @@
  */
 public class ClientStateTest {
 
-
-
     //sets the variables for the states
     private Animation animation;
     private AudioSettings audioSettings;

Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java

@@ -3,61 +3,18 @@
 import org.junit.Before;
 import org.junit.Test;
 import pp.mdga.game.Game;
-import pp.mdga.message.client.AnimationEnd;
+import pp.mdga.message.client.*;
-import pp.mdga.message.client.ClientMessage;
-import pp.mdga.message.client.ClientStartGame;
-import pp.mdga.message.client.DeselectTSK;
-import pp.mdga.message.client.ForceContinueGame;
-import pp.mdga.message.client.ForceStartGame;
-import pp.mdga.message.client.JoinServer;
-import pp.mdga.message.client.LeaveGame;
-import pp.mdga.message.client.LobbyNotReady;
-import pp.mdga.message.client.LobbyReady;
-import pp.mdga.message.client.NoPowerCard;
-import pp.mdga.message.client.RequestBriefing;
-import pp.mdga.message.client.RequestDice;
-import pp.mdga.message.client.RequestMove;
-import pp.mdga.message.client.RequestPlayCard;
-import pp.mdga.message.client.SelectCard;
-import pp.mdga.message.client.SelectTSK;
-import pp.mdga.message.client.SelectedPieces;
 import pp.mdga.message.server.ServerMessage;
-import pp.mdga.server.Animation;
+import pp.mdga.message.server.WaitPiece;
-import pp.mdga.server.Ceremony;
+import pp.mdga.server.*;
-import pp.mdga.server.ChoosePiece;
+import static org.junit.Assert.*;
-import pp.mdga.server.ChoosePieceStateMachine;
-import pp.mdga.server.DetermineStartPlayer;
-import pp.mdga.server.FirstRoll;
-import pp.mdga.server.GameState;
-import pp.mdga.server.GameStateMachine;
-import pp.mdga.server.Interrupt;
-import pp.mdga.server.Lobby;
-import pp.mdga.server.MovePiece;
-import pp.mdga.server.NoPiece;
-import pp.mdga.server.PlayPowerCard;
-import pp.mdga.server.PowerCard;
-import pp.mdga.server.RollDice;
-import pp.mdga.server.RollDiceMachine;
-import pp.mdga.server.SecondRoll;
-import pp.mdga.server.SelectPiece;
-import pp.mdga.server.ServerAutomaton;
-import pp.mdga.server.ServerGameLogic;
-import pp.mdga.server.ServerSender;
-import pp.mdga.server.NoTurn;
-import pp.mdga.server.StartPiece;
-import pp.mdga.server.ThirdRoll;
-import pp.mdga.server.Turn;
-import pp.mdga.server.TurnStateMachine;
-import pp.mdga.server.WaitingPiece;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
+/**
+ * TODO
+ */
 public class ServerStateTest {
 
+    //Todo
     private ServerGameLogic logic;
     private AnimationEnd animationEnd;
     private ClientStartGame clientStartGame;
@@ -78,9 +35,11 @@ public class ServerStateTest {
     private SelectTSK selectTSK;
     private ClientMessage[] clientMessages;
 
+    //Todo
     private int from;
     private int fromHost;
 
+    //Todo
     private GameStateMachine gameStateMachine;
     private TurnStateMachine turnStateMachine;
     private RollDiceMachine rollDiceMachine;
@@ -109,6 +68,9 @@ public class ServerStateTest {
     private Turn turn;
     private WaitingPiece waitingPiece;
 
+    /**
+     * TODO
+     */
     @Before
     public void setUp() {
 
@@ -599,6 +561,14 @@ public void testFirstRollToRollDiceEndState() {
         assertTrue(rollDiceMachine.getState() instanceof FirstRoll);
 
         //TODO 2 Möglichkeiten
+
+        //tests if the server is in NoPiece of ChoosePiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        ChoosePiece choosePiece1 = (ChoosePiece) turnStateMachine.getState();
+        ChoosePieceStateMachine choosePieceStateMachine = choosePiece1.getChoosePieceStateMachine();
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
     }
 
     /**
@@ -638,7 +608,31 @@ public void testFirstRollToSecondRoll() {
      */
     @Test
     public void testSecondRollToRollDiceEndState() {
-        // UC-ServerState-24
+        //sends the server in Game-State
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the gameStateMachine in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the TurnStateMachine in RollDice
+        turnStateMachine.gotoState(rollDice);
+        assertTrue(turnStateMachine.getState() instanceof RollDice);
+
+        //sends the RollDiceMachine in SecondRoll
+        rollDiceMachine.gotoState(secondRoll);
+        assertTrue(rollDiceMachine.getState() instanceof SecondRoll);
+
+        //Todo
+
+        //tests if the server is in NoPiece of ChoosePiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        ChoosePiece choosePiece1 = (ChoosePiece) turnStateMachine.getState();
+        ChoosePieceStateMachine choosePieceStateMachine = choosePiece1.getChoosePieceStateMachine();
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
     }
 
     /**
@@ -659,9 +653,9 @@ public void testSecondRollToThirdRoll() {
         turnStateMachine.gotoState(rollDice);
         assertTrue(turnStateMachine.getState() instanceof RollDice);
 
-        //sends the RollDiceMachine in FirstRoll
+        //sends the RollDiceMachine in SecondRoll
-        rollDiceMachine.gotoState(firstRoll);
+        rollDiceMachine.gotoState(secondRoll);
-        assertTrue(rollDiceMachine.getState() instanceof FirstRoll);
+        assertTrue(rollDiceMachine.getState() instanceof SecondRoll);
 
         //Todo player has no figures to move and had no 6
 
@@ -678,7 +672,31 @@ public void testSecondRollToThirdRoll() {
      */
     @Test
     public void testThirdRollToRollDiceEndState() {
-        // UC-ServerState-26
+        //sends the server in Game-State
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the gameStateMachine in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the TurnStateMachine in RollDice
+        turnStateMachine.gotoState(rollDice);
+        assertTrue(turnStateMachine.getState() instanceof RollDice);
+
+        //sends the RollDiceMachine in ThirdRoll
+        rollDiceMachine.gotoState(thirdRoll);
+        assertTrue(rollDiceMachine.getState() instanceof ThirdRoll);
+
+        //Todo
+
+        //tests if the server is in NoPiece of ChoosePiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        ChoosePiece choosePiece1 = (ChoosePiece) turnStateMachine.getState();
+        ChoosePieceStateMachine choosePieceStateMachine = choosePiece1.getChoosePieceStateMachine();
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
     }
 
     /**
@@ -687,7 +705,23 @@ public void testThirdRollToRollDiceEndState() {
      */
     @Test
     public void testThirdRollToTurnEndState() {
-        // UC-ServerState-27
+        //sends the server in Game-State
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the gameStateMachine in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the TurnStateMachine in RollDice
+        turnStateMachine.gotoState(rollDice);
+        assertTrue(turnStateMachine.getState() instanceof RollDice);
+
+        //sends the RollDiceMachine in ThirdRoll
+        rollDiceMachine.gotoState(thirdRoll);
+        assertTrue(rollDiceMachine.getState() instanceof ThirdRoll);
+
+        //Todo
     }
 
     /**
@@ -696,7 +730,30 @@ public void testThirdRollToTurnEndState() {
      */
     @Test
     public void testNoPieceToWaitingPiece() {
-        // UC-ServerState-28
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in NoPiece
+        choosePieceStateMachine.gotoState(noPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
+
+        //TODO
+
+        //tests if the server is in WaitingPiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece);
+
     }
 
     /**
@@ -705,7 +762,29 @@ public void testNoPieceToWaitingPiece() {
      */
     @Test
     public void testNoPieceToNoTurn() {
-        // UC-ServerState-29
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in NoPiece
+        choosePieceStateMachine.gotoState(noPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
+
+        //TODO
+
+        //tests if the server is in NoTurn
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof NoTurn);
     }
 
     /**
@@ -714,7 +793,23 @@ public void testNoPieceToNoTurn() {
      */
     @Test
     public void testNoTurnToTurnEndState() {
-        // UC-ServerState-30
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in NoTurn
+        choosePieceStateMachine.gotoState(noTurn);
+        assertTrue(choosePieceStateMachine.getState() instanceof NoTurn);
+
+        //TODO
     }
 
     /**
@@ -723,7 +818,29 @@ public void testNoTurnToTurnEndState() {
      */
     @Test
     public void testStayInWaitingPiece() {
-        // UC-ServerState-31
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in WaitingPiece
+        choosePieceStateMachine.gotoState(waitingPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece);
+
+        //TODO
+
+        //tests if the server is in WaitingPiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece);
     }
 
     /**
@@ -732,7 +849,23 @@ public void testStayInWaitingPiece() {
      */
     @Test
     public void testWaitingPieceToMovePiece() {
-        // UC-ServerState-32
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in WaitingPiece
+        choosePieceStateMachine.gotoState(waitingPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof WaitingPiece);
+
+        //TODO
     }
 
     /**
@@ -741,7 +874,29 @@ public void testWaitingPieceToMovePiece() {
      */
     @Test
     public void testNoPieceToSelectPiece() {
-        // UC-ServerState-33
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in NoPiece
+        choosePieceStateMachine.gotoState(noPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
+
+        //TODO
+
+        //tests if the server is in SelectPiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece);
     }
 
     /**
@@ -750,7 +905,29 @@ public void testNoPieceToSelectPiece() {
      */
     @Test
     public void testNoPieceToStartPiece() {
-        // UC-ServerState-34
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in NoPiece
+        choosePieceStateMachine.gotoState(noPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof NoPiece);
+
+        //TODO
+
+        //tests if the server is in StartPiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof StartPiece);
     }
 
     /**
@@ -759,7 +936,29 @@ public void testNoPieceToStartPiece() {
      */
     @Test
     public void testStayInSelectPiece() {
-        // UC-ServerState-35
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in SelectPiece
+        choosePieceStateMachine.gotoState(selectPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece);
+
+        //TODO
+
+        //tests if the server is in SelectPiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece);
     }
 
     /**
@@ -768,7 +967,23 @@ public void testStayInSelectPiece() {
      */
     @Test
     public void testSelectPieceToMovePiece() {
-        // UC-ServerState-36
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in SelectPiece
+        choosePieceStateMachine.gotoState(selectPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof SelectPiece);
+
+        //TODO
     }
 
     /**
@@ -777,7 +992,29 @@ public void testSelectPieceToMovePiece() {
      */
     @Test
     public void testStayInStartPiece() {
-        // UC-ServerState-37
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in StartPiece
+        choosePieceStateMachine.gotoState(startPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof StartPiece);
+
+        //TODO
+
+        //tests if the server is in StartPiece
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof StartPiece);
     }
 
     /**
@@ -786,6 +1023,22 @@ public void testStayInStartPiece() {
      */
     @Test
     public void testStartPieceToMovePiece() {
-        // UC-ServerState-38
+        //sends the server in GameState
+        serverAutomaton.gotoState(gameState);
+        assertTrue(serverAutomaton.getState() instanceof GameState);
+
+        //sends the server in Turn
+        gameStateMachine.gotoState(turn);
+        assertTrue(gameStateMachine.getState() instanceof Turn);
+
+        //sends the server in ChoosePiece
+        turnStateMachine.gotoState(choosePiece);
+        assertTrue(turnStateMachine.getState() instanceof ChoosePiece);
+
+        //sends the server in StartPiece
+        choosePieceStateMachine.gotoState(startPiece);
+        assertTrue(choosePieceStateMachine.getState() instanceof StartPiece);
+
+        //TODO
     }
 }