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 +49 -9
1 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d0361b2759 - Show all commits

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

@@ -308,7 +308,7 @@ public void testClientGameToCeremony() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn); clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);
@@ -968,7 +968,7 @@ public void testStayInPlayPowerCard() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn); clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);
@@ -1023,7 +1023,7 @@ public void testPlayPowerCardToRollDice() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn); clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);
@@ -1086,7 +1086,7 @@ public void testStayInRollDice() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
//clientGameLogic.received(noTurn); //clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);
@@ -1770,7 +1770,7 @@ public void testStayInStartPiece() {
} }
/** /**
* UC-ClientState-57: Test the StartPiece to ChoosePiece end state. * UC-ClientState-57: Test the StartPiece to ChoosePiece-end-state.
*/ */
@Test @Test
public void testStartPieceToChoosePieceEndState() { public void testStartPieceToChoosePieceEndState() {
@@ -1790,8 +1790,48 @@ public void testStartPieceToChoosePieceEndState() {
choosePiece.setState(startPiece); choosePiece.setState(startPiece);
assertEquals(choosePiece.getState(), startPiece); assertEquals(choosePiece.getState(), startPiece);
//Todo send the message which force a state change //send the message that don't indicate a statechange
clientGameLogic.received(activePlayer);
clientGameLogic.received(anyPiece);
clientGameLogic.received(briefing);
clientGameLogic.received(ceremonyMessage);
clientGameLogic.received(die);
clientGameLogic.received(diceAgain);
clientGameLogic.received(diceNow);
clientGameLogic.received(endOfTurn);
clientGameLogic.received(lobbyAccept);
clientGameLogic.received(lobbyDeny);
clientGameLogic.received(lobbyPlayerJoin);
clientGameLogic.received(lobbyPlayerLeave);
//clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn);
//clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo);
clientGameLogic.received(possibleCard);
clientGameLogic.received(possiblePiece);
clientGameLogic.received(rankingResponce);
clientGameLogic.received(rankingRollAgain);
clientGameLogic.received(reconnectBriefing);
clientGameLogic.received(resumeGame);
clientGameLogic.received(startGame);
clientGameLogic.received(startPieceMessage);
clientGameLogic.received(updateReady);
clientGameLogic.received(updateTSK);
clientGameLogic.received(waitPiece);
clientGameLogic.received(spectatorMessage);
//tests if the client ist still in StartPiece
assertEquals(clientGameLogic.getState(), gameState);
assertEquals(gameState.getState(), turnState);
assertEquals(turnState.getState(), choosePiece);
assertEquals(choosePiece.getState(), startPiece);
//send MovePieceMessage
clientGameLogic.received(moveMessage);
//tests if the client is in the movePiece-state
assertEquals(clientGameLogic.getState(), gameState); assertEquals(clientGameLogic.getState(), gameState);
assertEquals(gameState.getState(), turnState); assertEquals(gameState.getState(), turnState);
assertEquals(turnState.getState(), movePiece); assertEquals(turnState.getState(), movePiece);
@@ -1829,7 +1869,7 @@ public void testRollRankingDiceToWaitRanking() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn); clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);
@@ -1892,7 +1932,7 @@ public void testWaitRankingToRollRankingDice() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn); clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);
@@ -1955,7 +1995,7 @@ public void testWaitRankingToEndStateDetermineStartingPlayer() {
clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(lobbyPlayerLeave);
clientGameLogic.received(moveMessage); clientGameLogic.received(moveMessage);
clientGameLogic.received(noTurn); clientGameLogic.received(noTurn);
clientGameLogic.received(interruptMessage); //clientGameLogic.received(interruptMessage);
clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardSwap);
clientGameLogic.received(playCardShield); clientGameLogic.received(playCardShield);
clientGameLogic.received(playCardTurbo); clientGameLogic.received(playCardTurbo);