From ecf1cc6e9a02b541b3294d2171d87a934995e34e Mon Sep 17 00:00:00 2001 From: Benjamin Feyer Date: Thu, 28 Nov 2024 18:53:32 +0100 Subject: [PATCH] push after merge --- .../server/serverState/ServerStateTest.java | 86 +++++++++---------- 1 file changed, 41 insertions(+), 45 deletions(-) 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 91320335..27cf4dc9 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,6 +1,8 @@ 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; @@ -25,29 +27,27 @@ public class ServerStateTest { //declare client-messages here private ServerGameLogic serverGameLogic; - private AnimationEnd animationEnd; - private ClientStartGame clientStartGame; - private DeselectTSK deselectTSK; - private ForceContinueGame forceContinueGame; - private StartGame forceStartGame; - private JoinServer joinServer; - private LeaveGame leaveGame; - private LobbyNotReady lobbyNotReady; - private LobbyReady lobbyReady; - private NoPowerCard noPowerCard; - private RequestBriefing requestBriefing; - private RequestDie requestDice; - private RequestMove requestMove; - private RequestPlayCard requestPlayCard; - private SelectCard selectCard; - private SelectedPieces selectedPieces; - private SelectTSK selectTSK; - private Disconnected disconnect; + private AnimationEndMessage animationEnd; + private ClientStartGameMessage clientStartGame; + private DeselectTSKMessage deselectTSK; + private ForceContinueGameMessage forceContinueGame; + private StartGameMessage forceStartGame; + private JoinServerMessage joinServer; + private LeaveGameMessage leaveGame; + private LobbyNotReadyMessage lobbyNotReady; + private LobbyReadyMessage lobbyReady; + private NoPowerCardMessage noPowerCard; + private RequestBriefingMessage requestBriefing; + private RequestDieMessage requestDice; + private RequestMoveMessage requestMove; + private RequestPlayCardMessage requestPlayCard; + private SelectCardMessage selectCard; + private SelectedPiecesMessage selectedPieces; + private SelectTSKMessage selectTSK; + private DisconnectedMessage disconnect; //declare state-machines here - private CeremonyState ceremonyState; - private GameState gameState; - private ServerState serverState; + //TODO: interrupt and lobby are no state-machines //declare states here @@ -59,14 +59,11 @@ public class ServerStateTest { private int from; private int fromHost; - //Todo declare stateMachines here - private CeremonyState gameState; - private TurnState turnState; //TODO move turnstate in automaton - private RollDiceState rollDiceMachine; //TODO move turnstate in automaton + //TODO declare the states here - private Animation animation; + private AnimationState animation; private CeremonyState ceremonyState; private ChoosePieceState choosePieceState; private DetermineStartPlayerState determineStartPlayerState; @@ -77,7 +74,7 @@ public class ServerStateTest { private MovePieceState movePieceState; private NoPieceState noPiece; private NoTurnState noTurnState; - private PlayPowerCard playPowerCard; + private PlayPowerCardState playPowerCard; private PowerCardState powerCardState; private RollDiceState rollDiceState; private SecondRollState secondRoll; @@ -107,33 +104,32 @@ public void broadcast(ServerMessage message) { } }, game); - animationEnd = new AnimationEnd(); - clientStartGame = new ClientStartGame(); - deselectTSK = new DeselectTSK(); - forceContinueGame = new ForceContinueGame(); - forceStartGame = new StartGame(); - joinServer = new JoinServer(); - leaveGame = new LeaveGame(); - lobbyReady = new LobbyReady(); - noPowerCard = new NoPowerCard(); - requestBriefing = new RequestBriefing(); - requestDice = new RequestDie(); - requestMove = new RequestMove(); - requestPlayCard = new RequestPlayCard(); - selectCard = new SelectCard(BonusCard.SHIELD); //TODO - selectedPieces = new SelectedPieces("www"); //TODO - selectTSK = new SelectTSK(Color.ARMY); //TODO + animationEnd = new AnimationEndMessage(); + clientStartGame = new ClientStartGameMessage(); + deselectTSK = new DeselectTSKMessage(); + forceContinueGame = new ForceContinueGameMessage(); + forceStartGame = new StartGameMessage(); + joinServer = new JoinServerMessage(); + leaveGame = new LeaveGameMessage(); + lobbyReady = new LobbyReadyMessage(); + noPowerCard = new NoPowerCardMessage(); + requestBriefing = new RequestBriefingMessage(); + requestDice = new RequestDieMessage(); + requestMove = new RequestMoveMessage("www");//todo + requestPlayCard = new RequestPlayCardMessage(BonusCard.SHIELD,"www","www");//Todo + selectCard = new SelectCardMessage(BonusCard.SHIELD); //TODO + selectedPieces = new SelectedPiecesMessage("www"); //TODO + selectTSK = new SelectTSKMessage(Color.ARMY); //TODO from = 1234; fromHost = 2345; //initialize the state-machines here choosePieceState = choosePieceState.getChoosePieceMachine(); - rollDiceMachine = rollDiceState.getRollDicemachine(); turnState = turnState.getTurnStatemachine(); gameState = gameState.getGameStatemachine(); - thirdRoll = rollDiceState.getThridRollState(); + thirdRoll = rollDiceState.getThirdRollState(); secondRoll = rollDiceState.getSecondRollState(); firstRollState = rollDiceState.getThirdRollState();