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

fixed some tests

Browse Source
This commit is contained in:
Benjamin Feyer
2024-12-10 21:18:31 +01:00
parent cc756453a1
commit 9e2a0819ca
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Projekte/mdga/model/src/test/java/pp/mdga/game/PieceTest.java
View File

@@ -151,12 +151,14 @@ public void shutdown() {
//declare player-Client here //declare player-Client here
playerClient = new Player(nameClient); playerClient = new Player(nameClient);
playerClient.initialize();
clientColor = Color.ARMY; clientColor = Color.ARMY;
playerClient.setColor(clientColor); playerClient.setColor(clientColor);
game.addPlayer(IDClient, playerClient); game.addPlayer(IDClient, playerClient);
//declare player-host here //declare player-host here
playerHost = new Player(nameHost); playerHost = new Player(nameHost);
playerHost.initialize();
hostColor = Color.NAVY; hostColor = Color.NAVY;
playerHost.setColor(hostColor); playerHost.setColor(hostColor);
game.addPlayer(IDHost, playerHost); game.addPlayer(IDHost, playerHost);
@@ -164,6 +166,7 @@ public void shutdown() {
//declare playerCyber here //declare playerCyber here
nameCyber = "Cyber"; nameCyber = "Cyber";
playerCyber = new Player(nameCyber); playerCyber = new Player(nameCyber);
playerCyber.initialize();
cyberColor = Color.CYBER; cyberColor = Color.CYBER;
playerCyber.setColor(cyberColor); playerCyber.setColor(cyberColor);
game.addPlayer(IDCyber, playerCyber); game.addPlayer(IDCyber, playerCyber);
@@ -873,6 +876,9 @@ public void testOnlyEnterOwnHouse() {
*/ */
@Test @Test
public void testActiveHomePiece() { public void testActiveHomePiece() {
//set activePlayer to client
game.setActiveColor(clientColor);
//sends the server in firstRoll //sends the server in firstRoll
serverGameLogic.setCurrentState(gameState); serverGameLogic.setCurrentState(gameState);
gameState.setCurrentState(turnState); gameState.setCurrentState(turnState);
@@ -885,8 +891,7 @@ public void testActiveHomePiece() {
assertEquals(turnState.getCurrentState(),rollDiceState); assertEquals(turnState.getCurrentState(),rollDiceState);
assertEquals(rollDiceState.getCurrentState(),firstRollState); assertEquals(rollDiceState.getCurrentState(),firstRollState);
//set activePlayer to client
game.setActiveColor(clientColor);
//set the die in Game to 2 //set the die in Game to 2
game.setDie(die2); game.setDie(die2);

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

@@ -107,12 +107,15 @@ public void setUp() {
game = new Game(); game = new Game();
//initialize two players //initialize two players
playerHost = new Player("Host"); playerHost = new Player("Host");
playerHost.initialize();
IDPlayerHost = 1; IDPlayerHost = 1;
playerHostColor = Color.CYBER; playerHostColor = Color.CYBER;
playerHost.setColor(playerHostColor); playerHost.setColor(playerHostColor);
game.addPlayer(IDPlayerHost, playerHost); game.addPlayer(IDPlayerHost, playerHost);
playerClient = new Player("Client"); playerClient = new Player("Client");
playerClient.initialize();
IDPlayerClient = 2; IDPlayerClient = 2;
playerClientColor = Color.ARMY; playerClientColor = Color.ARMY;
playerClient.setColor(playerClientColor); playerClient.setColor(playerClientColor);
@@ -157,9 +160,9 @@ public void shutdown() {
pieceHome1 = new Piece(playerClientColor, PieceState.HOMEFINISHED); pieceHome1 = new Piece(playerClientColor, PieceState.HOMEFINISHED);
pieceHome2 = new Piece(playerClientColor, PieceState.HOMEFINISHED); pieceHome2 = new Piece(playerClientColor, PieceState.HOMEFINISHED);
pieceHome3 = new Piece(playerClientColor, PieceState.HOMEFINISHED); pieceHome3 = new Piece(playerClientColor, PieceState.HOMEFINISHED);
game.getPlayers().get(playerClientColor).setPieceInHome(1, pieceHome1); game.getPlayerByColor(playerClientColor).setPieceInHome(1, pieceHome1);
game.getPlayers().get(playerClientColor).setPieceInHome(2, pieceHome2); game.getPlayerByColor(playerClientColor).setPieceInHome(2, pieceHome2);
game.getPlayers().get(playerClientColor).setPieceInHome(3, pieceHome3); game.getPlayerByColor(playerClientColor).setPieceInHome(3, pieceHome3);
//initialize the powerCard //initialize the powerCard
bonusCardClient = new PowerCard() { bonusCardClient = new PowerCard() {
@@ -425,6 +428,8 @@ public void testCeremonyToServerStateEndState() {
/** /**
* this method tests that the server stays in DetermineStartPlayer, when issued messages * this method tests that the server stays in DetermineStartPlayer, when issued messages
*
* serverStateTest 10
*/ */
@Test @Test
public void testDetermineStartPlayerToDetermineStartPlayer1() { public void testDetermineStartPlayerToDetermineStartPlayer1() {
@@ -462,6 +467,8 @@ public void testDetermineStartPlayerToDetermineStartPlayer1() {
/** /**
* this method tests that the server stays in DetermineStartPlayer, when all players are ranked and two of the highest are even * this method tests that the server stays in DetermineStartPlayer, when all players are ranked and two of the highest are even
*
* serverStateTest 11
*/ */
@Test @Test
public void testDetermineStartPlayerToDetermineStartPlayer2() { public void testDetermineStartPlayerToDetermineStartPlayer2() {