From 41e204ca544c56d97bc1b171eb43d053c3c8bfe5 Mon Sep 17 00:00:00 2001 From: fdai7920 Date: Sat, 3 Feb 2024 00:49:50 +0100 Subject: [PATCH] refactoring: remove unused Player in playCard --- .../java/de/hsfulda/onses/services/GameService.java | 2 +- src/test/java/de/hsfulda/onses/GameServiceTest.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/hsfulda/onses/services/GameService.java b/src/main/java/de/hsfulda/onses/services/GameService.java index 92dd8cb..2e9424b 100644 --- a/src/main/java/de/hsfulda/onses/services/GameService.java +++ b/src/main/java/de/hsfulda/onses/services/GameService.java @@ -40,7 +40,7 @@ public class GameService { nextPlayer(); } } - public void playCard(Player player, Card card) + public void playCard(Card card) { // add lastPlayedCard back to drawCardDeck game.setLastPlayedCard(card); diff --git a/src/test/java/de/hsfulda/onses/GameServiceTest.java b/src/test/java/de/hsfulda/onses/GameServiceTest.java index cf6cf3b..81ab433 100644 --- a/src/test/java/de/hsfulda/onses/GameServiceTest.java +++ b/src/test/java/de/hsfulda/onses/GameServiceTest.java @@ -1,7 +1,6 @@ package de.hsfulda.onses; -import de.hsfulda.onses.models.Game; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; 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); // act GameService gameService = new GameService(); - gameService.playCard(new Player(), input); + gameService.playCard(input); Card answer = gameService.getGame().getLastPlayedCard(); // assert assertEquals(input, answer); @@ -30,7 +29,7 @@ public class GameServiceTest { Card input = new Card().setColor(Card.Color.BLACK).setValue(Card.Value.CHOOSE); // act GameService gameService = new GameService(); - gameService.playCard(new Player(), input); + gameService.playCard(input); Card answer = gameService.getGame().getLastPlayedCard(); // assert assertEquals(input, answer); @@ -192,7 +191,7 @@ public class GameServiceTest { GameService gameservice = new GameService(); 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()); } @@ -204,7 +203,7 @@ public class GameServiceTest { GameService gameservice = new GameService(); 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()); } @@ -217,7 +216,7 @@ public class GameServiceTest { boolean expected = true; 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) { answer = true; @@ -235,7 +234,7 @@ public class GameServiceTest { boolean expected = true; 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) { answer = true;