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 a8a994e3..b0a7ca32 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 @@ -17,6 +17,7 @@ import pp.mdga.message.client.ClientMessage; import java.util.ArrayList; +import java.util.UUID; import static org.junit.Assert.*; @@ -145,9 +146,9 @@ public void send(ClientMessage msg) { endOfTurn = new EndOfTurnMessage(); lobbyAccept = new LobbyAcceptMessage(); lobbyDeny = new LobbyDenyMessage(); - lobbyPlayerJoin = new LobbyPlayerJoinedMessage(from,player); + lobbyPlayerJoin = new LobbyPlayerJoinedMessage(from, player); lobbyPlayerLeave = new LobbyPlayerLeaveMessage(from); - moveMessage = new MoveMessage(,false, 20);//Todo + moveMessage = new MoveMessage(, false, 20);//Todo noTurn = new NoTurnMessage(); interruptMessage = new PauseGameMessage(); playCardSwap = PlayCardMessage.swap();//Todo @@ -155,7 +156,7 @@ public void send(ClientMessage msg) { playCardTurbo = PlayCardMessage.turbo(1);//Todo possibleCard = new PossibleCardMessage(); possiblePieceShield = PossiblePieceMessage.shieldPossiblePieces(new ArrayList<>()); //TODO - possiblePieceSwap = PossiblePieceMessage.swapPossiblePieces(new ArrayList<>(),new ArrayList<>()); //TODO + possiblePieceSwap = PossiblePieceMessage.swapPossiblePieces(new ArrayList<>(), new ArrayList<>()); //TODO possiblePiece = new PossiblePieceMessage(); rankingResponse = new RankingResponseMessage(); rankingRollAgain = new RankingRollAgainMessage(); @@ -349,7 +350,7 @@ public void testClientGameToCeremony() { } /** - * UC-ClientState-05: Test the transition from ClientGame sub-states to Interrupt. + * UC-ClientState-05: Test the transition from ClientGame substates to Interrupt. */ @Test public void testClientGameSubStatesToInterrupt() { @@ -374,7 +375,7 @@ public void testGameToDialogs() { assertEquals(clientGameLogic.getState(), gameState); //receives a GameClosedMessage - clientGameLogic.received();//TODO + //clientGameLogic.received();//TODO assertEquals(clientGameLogic.getState(), dialogs); assertEquals(dialogs.getState(), startDialog); @@ -452,7 +453,7 @@ public void testInterruptToDialogs() { assertEquals(clientGameLogic.getState(), interrupt); //Todo send the server-closed - clientGameLogic.received(); + //clientGameLogic.received(); //tests if the client is in the startDialog assertEquals(clientGameLogic.getState(), dialogs); @@ -881,7 +882,7 @@ public void testWaitToGameEndState() { } /** - * UC-ClientState-25: Test the transition from Turn sub-states to GameEndState. + * UC-ClientState-25: Test the transition from Turn substates to GameEndState. */ @Test public void testTurnSubStatesToGameEndState() { @@ -944,7 +945,7 @@ public void testTurnSubStatesToGameEndState() { } /** - * UC-ClientState-26: Test the transition from Turn sub-states to Wait. + * UC-ClientState-26: Test the transition from Turn substates to Wait. */ @Test public void testTurnSubStatesToWait() { @@ -1134,7 +1135,7 @@ public void testTurnSubStatesToWait() { } /** - * UC-ClientState-27: Test the transition from Turn sub-states to Spectator. + * UC-ClientState-27: Test the transition from Turn substates to Spectator. */ @Test public void testTurnSubStatesToSpectator() { @@ -1255,7 +1256,7 @@ public void testSpectatorToGameEndState() { } /** - * UC-ClientState-29: Test the transition from PowerCard sub-states to PlayPowerCard. + * UC-ClientState-29: Test the transition from PowerCard substates to PlayPowerCard. */ @Test public void testPowerCardSubStatesToPlayPowerCard() { @@ -1315,7 +1316,7 @@ public void testPowerCardSubStatesToPlayPowerCard() { } /** - * UC-ClientState-30: Test the transition from PowerCard sub-states to RollDice. + * UC-ClientState-30: Test the transition from PowerCard substates to RollDice. *

* tests the transition from ChoosePowerCard from PowerCard to RollDice */ diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java index cfdd7a52..67741a8a 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java @@ -126,7 +126,7 @@ public void testMove() { // TODO: //sends the server in selectPiece serverGameLogic.setCurrentState(serverGameLogic.getGameState()); - GameState gameState =serverGameLogic.getGameState(); + GameState gameState = serverGameLogic.getGameState(); //sets the active Player to host game.setActiveColor(hostColor); @@ -149,6 +149,17 @@ public void testMove() { @Test public void testCantMove() { // TODO: Implement test logic for when a piece can't move + //send server in selectPiece-state + + //set active player + + //set die-class + + //send request Die-message + + //send .......... + + //test } /** diff --git a/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java b/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java index 64922329..3377eec0 100644 --- a/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java +++ b/Projekte/mdga/model/src/test/java/pp/mdga/server/serverState/ServerStateTest.java @@ -1,14 +1,7 @@ package pp.mdga.server.serverState; import org.junit.*; -import pp.mdga.client.gameState.AnimationState; -import pp.mdga.client.gameState.turnState.PlayPowerCardState; -import pp.mdga.game.BonusCard; -import pp.mdga.game.Color; -import pp.mdga.game.Game; -import pp.mdga.game.Piece; -import pp.mdga.game.PieceState; -import pp.mdga.game.Player; +import pp.mdga.game.*; import pp.mdga.message.server.ServerMessage; import pp.mdga.message.client.*; import pp.mdga.server.*; @@ -50,7 +43,6 @@ public class ServerStateTest { private SelectTSKMessage selectTSK; private StartGameMessage startGame; - //TODO declare two players private Player playerHost; @@ -78,9 +70,8 @@ public class ServerStateTest { //todo declare a card for client private BonusCard bonusCardClient; - //TODO declare the states here - private AnimationState animation; + private AnimationState animationState; private CeremonyState ceremonyState; private ChoosePieceState choosePieceState; private DetermineStartPlayerState determineStartPlayerState; @@ -89,17 +80,17 @@ public class ServerStateTest { private InterruptState interruptState; private LobbyState lobbyState; private MovePieceState movePieceState; - private NoPieceState noPiece; + private NoPieceState noPieceState; private NoTurnState noTurnState; - private PlayPowerCardState playPowerCard; + private PlayPowerCardState playPowerCardState; private PowerCardState powerCardState; private RollDiceState rollDiceState; - private SecondRollState secondRoll; - private SelectPieceState selectPiece; + private SecondRollState secondRollState; + private SelectPieceState selectPieceState; private StartPieceState startPieceState; - private ThirdRollState thirdRoll; + private ThirdRollState thirdRollState; private TurnState turnState; - private WaitingPieceState waitingPiece; + private WaitingPieceState waitingPieceState; /** * this method is used to initialize the attributes of this test-class @@ -120,6 +111,11 @@ public void send(int id, ServerMessage message) { public void broadcast(ServerMessage message) { } + + @Override + public void disconnectClient(int id) { + + } }, game); animationEnd = new AnimationEndMessage(); @@ -140,31 +136,30 @@ public void broadcast(ServerMessage message) { selectTSK = new SelectTSKMessage(); startGame = new StartGameMessage(); - //initialize the states here - thirdRoll = rollDiceState.getThirdRollState(); - secondRoll = rollDiceState.getSecondRollState(); + thirdRollState = rollDiceState.getThirdRollState(); + secondRollState = rollDiceState.getSecondRollState(); firstRollState = rollDiceState.getThirdRollState(); - noPiece = choosePieceState.getNoPieceState(); + noPieceState = choosePieceState.getNoPieceState(); noTurnState = choosePieceState.getNoTurnState(); - waitingPiece = choosePieceState.getWaitingPieceState(); + waitingPieceState = choosePieceState.getWaitingPieceState(); startPieceState = choosePieceState.getStartPieceState(); - selectPiece =choosePieceState.getSelectPieceState(); + selectPieceState = choosePieceState.getSelectPieceState(); powerCardState = turnState.getPowerCardState(); - playPowerCard = turnState.getPlayPowerCardState(); + playPowerCardState = turnState.getPlayPowerCardState(); rollDiceState = turnState.getRollDiceState(); choosePieceState = turnState.getChoosePieceState(); movePieceState = turnState.getMovePieceState(); determineStartPlayerState = gameState.getDetermineStartPlayerState(); turnState = gameState.getTurnState(); - animation = gameState.getAnimationState(); + animationState = gameState.getAnimationState(); lobbyState = (LobbyState) serverGameLogic.getLobbyState(); gameState = (GameState) serverGameLogic.getGameState(); - ceremonyState = (CeremonyState) serverGameLogic.getCeremonyState(); + ceremonyState = (CeremonyState) serverGameLogic.getCeremonyState(); interruptState = (InterruptState) serverGameLogic.getInterruptState(); //initialize two players @@ -172,35 +167,34 @@ public void broadcast(ServerMessage message) { IDPlayerHost = 1; playerHostColor = Color.CYBER; playerHost.setColor(playerHostColor); - game.addPlayer(IDPlayerHost,playerHost); + game.addPlayer(IDPlayerHost, playerHost); playerClient = new Player("Client"); IDPlayerClient = 2; playerClientColor = Color.ARMY; playerClient.setColor(playerClientColor); - playerClient.addHandCards(bonusCardClient); - game.addPlayer(IDPlayerClient,playerClient); //TODO random uuid + playerClient.addHandCard(bonusCardClient); + game.addPlayer(IDPlayerClient, playerClient); //TODO random uuid //initialize a piece for client IDPiece = 3; pieceState = PieceState.ACTIVE; - piece = new Piece(playerClientColor,pieceState,IDPiece); - game.getBoard().setPieceOnBoard(15,piece); //sets the piece at inx 12, bc the home begins after inx 19 + piece = new Piece(playerClientColor, pieceState, IDPiece); + game.getBoard().setPieceOnBoard(15, piece); //sets the piece at inx 12, bc the home begins after inx 19 //initialize the other 3 House-Pieces - IDPiece1 =4; - IDPiece2 =5; - IDPiece3 =6; - pieceHome1 = new Piece(playerClientColor,PieceState.HOMEFINISHED,IDPiece1); - pieceHome2 = new Piece(playerClientColor,PieceState.HOMEFINISHED,IDPiece2); - pieceHome3 = new Piece(playerClientColor,PieceState.HOMEFINISHED,IDPiece3); - game.getBoard().getPlayerData().get(playerClientColor).setPieceInHome(1,pieceHome1); - game.getBoard().getPlayerData().get(playerClientColor).setPieceInHome(2,pieceHome2); - game.getBoard().getPlayerData().get(playerClientColor).setPieceInHome(3,pieceHome3); + IDPiece1 = 4; + IDPiece2 = 5; + IDPiece3 = 6; + pieceHome1 = new Piece(playerClientColor, PieceState.HOMEFINISHED, IDPiece1); + pieceHome2 = new Piece(playerClientColor, PieceState.HOMEFINISHED, IDPiece2); + pieceHome3 = new Piece(playerClientColor, PieceState.HOMEFINISHED, IDPiece3); + game.getBoard().getPlayerData().get(playerClientColor).setPieceInHome(1, pieceHome1); + game.getBoard().getPlayerData().get(playerClientColor).setPieceInHome(2, pieceHome2); + game.getBoard().getPlayerData().get(playerClientColor).setPieceInHome(3, pieceHome3); //initialize the powerCard bonusCardClient = BonusCard.SHIELD; - } /** @@ -209,7 +203,7 @@ public void broadcast(ServerMessage message) { @Test public void testInitialStateServerState() { //tests if the server is in lobbyState - assertEquals(serverGameLogic.getCurrentState(),lobbyState); + assertEquals(serverGameLogic.getCurrentState(), lobbyState); } /** @@ -220,9 +214,9 @@ public void testInitialStateServerState() { public void testLobbyToDetermineStartPlayer() { //sends the server in the lobby-state serverGameLogic.setCurrentState(lobbyState); - assertEquals(serverGameLogic.getCurrentState(),lobbyState); + assertEquals(serverGameLogic.getCurrentState(), lobbyState); - //send all other messages, which dont indicate a state change + //send all other messages, which don't indicate a state change serverGameLogic.received(animationEnd, IDPlayerClient); serverGameLogic.received(deselectTSK, IDPlayerClient); serverGameLogic.received(disconnected, IDPlayerClient); @@ -241,15 +235,14 @@ public void testLobbyToDetermineStartPlayer() { serverGameLogic.received(selectTSK, IDPlayerClient); //serverGameLogic.received(startGame, IDPlayerClient); - //tests if the server is still in the lobby-state - assertEquals(serverGameLogic.getLobbyState(),lobbyState); + assertEquals(serverGameLogic.getLobbyState(), lobbyState); //sets both players ready game.setAllReady(false); //tests if the server is still in the lobby-state - assertEquals(serverGameLogic.getLobbyState(),lobbyState); + assertEquals(serverGameLogic.getLobbyState(), lobbyState); //sets both players ready game.setAllReady(true); @@ -258,8 +251,8 @@ public void testLobbyToDetermineStartPlayer() { serverGameLogic.received(startGame, IDPlayerHost); //tests if the server is in DSP-state - assertEquals(serverGameLogic.getCurrentState(),gameState); - assertEquals(gameState.getCurrentState(),determineStartPlayerState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); } /** @@ -269,9 +262,9 @@ public void testLobbyToDetermineStartPlayer() { public void testStayInLobby() { //sends the server in the lobby-state serverGameLogic.setCurrentState(lobbyState); - assertEquals(serverGameLogic.getCurrentState(),lobbyState); + assertEquals(serverGameLogic.getCurrentState(), lobbyState); - //serverGameLogic gets all messages, which dont indicate a state change + //serverGameLogic gets all messages, which don't indicate a state change serverGameLogic.received(animationEnd, IDPlayerClient); serverGameLogic.received(deselectTSK, IDPlayerClient); //serverGameLogic.received(disconnected, IDPlayerClient); @@ -291,7 +284,7 @@ public void testStayInLobby() { //serverGameLogic.received(startGame, IDPlayerClient); //tests if Server is still in Lobby - assertEquals(serverGameLogic.getCurrentState(),lobbyState); + assertEquals(serverGameLogic.getCurrentState(), lobbyState); } /** @@ -301,13 +294,13 @@ public void testStayInLobby() { public void testServerGameSubStatesToInterrupt() { //sends the server in the gameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState(),gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the interrupt - serverGameLogic.received(disconnected,IDPlayerClient); + serverGameLogic.received(disconnected, IDPlayerClient); //tests if the server is in the Interrupt-state - assertEquals(serverGameLogic.getInterruptState(),interruptState); + assertEquals(serverGameLogic.getInterruptState(), interruptState); } /** @@ -317,12 +310,12 @@ public void testServerGameSubStatesToInterrupt() { public void testServerGameToCeremony() { //sends the server in the gameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //Todo game is finished //tests if the server is in the Ceremony-state - assertEquals(serverGameLogic.getCurrentState() ,ceremonyState); + assertEquals(serverGameLogic.getCurrentState(), ceremonyState); } /** @@ -332,7 +325,7 @@ public void testServerGameToCeremony() { public void testInterruptToGameContinue() { //sends the server in the Interrupt-State serverGameLogic.setCurrentState(interruptState); - assertEquals(serverGameLogic.getCurrentState() ,interruptState); + assertEquals(serverGameLogic.getCurrentState(), interruptState); //send all other messages except forceContinue serverGameLogic.received(animationEnd, IDPlayerClient); @@ -354,13 +347,13 @@ public void testInterruptToGameContinue() { serverGameLogic.received(startGame, IDPlayerClient); //tests if the server is still in Interrupt - assertEquals(serverGameLogic.getCurrentState(),interruptState); + assertEquals(serverGameLogic.getCurrentState(), interruptState); //sends the continue-message to the server serverGameLogic.received(forceContinueGame, IDPlayerClient); //tests if new Stet is in GameState - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); } /** @@ -370,12 +363,12 @@ public void testInterruptToGameContinue() { public void testInterruptToGameReconnect() { //sends the server in the Interrupt-State serverGameLogic.setCurrentState(interruptState); - assertEquals(serverGameLogic.getCurrentState() ,interruptState); + assertEquals(serverGameLogic.getCurrentState(), interruptState); //todo implement the reconnect //tests if new Stet is in GameState - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); } /** @@ -385,12 +378,12 @@ public void testInterruptToGameReconnect() { public void testInterruptToGameTimer() { //sends the server in the Interrupt-State serverGameLogic.setCurrentState(interruptState); - assertEquals(serverGameLogic.getCurrentState() ,interruptState); + assertEquals(serverGameLogic.getCurrentState(), interruptState); //Todo implement the timer //tests if new Stet is in GameState - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); } /** @@ -400,7 +393,7 @@ public void testInterruptToGameTimer() { public void testCeremonyToServerStateEndState() { //sends the server in ceremony serverGameLogic.setCurrentState(ceremonyState); - assertEquals(serverGameLogic.getCurrentState() ,ceremonyState); + assertEquals(serverGameLogic.getCurrentState(), ceremonyState); //tests if the server is closed // TODO how???? @@ -413,11 +406,11 @@ public void testCeremonyToServerStateEndState() { public void testDetermineStartPlayerToDetermineStartPlayer1() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in DSP-state gameState.setCurrentState(determineStartPlayerState); - assertEquals(gameState.getCurrentState() ,determineStartPlayerState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); //sends messages to the server serverGameLogic.received(animationEnd, IDPlayerClient); @@ -439,8 +432,8 @@ public void testDetermineStartPlayerToDetermineStartPlayer1() { serverGameLogic.received(startGame, IDPlayerClient); //tests if the server is still in DSP-state - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,determineStartPlayerState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); } /** @@ -450,26 +443,26 @@ public void testDetermineStartPlayerToDetermineStartPlayer1() { public void testDetermineStartPlayerToDetermineStartPlayer2() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in DSP-state gameState.setCurrentState(determineStartPlayerState); - assertEquals(gameState.getCurrentState() ,determineStartPlayerState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); //TODO sends messages 2 requestDieMessage, die gleich geränkt werden to the server //sends the requestDieMessage to the server gameState.received(requestDie, IDPlayerClient); //tests if the server is still in DSP-state - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,determineStartPlayerState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); //sends the requestDieMessage to the server gameState.received(requestMove, IDPlayerClient); //tests if the server is still in DSP-state - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,determineStartPlayerState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); } /** @@ -479,17 +472,17 @@ public void testDetermineStartPlayerToDetermineStartPlayer2() { public void testDetermineStartPlayerToAnimation() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in DSP-state gameState.setCurrentState(determineStartPlayerState); - assertEquals(gameState.getCurrentState() ,determineStartPlayerState); + assertEquals(gameState.getCurrentState(), determineStartPlayerState); //TODO sends messages 2 requestDieMessage, die ungleich geränkt werden, sodass der server weitergeht //tests if the Server is in animationState - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,animation); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), animationState); } /** @@ -500,24 +493,24 @@ public void testDetermineStartPlayerToAnimation() { public void testAnimationToPowerCard() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Animation - gameState.setCurrentState(animation); - assertEquals(gameState.getCurrentState() ,animation); + gameState.setCurrentState(animationState); + assertEquals(gameState.getCurrentState(), animationState); //receives one animation endMessage and tests if the server is still in the Animation-state serverGameLogic.received(animationEnd, IDPlayerClient); - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,animation); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), animationState); //receives another animation endMessage serverGameLogic.received(animationEnd, IDPlayerClient); //tests if the server is in the PowerCard-state - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,powerCardState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), powerCardState); } /** @@ -528,15 +521,15 @@ public void testAnimationToPowerCard() { public void testTurnToAnimation() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in Animation - turnState.setCurrentState(animation); - assertEquals(turnState.getState(),animation); + turnState.setCurrentState(movePieceState); + assertEquals(turnState.getCurrentState(), movePieceState); //set dices-eyes in game !=6 game.setDiceEyes(4); @@ -544,17 +537,17 @@ public void testTurnToAnimation() { //serverGameLogic receives animationEndMessages serverGameLogic.received(animationEnd, IDPlayerClient); - //tests if the server is still in Animation-State - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getState(),animation); + //tests if the server is still in movePieceState + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), movePieceState); //sends the second animationEndMessage serverGameLogic.received(animationEnd, IDPlayerHost); //tests if the server is in the AnimationState - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,animation); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), animationState); } /** @@ -565,16 +558,16 @@ public void testTurnToAnimation() { public void testTurnToGameEndState() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //todo set the turn finished and there is only one players left //tests if the server is in the end-state of game, Ceremony - assertEquals(serverGameLogic.getCurrentState() ,ceremonyState); + assertEquals(serverGameLogic.getCurrentState(), ceremonyState); } /** @@ -585,15 +578,15 @@ public void testTurnToGameEndState() { public void testStayInPowerCard() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in PowerCard turnState.setCurrentState(powerCardState); - assertEquals(turnState.getCurrentState() ,powerCardState); + assertEquals(turnState.getCurrentState(), powerCardState); //receive messages which don't lead to a state change todo serverGameLogic.received(animationEnd, IDPlayerClient); @@ -615,9 +608,9 @@ public void testStayInPowerCard() { serverGameLogic.received(startGame, IDPlayerClient); //tests if the server is in PowerCard - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,powerCardState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), powerCardState); } /** @@ -628,22 +621,22 @@ public void testStayInPowerCard() { public void testPowerCardToPlayPowerCard() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in PowerCard turnState.setCurrentState(powerCardState); - assertEquals(turnState.getCurrentState() ,powerCardState); + assertEquals(turnState.getCurrentState(), powerCardState); //todo //tests if the server is in PlayPowerCard - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,playPowerCard); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), playPowerCardState); } /** @@ -654,30 +647,30 @@ public void testPowerCardToPlayPowerCard() { public void testPlayPowerCardToRollDice() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in PowerCard - turnState.setCurrentState(playPowerCard); - assertEquals(turnState.getCurrentState() ,playPowerCard); + turnState.setCurrentState(playPowerCardState); + assertEquals(turnState.getCurrentState(), playPowerCardState); //receive first AnimationEndMessage IDPlayerClient the host serverGameLogic.received(animationEnd, IDPlayerClient); - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,playPowerCard); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), playPowerCardState); //receive second AnimationEndMessage serverGameLogic.received(animationEnd, IDPlayerClient); //tests if the server is in RollDice and in FirstRoll - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,rollDiceState); - assertEquals(rollDiceState.getCurrentState() ,firstRollState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), rollDiceState); + assertEquals(rollDiceState.getCurrentState(), firstRollState); } /** @@ -688,21 +681,21 @@ public void testPlayPowerCardToRollDice() { public void testChoosePieceToMovePiece() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //Todo ??? - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,movePieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), movePieceState); } /** @@ -713,15 +706,15 @@ public void testChoosePieceToMovePiece() { public void testMovePieceToTurnEndState() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in MovePiece turnState.setCurrentState(movePieceState); - assertEquals(turnState.getCurrentState() ,movePieceState); + assertEquals(turnState.getCurrentState(), movePieceState); //Todo no 6 was rolled, so the server looks, if there are 2 or less player are still in the game //TODO @@ -736,22 +729,22 @@ public void testMovePieceToTurnEndState() { public void testMovePieceToFirstRoll() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in MovePiece turnState.setCurrentState(movePieceState); - assertEquals(turnState.getCurrentState() ,movePieceState); + assertEquals(turnState.getCurrentState(), movePieceState); //Todo the player rolled a 6 and the player is not finished - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,rollDiceState); - assertEquals(rollDiceState.getCurrentState() ,firstRollState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), rollDiceState); + assertEquals(rollDiceState.getCurrentState(), firstRollState); } /** @@ -762,27 +755,27 @@ public void testMovePieceToFirstRoll() { public void testFirstRollToRollDiceEndState() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in RollDice turnState.setCurrentState(rollDiceState); - assertEquals(turnState.getCurrentState() ,rollDiceState); + assertEquals(turnState.getCurrentState(), rollDiceState); //sends the RollDiceState in FirstRoll rollDiceState.setCurrentState(firstRollState); - assertEquals(rollDiceState.getCurrentState() ,firstRollState); + assertEquals(rollDiceState.getCurrentState(), firstRollState); //TODO 2 Möglichkeiten //tests if the server is in NoPiece of ChoosePiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); } /** @@ -793,27 +786,27 @@ public void testFirstRollToRollDiceEndState() { public void testFirstRollToSecondRoll() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in RollDice turnState.setCurrentState(rollDiceState); - assertEquals(turnState.getCurrentState() ,rollDiceState); + assertEquals(turnState.getCurrentState(), rollDiceState); //sends the RollDiceState in FirstRoll rollDiceState.setCurrentState(firstRollState); - assertEquals(rollDiceState.getCurrentState() ,firstRollState); + assertEquals(rollDiceState.getCurrentState(), firstRollState); //Todo player has no figures to move and had no 6 //tests if the server is in the SecondRoll - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,rollDiceState); - assertEquals(rollDiceState.getCurrentState() ,secondRollState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), rollDiceState); + assertEquals(rollDiceState.getCurrentState(), secondRollState); } /** @@ -824,27 +817,27 @@ public void testFirstRollToSecondRoll() { public void testSecondRollToRollDiceEndState() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in RollDice turnState.setCurrentState(rollDiceState); - assertEquals(turnState.getCurrentState() ,rollDiceState); + assertEquals(turnState.getCurrentState(), rollDiceState); //sends the RollDiceState in SecondRoll - rollDiceState.setCurrentState(secondRoll); - assertEquals(rollDiceState.getCurrentState() ,secondRollState); + rollDiceState.setCurrentState(secondRollState); + assertEquals(rollDiceState.getCurrentState(), secondRollState); //Todo //tests if the server is in NoPiece of ChoosePiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); } /** @@ -855,27 +848,27 @@ public void testSecondRollToRollDiceEndState() { public void testSecondRollToThirdRoll() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in RollDice turnState.setCurrentState(rollDiceState); - assertEquals(turnState.getCurrentState() ,rollDiceState); + assertEquals(turnState.getCurrentState(), rollDiceState); //sends the RollDiceState in SecondRoll - rollDiceState.setCurrentState(secondRoll); - assertEquals(rollDiceState.getCurrentState() ,secondRollState); + rollDiceState.setCurrentState(secondRollState); + assertEquals(rollDiceState.getCurrentState(), secondRollState); //Todo player has no figures to move and had no 6 //tests if the server is in the ThirdRoll - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,rollDiceState); - assertEquals(rollDiceState.getCurrentState() ,thirdRollState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), rollDiceState); + assertEquals(rollDiceState.getCurrentState(), thirdRollState); } /** @@ -886,27 +879,27 @@ public void testSecondRollToThirdRoll() { public void testThirdRollToRollDiceEndState() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in RollDice turnState.setCurrentState(rollDiceState); - assertEquals(turnState.getCurrentState() ,rollDiceState); + assertEquals(turnState.getCurrentState(), rollDiceState); //sends the RollDiceState in ThirdRoll - rollDiceState.setCurrentState(thirdRoll); - assertEquals(rollDiceState.getCurrentState() ,thirdRollState); + rollDiceState.setCurrentState(thirdRollState); + assertEquals(rollDiceState.getCurrentState(), thirdRollState); //Todo //tests if the server is in NoPiece of ChoosePiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); } /** @@ -917,19 +910,19 @@ public void testThirdRollToRollDiceEndState() { public void testThirdRollToTurnEndState() { //sends the server in Game-State serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the gameState in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the TurnState in RollDice turnState.setCurrentState(rollDiceState); - assertEquals(turnState.getCurrentState() ,rollDiceState); + assertEquals(turnState.getCurrentState(), rollDiceState); //sends the RollDiceState in ThirdRoll - rollDiceState.setCurrentState(thirdRoll); - assertEquals(rollDiceState.getCurrentState() ,thirdRollState); + rollDiceState.setCurrentState(thirdRollState); + assertEquals(rollDiceState.getCurrentState(), thirdRollState); //Todo } @@ -942,28 +935,27 @@ public void testThirdRollToTurnEndState() { public void testNoPieceToWaitingPiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in NoPiece - choosePieceState.setCurrentState(noPiece); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + choosePieceState.setCurrentState(noPieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); //TODO //tests if the server is in WaitingPiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,waitingPieceState); - + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), waitingPieceState); } /** @@ -974,27 +966,27 @@ public void testNoPieceToWaitingPiece() { public void testNoPieceToNoTurn() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in NoPiece - choosePieceState.setCurrentState(noPiece); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + choosePieceState.setCurrentState(noPieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); //TODO //tests if the server is in NoTurn - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,noTurnState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), noTurnState); } /** @@ -1005,19 +997,19 @@ public void testNoPieceToNoTurn() { public void testNoTurnToTurnEndState() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in NoTurn choosePieceState.setCurrentState(noTurnState); - assertEquals(choosePieceState.getCurrentState() ,noTurnState); + assertEquals(choosePieceState.getCurrentState(), noTurnState); //TODO } @@ -1030,27 +1022,27 @@ public void testNoTurnToTurnEndState() { public void testStayInWaitingPiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in WaitingPiece - choosePieceState.setCurrentState(waitingPiece); - assertEquals(choosePieceState.getCurrentState() ,waitingPieceState); + choosePieceState.setCurrentState(waitingPieceState); + assertEquals(choosePieceState.getCurrentState(), waitingPieceState); //TODO //tests if the server is in WaitingPiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,waitingPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), waitingPieceState); } /** @@ -1061,19 +1053,19 @@ public void testStayInWaitingPiece() { public void testWaitingPieceToMovePiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in WaitingPiece - choosePieceState.setCurrentState(waitingPiece); - assertEquals(choosePieceState.getCurrentState() ,waitingPieceState); + choosePieceState.setCurrentState(waitingPieceState); + assertEquals(choosePieceState.getCurrentState(), waitingPieceState); //TODO } @@ -1086,27 +1078,27 @@ public void testWaitingPieceToMovePiece() { public void testNoPieceToSelectPiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in NoPiece - choosePieceState.setCurrentState(noPiece); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + choosePieceState.setCurrentState(noPieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); //TODO //tests if the server is in SelectPiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,selectPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), selectPieceState); } /** @@ -1117,27 +1109,27 @@ public void testNoPieceToSelectPiece() { public void testNoPieceToStartPiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in NoPiece - choosePieceState.setCurrentState(noPiece); - assertEquals(choosePieceState.getCurrentState() ,noPieceState); + choosePieceState.setCurrentState(noPieceState); + assertEquals(choosePieceState.getCurrentState(), noPieceState); //TODO //tests if the server is in StartPiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,startPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), startPieceState); } /** @@ -1148,27 +1140,27 @@ public void testNoPieceToStartPiece() { public void testStayInSelectPiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in SelectPiece - choosePieceState.setCurrentState(selectPiece); - assertEquals(choosePieceState.getCurrentState() ,selectPieceState); + choosePieceState.setCurrentState(selectPieceState); + assertEquals(choosePieceState.getCurrentState(), selectPieceState); //TODO //tests if the server is in SelectPiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,selectPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), selectPieceState); } /** @@ -1179,26 +1171,26 @@ public void testStayInSelectPiece() { public void testSelectPieceToMovePiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in SelectPiece - choosePieceState.setCurrentState(selectPiece); - assertEquals(choosePieceState.getCurrentState() ,selectPieceState); + choosePieceState.setCurrentState(selectPieceState); + assertEquals(choosePieceState.getCurrentState(), selectPieceState); //TODO //tests if the server is in movePiece-state - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,movePieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), movePieceState); } /** @@ -1209,27 +1201,27 @@ public void testSelectPieceToMovePiece() { public void testStayInStartPiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in StartPiece - choosePieceState.setCurrentState(startPiece); - assertEquals(choosePieceState.getCurrentState() ,startPieceState); + choosePieceState.setCurrentState(startPieceState); + assertEquals(choosePieceState.getCurrentState(), startPieceState); //TODO //tests if the server is in StartPiece - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,choosePieceState); - assertEquals(choosePieceState.getCurrentState() ,startPieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), choosePieceState); + assertEquals(choosePieceState.getCurrentState(), startPieceState); } /** @@ -1240,25 +1232,25 @@ public void testStayInStartPiece() { public void testStartPieceToMovePiece() { //sends the server in GameState serverGameLogic.setCurrentState(gameState); - assertEquals(serverGameLogic.getCurrentState() ,gameState); + assertEquals(serverGameLogic.getCurrentState(), gameState); //sends the server in Turn gameState.setCurrentState(turnState); - assertEquals(gameState.getCurrentState() ,turnState); + assertEquals(gameState.getCurrentState(), turnState); //sends the server in ChoosePiece turnState.setCurrentState(choosePieceState); - assertEquals(turnState.getCurrentState() ,choosePieceState); + assertEquals(turnState.getCurrentState(), choosePieceState); //sends the server in StartPiece - choosePieceState.setCurrentState(startPiece); - assertEquals(choosePieceState.getCurrentState() ,startPieceState); + choosePieceState.setCurrentState(startPieceState); + assertEquals(choosePieceState.getCurrentState(), startPieceState); //TODO //tests if the server is in movePiece-state - assertEquals(serverGameLogic.getCurrentState() ,gameState); - assertEquals(gameState.getCurrentState() ,turnState); - assertEquals(turnState.getCurrentState() ,movePieceState); + assertEquals(serverGameLogic.getCurrentState(), gameState); + assertEquals(gameState.getCurrentState(), turnState); + assertEquals(turnState.getCurrentState(), movePieceState); } }