fixed some tests
This commit is contained in:
		@@ -151,12 +151,14 @@ public void shutdown() {
 | 
			
		||||
 | 
			
		||||
        //declare player-Client here
 | 
			
		||||
        playerClient = new Player(nameClient);
 | 
			
		||||
        playerClient.initialize();
 | 
			
		||||
        clientColor = Color.ARMY;
 | 
			
		||||
        playerClient.setColor(clientColor);
 | 
			
		||||
        game.addPlayer(IDClient, playerClient);
 | 
			
		||||
 | 
			
		||||
        //declare player-host here
 | 
			
		||||
        playerHost = new Player(nameHost);
 | 
			
		||||
        playerHost.initialize();
 | 
			
		||||
        hostColor = Color.NAVY;
 | 
			
		||||
        playerHost.setColor(hostColor);
 | 
			
		||||
        game.addPlayer(IDHost, playerHost);
 | 
			
		||||
@@ -164,6 +166,7 @@ public void shutdown() {
 | 
			
		||||
        //declare playerCyber here
 | 
			
		||||
        nameCyber = "Cyber";
 | 
			
		||||
        playerCyber = new Player(nameCyber);
 | 
			
		||||
        playerCyber.initialize();
 | 
			
		||||
        cyberColor = Color.CYBER;
 | 
			
		||||
        playerCyber.setColor(cyberColor);
 | 
			
		||||
        game.addPlayer(IDCyber, playerCyber);
 | 
			
		||||
@@ -873,6 +876,9 @@ public void testOnlyEnterOwnHouse() {
 | 
			
		||||
     */
 | 
			
		||||
    @Test
 | 
			
		||||
    public void testActiveHomePiece() {
 | 
			
		||||
        //set activePlayer to client
 | 
			
		||||
        game.setActiveColor(clientColor);
 | 
			
		||||
 | 
			
		||||
        //sends the server in firstRoll
 | 
			
		||||
        serverGameLogic.setCurrentState(gameState);
 | 
			
		||||
        gameState.setCurrentState(turnState);
 | 
			
		||||
@@ -885,8 +891,7 @@ public void testActiveHomePiece() {
 | 
			
		||||
        assertEquals(turnState.getCurrentState(),rollDiceState);
 | 
			
		||||
        assertEquals(rollDiceState.getCurrentState(),firstRollState);
 | 
			
		||||
 | 
			
		||||
        //set activePlayer to client
 | 
			
		||||
        game.setActiveColor(clientColor);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        //set the die in Game to 2
 | 
			
		||||
        game.setDie(die2);
 | 
			
		||||
 
 | 
			
		||||
@@ -107,12 +107,15 @@ public void setUp() {
 | 
			
		||||
        game = new Game();
 | 
			
		||||
        //initialize two players
 | 
			
		||||
        playerHost = new Player("Host");
 | 
			
		||||
        playerHost.initialize();
 | 
			
		||||
        IDPlayerHost = 1;
 | 
			
		||||
        playerHostColor = Color.CYBER;
 | 
			
		||||
        playerHost.setColor(playerHostColor);
 | 
			
		||||
        game.addPlayer(IDPlayerHost, playerHost);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        playerClient = new Player("Client");
 | 
			
		||||
        playerClient.initialize();
 | 
			
		||||
        IDPlayerClient = 2;
 | 
			
		||||
        playerClientColor = Color.ARMY;
 | 
			
		||||
        playerClient.setColor(playerClientColor);
 | 
			
		||||
@@ -157,9 +160,9 @@ public void shutdown() {
 | 
			
		||||
        pieceHome1 = new Piece(playerClientColor, PieceState.HOMEFINISHED);
 | 
			
		||||
        pieceHome2 = new Piece(playerClientColor, PieceState.HOMEFINISHED);
 | 
			
		||||
        pieceHome3 = new Piece(playerClientColor, PieceState.HOMEFINISHED);
 | 
			
		||||
        game.getPlayers().get(playerClientColor).setPieceInHome(1, pieceHome1);
 | 
			
		||||
        game.getPlayers().get(playerClientColor).setPieceInHome(2, pieceHome2);
 | 
			
		||||
        game.getPlayers().get(playerClientColor).setPieceInHome(3, pieceHome3);
 | 
			
		||||
        game.getPlayerByColor(playerClientColor).setPieceInHome(1, pieceHome1);
 | 
			
		||||
        game.getPlayerByColor(playerClientColor).setPieceInHome(2, pieceHome2);
 | 
			
		||||
        game.getPlayerByColor(playerClientColor).setPieceInHome(3, pieceHome3);
 | 
			
		||||
 | 
			
		||||
        //initialize the powerCard
 | 
			
		||||
        bonusCardClient = new PowerCard() {
 | 
			
		||||
@@ -425,6 +428,8 @@ public void testCeremonyToServerStateEndState() {
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * this method tests that the server stays in DetermineStartPlayer, when issued messages
 | 
			
		||||
     *
 | 
			
		||||
     * serverStateTest 10
 | 
			
		||||
     */
 | 
			
		||||
    @Test
 | 
			
		||||
    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
 | 
			
		||||
     *
 | 
			
		||||
     * serverStateTest 11
 | 
			
		||||
     */
 | 
			
		||||
    @Test
 | 
			
		||||
    public void testDetermineStartPlayerToDetermineStartPlayer2() {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user