Programmiermethoden_und_-werkzeuge
/
2023-2-WS_group_project_onses
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

refactoring: remove unused Player in playCard

main
fdai7920 11 months ago
parent
620b82e202
commit
41e204ca54
2 changed files with 7 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/main/java/de/hsfulda/onses/services/GameService.java
  2. 13
      src/test/java/de/hsfulda/onses/GameServiceTest.java

2
src/main/java/de/hsfulda/onses/services/GameService.java
View File

@ -40,7 +40,7 @@ public class GameService {
nextPlayer(); nextPlayer();
} }
} }
public void playCard(Player player, Card card)
public void playCard(Card card)
{ {
// add lastPlayedCard back to drawCardDeck // add lastPlayedCard back to drawCardDeck
game.setLastPlayedCard(card); game.setLastPlayedCard(card);

13
src/test/java/de/hsfulda/onses/GameServiceTest.java
View File

@ -1,7 +1,6 @@
package de.hsfulda.onses; package de.hsfulda.onses;
import de.hsfulda.onses.models.Game;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@ -18,7 +17,7 @@ public class GameServiceTest {
Card input = new Card().setColor(Card.Color.RED).setValue(Card.Value.EIGHT); Card input = new Card().setColor(Card.Color.RED).setValue(Card.Value.EIGHT);
// act // act
GameService gameService = new GameService(); GameService gameService = new GameService();
gameService.playCard(new Player(), input);
gameService.playCard(input);
Card answer = gameService.getGame().getLastPlayedCard(); Card answer = gameService.getGame().getLastPlayedCard();
// assert // assert
assertEquals(input, answer); assertEquals(input, answer);
@ -30,7 +29,7 @@ public class GameServiceTest {
Card input = new Card().setColor(Card.Color.BLACK).setValue(Card.Value.CHOOSE); Card input = new Card().setColor(Card.Color.BLACK).setValue(Card.Value.CHOOSE);
// act // act
GameService gameService = new GameService(); GameService gameService = new GameService();
gameService.playCard(new Player(), input);
gameService.playCard(input);
Card answer = gameService.getGame().getLastPlayedCard(); Card answer = gameService.getGame().getLastPlayedCard();
// assert // assert
assertEquals(input, answer); assertEquals(input, answer);
@ -192,7 +191,7 @@ public class GameServiceTest {
GameService gameservice = new GameService(); GameService gameservice = new GameService();
boolean expected = gameservice.getGame().getPlayerService().getCurrentTurn(); boolean expected = gameservice.getGame().getPlayerService().getCurrentTurn();
gameservice.playCard(new Player(), new Card().setValue(Card.Value.SKIP).setColor(Card.Color.BLACK));
gameservice.playCard(new Card().setValue(Card.Value.SKIP).setColor(Card.Color.BLACK));
assertEquals(expected, gameservice.getGame().getPlayerService().getCurrentTurn()); assertEquals(expected, gameservice.getGame().getPlayerService().getCurrentTurn());
} }
@ -204,7 +203,7 @@ public class GameServiceTest {
GameService gameservice = new GameService(); GameService gameservice = new GameService();
boolean expected = gameservice.getGame().getPlayerService().getCurrentTurn(); boolean expected = gameservice.getGame().getPlayerService().getCurrentTurn();
gameservice.playCard(new Player(), new Card().setValue(Card.Value.REVERSE).setColor(Card.Color.BLACK));
gameservice.playCard(new Card().setValue(Card.Value.REVERSE).setColor(Card.Color.BLACK));
assertEquals(expected, gameservice.getGame().getPlayerService().getCurrentTurn()); assertEquals(expected, gameservice.getGame().getPlayerService().getCurrentTurn());
} }
@ -217,7 +216,7 @@ public class GameServiceTest {
boolean expected = true; boolean expected = true;
boolean answer = false; boolean answer = false;
gameservice.playCard(new Player(), new Card().setValue(Card.Value.CHOOSE).setColor(Card.Color.BLACK));
gameservice.playCard(new Card().setValue(Card.Value.CHOOSE).setColor(Card.Color.BLACK));
if (gameservice.getGame().getLastPlayedCard().getColor() != Card.Color.BLACK) { if (gameservice.getGame().getLastPlayedCard().getColor() != Card.Color.BLACK) {
answer = true; answer = true;
@ -235,7 +234,7 @@ public class GameServiceTest {
boolean expected = true; boolean expected = true;
boolean answer = false; boolean answer = false;
gameservice.playCard(new Player(), new Card().setValue(Card.Value.CHOOSEDRAW).setColor(Card.Color.BLACK));
gameservice.playCard(new Card().setValue(Card.Value.CHOOSEDRAW).setColor(Card.Color.BLACK));
if (gameservice.getGame().getLastPlayedCard().getColor() != Card.Color.BLACK) { if (gameservice.getGame().getLastPlayedCard().getColor() != Card.Color.BLACK) {
answer = true; answer = true;

Write Preview
Loading…
Cancel
Save