peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge tests into development #25

Closed
j23f0712 wants to merge 24 commits from dev/test into development
pull from: dev/test
merge into: peet:development
Conversation 1 Commits 24 Files Changed 3 +41 -45
1 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ecf1cc6e9a - Show all commits

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

@@ -1,6 +1,8 @@
package pp.mdga.server.serverState; package pp.mdga.server.serverState;
import org.junit.*; 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.BonusCard;
import pp.mdga.game.Color; import pp.mdga.game.Color;
import pp.mdga.game.Game; import pp.mdga.game.Game;
@@ -25,29 +27,27 @@ public class ServerStateTest {
//declare client-messages here //declare client-messages here
private ServerGameLogic serverGameLogic; private ServerGameLogic serverGameLogic;
private AnimationEnd animationEnd; private AnimationEndMessage animationEnd;
private ClientStartGame clientStartGame; private ClientStartGameMessage clientStartGame;
private DeselectTSK deselectTSK; private DeselectTSKMessage deselectTSK;
private ForceContinueGame forceContinueGame; private ForceContinueGameMessage forceContinueGame;
private StartGame forceStartGame; private StartGameMessage forceStartGame;
private JoinServer joinServer; private JoinServerMessage joinServer;
private LeaveGame leaveGame; private LeaveGameMessage leaveGame;
private LobbyNotReady lobbyNotReady; private LobbyNotReadyMessage lobbyNotReady;
private LobbyReady lobbyReady; private LobbyReadyMessage lobbyReady;
private NoPowerCard noPowerCard; private NoPowerCardMessage noPowerCard;
private RequestBriefing requestBriefing; private RequestBriefingMessage requestBriefing;
private RequestDie requestDice; private RequestDieMessage requestDice;
private RequestMove requestMove; private RequestMoveMessage requestMove;
private RequestPlayCard requestPlayCard; private RequestPlayCardMessage requestPlayCard;
private SelectCard selectCard; private SelectCardMessage selectCard;
private SelectedPieces selectedPieces; private SelectedPiecesMessage selectedPieces;
private SelectTSK selectTSK; private SelectTSKMessage selectTSK;
private Disconnected disconnect; private DisconnectedMessage disconnect;
//declare state-machines here //declare state-machines here
private CeremonyState ceremonyState;
private GameState gameState;
private ServerState serverState;
//TODO: interrupt and lobby are no state-machines //TODO: interrupt and lobby are no state-machines
//declare states here //declare states here
@@ -59,14 +59,11 @@ public class ServerStateTest {
private int from; private int from;
private int fromHost; 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 //TODO declare the states here
private Animation animation; private AnimationState animation;
private CeremonyState ceremonyState; private CeremonyState ceremonyState;
private ChoosePieceState choosePieceState; private ChoosePieceState choosePieceState;
private DetermineStartPlayerState determineStartPlayerState; private DetermineStartPlayerState determineStartPlayerState;
@@ -77,7 +74,7 @@ public class ServerStateTest {
private MovePieceState movePieceState; private MovePieceState movePieceState;
private NoPieceState noPiece; private NoPieceState noPiece;
private NoTurnState noTurnState; private NoTurnState noTurnState;
private PlayPowerCard playPowerCard; private PlayPowerCardState playPowerCard;
private PowerCardState powerCardState; private PowerCardState powerCardState;
private RollDiceState rollDiceState; private RollDiceState rollDiceState;
private SecondRollState secondRoll; private SecondRollState secondRoll;
@@ -107,33 +104,32 @@ public void broadcast(ServerMessage message) {
} }
}, game); }, game);
animationEnd = new AnimationEnd(); animationEnd = new AnimationEndMessage();
clientStartGame = new ClientStartGame(); clientStartGame = new ClientStartGameMessage();
deselectTSK = new DeselectTSK(); deselectTSK = new DeselectTSKMessage();
forceContinueGame = new ForceContinueGame(); forceContinueGame = new ForceContinueGameMessage();
forceStartGame = new StartGame(); forceStartGame = new StartGameMessage();
joinServer = new JoinServer(); joinServer = new JoinServerMessage();
leaveGame = new LeaveGame(); leaveGame = new LeaveGameMessage();
lobbyReady = new LobbyReady(); lobbyReady = new LobbyReadyMessage();
noPowerCard = new NoPowerCard(); noPowerCard = new NoPowerCardMessage();
requestBriefing = new RequestBriefing(); requestBriefing = new RequestBriefingMessage();
requestDice = new RequestDie(); requestDice = new RequestDieMessage();
requestMove = new RequestMove(); requestMove = new RequestMoveMessage("www");//todo
requestPlayCard = new RequestPlayCard(); requestPlayCard = new RequestPlayCardMessage(BonusCard.SHIELD,"www","www");//Todo
selectCard = new SelectCard(BonusCard.SHIELD); //TODO selectCard = new SelectCardMessage(BonusCard.SHIELD); //TODO
selectedPieces = new SelectedPieces("www"); //TODO selectedPieces = new SelectedPiecesMessage("www"); //TODO
selectTSK = new SelectTSK(Color.ARMY); //TODO selectTSK = new SelectTSKMessage(Color.ARMY); //TODO
from = 1234; from = 1234;
fromHost = 2345; fromHost = 2345;
//initialize the state-machines here //initialize the state-machines here
choosePieceState = choosePieceState.getChoosePieceMachine(); choosePieceState = choosePieceState.getChoosePieceMachine();
rollDiceMachine = rollDiceState.getRollDicemachine();
turnState = turnState.getTurnStatemachine(); turnState = turnState.getTurnStatemachine();
gameState = gameState.getGameStatemachine(); gameState = gameState.getGameStatemachine();
thirdRoll = rollDiceState.getThridRollState(); thirdRoll = rollDiceState.getThirdRollState();
secondRoll = rollDiceState.getSecondRollState(); secondRoll = rollDiceState.getSecondRollState();
firstRollState = rollDiceState.getThirdRollState(); firstRollState = rollDiceState.getThirdRollState();