From d8816be811a1012518f099070ebfdcf751062ae0 Mon Sep 17 00:00:00 2001 From: Benjamin Feyer Date: Wed, 11 Dec 2024 01:03:18 +0100 Subject: [PATCH] fixed some tests --- .../client/clientState/ClientStateTest.java | 70 ++++--------------- 1 file changed, 14 insertions(+), 56 deletions(-) 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 6c52d531..fe4b82bf 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 @@ -224,8 +224,9 @@ public void accept(Visitor visitor) { playCardShield = new PlayCardMessage(shieldCard, new ArrayList<>(List.of(ownPiece)), 1); playCardTurbo = new PlayCardMessage(turboCard, new ArrayList<>(List.of(ownPiece)),1); possibleCard = new PossibleCardsMessage(new ArrayList<>(List.of(swapCard,shieldCard,turboCard))); - possiblePieceShield = PossiblePieceMessage.shieldPossiblePieces(new ArrayList<>()); //TODO - possiblePieceSwap = PossiblePieceMessage.swapPossiblePieces(new ArrayList<>(), new ArrayList<>()); //TODO + possiblePieceShield = PossiblePieceMessage.shieldPossiblePieces(new ArrayList<>(List.of(ownPiece))); //TODO + possiblePieceSwap = PossiblePieceMessage.swapPossiblePieces(new ArrayList<>(List.of(ownPiece)), new ArrayList<>(List.of(enemyPiece))); //TODO + //todo possiblePieceSwap = new PossiblePieceMessage(new ArrayList<>(List.of(ownPiece)), new ArrayList<>(List.of(enemyPiece))); possiblePiece = new PossiblePieceMessage(); rankingResponse = new RankingResponseMessage(); rankingRollAgain = new RankingRollAgainMessage(); @@ -235,10 +236,10 @@ public void accept(Visitor visitor) { startPieceMessage = new StartPieceMessage(ownPiece.getUuid(),25); updateReady = new UpdateReadyMessage(2345, true); updateTSK = new UpdateTSKMessage(2345, Color.NAVY,false); - waitPiece = new WaitPieceMessage(); + waitPiece = new WaitPieceMessage(ownPiece.getUuid()); interruptMessage = new PauseGameMessage(); spectatorMessage = new SpectatorMessage(); - selectPieceMessage = new SelectPieceMessage(); + selectPieceMessage = new SelectPieceMessage(new ArrayList<>(List.of(ownPiece)),new ArrayList<>(List.of(false)), new ArrayList<>(List.of(25))); //initialize the client-state //sets the clientGameLogic-states @@ -855,11 +856,12 @@ public void testDetermineStartPlayerToWait() { clientGameLogic.received(activePlayer); clientGameLogic.selectAnimationEnd(); - //tests if the + //tests if the client is in the intro assertEquals(clientGameLogic.getState(), gameState); assertEquals(gameState.getState(), determineStartPlayer); assertEquals(determineStartPlayer.getState(),determineStartPlayer.getIntro()); + //todo //tests if the client is in the Wait-State assertEquals(clientGameLogic.getState(), gameState); @@ -1333,8 +1335,8 @@ public void testPowerCardSubStatesToPlayPowerCard() { assertEquals(turnState.getState(), powerCard); //sends the client in the ChoosePowerCard - powerCard.setState(choosePowerCard); - assertEquals(powerCard.getState(), swap); + powerCard.setState(shield); + assertEquals(powerCard.getState(), shield); //sends the playCardMessage clientGameLogic.received(playCardShield); @@ -1361,7 +1363,7 @@ public void testPowerCardSubStatesToPlayPowerCard() { //sends the client in the ChoosePowerCard powerCard.setState(choosePowerCard); - assertEquals(powerCard.getState(), shield); + assertEquals(powerCard.getState(), choosePowerCard); //sends the playCardMessage clientGameLogic.received(playCardShield); @@ -1481,10 +1483,8 @@ public void testPlayPowerCardToRollDice() { 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); @@ -1492,7 +1492,6 @@ public void testPlayPowerCardToRollDice() { clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(moveMessage); clientGameLogic.received(noTurn); - //clientGameLogic.received(interruptMessage); clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardShield); clientGameLogic.received(playCardTurbo); @@ -1545,8 +1544,6 @@ public void testStayInRollDice() { clientGameLogic.received(activePlayer); clientGameLogic.received(anyPiece); clientGameLogic.received(briefing); - clientGameLogic.received(ceremonyMessage); - //clientGameLogic.received(die); clientGameLogic.received(diceAgain); clientGameLogic.received(diceNow); clientGameLogic.received(endOfTurn); @@ -1555,8 +1552,6 @@ public void testStayInRollDice() { clientGameLogic.received(lobbyPlayerJoin); clientGameLogic.received(lobbyPlayerLeave); clientGameLogic.received(moveMessage); - //clientGameLogic.received(noTurn); - //clientGameLogic.received(interruptMessage); clientGameLogic.received(playCardSwap); clientGameLogic.received(playCardShield); clientGameLogic.received(playCardTurbo); @@ -1599,10 +1594,12 @@ public void testRollDiceToChoosePiece() { //sends the die-message clientGameLogic.received(die); + clientGameLogic.received(new ChoosePieceStateMessage()); //tests if the client is in ChoosePiece-state assertEquals(clientGameLogic.getState(), gameState); - assertEquals(gameState.getState(), choosePiece); + assertEquals(gameState.getState(), turnState); + assertEquals(turnState.getState(), choosePiece); assertEquals(choosePiece.getState(), noPiece); } @@ -1994,10 +1991,7 @@ public void testStayInShield() { 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); @@ -2051,10 +2045,7 @@ public void testShieldToPowerCardEndState() { 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); @@ -2156,7 +2147,6 @@ public void testNoPieceInWaitingPiece() { clientGameLogic.received(reconnectBriefing); clientGameLogic.received(resumeGame); clientGameLogic.received(startGame); - clientGameLogic.received(startPieceMessage); clientGameLogic.received(updateReady); clientGameLogic.received(updateTSK); clientGameLogic.received(spectatorMessage); @@ -2196,9 +2186,6 @@ public void testNoPieceInSelectedPiece() { clientGameLogic.received(anyPiece); clientGameLogic.received(briefing); clientGameLogic.received(die); - clientGameLogic.received(diceAgain); - clientGameLogic.received(diceNow); - clientGameLogic.received(endOfTurn); clientGameLogic.received(lobbyAccept); clientGameLogic.received(lobbyDeny); clientGameLogic.received(lobbyPlayerJoin); @@ -2214,12 +2201,9 @@ public void testNoPieceInSelectedPiece() { clientGameLogic.received(reconnectBriefing); clientGameLogic.received(resumeGame); clientGameLogic.received(startGame); - //clientGameLogic.received(startPieceMessage); clientGameLogic.received(updateReady); clientGameLogic.received(updateTSK); - //clientGameLogic.received(waitPiece); clientGameLogic.received(spectatorMessage); - //clientGameLogic.received(selectPieceMessage); //sends to the clientGameLogic the message SelectPiece clientGameLogic.received(selectPieceMessage); @@ -2255,18 +2239,12 @@ public void testNoPieceInStartPiece() { 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); @@ -2277,12 +2255,9 @@ public void testNoPieceInStartPiece() { clientGameLogic.received(reconnectBriefing); clientGameLogic.received(resumeGame); clientGameLogic.received(startGame); - //clientGameLogic.received(startPieceMessage); clientGameLogic.received(updateReady); clientGameLogic.received(updateTSK); - //clientGameLogic.received(waitPiece); clientGameLogic.received(spectatorMessage); - //clientGameLogic.received(selectPieceMessage); //sends to the clientGameLogic the message StartPiece clientGameLogic.received(startPieceMessage); @@ -2318,18 +2293,12 @@ public void testNoPieceInWait() { 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); @@ -2340,12 +2309,9 @@ public void testNoPieceInWait() { clientGameLogic.received(reconnectBriefing); clientGameLogic.received(resumeGame); clientGameLogic.received(startGame); - //clientGameLogic.received(startPieceMessage); clientGameLogic.received(updateReady); clientGameLogic.received(updateTSK); - //clientGameLogic.received(waitPiece); clientGameLogic.received(spectatorMessage); - //clientGameLogic.received(selectPieceMessage); //tests if the client is still in noPiece assertEquals(clientGameLogic.getState(), gameState); @@ -2354,7 +2320,7 @@ public void testNoPieceInWait() { assertEquals(choosePiece.getState(), noPiece); //sends to the clientGameLogic the message NoTurn - clientGameLogic.received(noTurn); + clientGameLogic.received(endOfTurn); assertEquals(clientGameLogic.getState(), gameState); assertEquals(gameState.getState(), waiting); @@ -2385,7 +2351,6 @@ public void testStayInWaitingPiece() { clientGameLogic.received(activePlayer); clientGameLogic.received(anyPiece); clientGameLogic.received(briefing); - clientGameLogic.received(ceremonyMessage); clientGameLogic.received(die); clientGameLogic.received(diceAgain); clientGameLogic.received(diceNow); @@ -2394,9 +2359,7 @@ public void testStayInWaitingPiece() { 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); @@ -2622,18 +2585,13 @@ public void testStartPieceToChoosePieceEndState() { 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);