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

Merge branch 'Refactorings' into 'main' 

Refactorings

See merge request fdai7736/onses!18
main
fdai7920 11 months ago
parent
e4868bc32f 41e204ca54
commit
bec2f11f59
3 changed files with 18 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/main/java/de/hsfulda/onses/services/GameService.java
  2. 3
      src/main/java/de/hsfulda/onses/services/PlayerService.java
  3. 25
      src/test/java/de/hsfulda/onses/GameServiceTest.java

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

@ -36,8 +36,11 @@ public class GameService {
player.getPlayerDeck().add(game.getDrawCardDeck().getFirst());
game.getDrawCardDeck().removeFirst();
}
if (amount != 1) {
nextPlayer();
}
}
public void playCard(Player player, Card card)
public void playCard(Card card)
{
// add lastPlayedCard back to drawCardDeck
game.setLastPlayedCard(card);
@ -63,7 +66,6 @@ public class GameService {
if (card.getValue() == Card.Value.DRAWTWO) {
nextPlayer();
drawCard(2);
nextPlayer();
}
// ChooseDraw
if (card.getValue() == Card.Value.CHOOSEDRAW) {
@ -72,11 +74,10 @@ public class GameService {
game.changeLastPlayedCardColor(color);
nextPlayer();
drawCard(4);
nextPlayer();
}
}
public boolean legalMove(Player player, Card card)
public boolean legalMove(Card card)
{
boolean legalMoveFound = false;
Card lastCard = game.getLastPlayedCard();

3
src/main/java/de/hsfulda/onses/services/PlayerService.java
View File

@ -28,9 +28,8 @@ public class PlayerService {
return currentTurn;
}
public PlayerService setCurrentTurn(boolean currentTurn) {
public void setCurrentTurn(boolean currentTurn) {
this.currentTurn = currentTurn;
return this;
}
public Game getGame() {

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

@ -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);
@ -46,7 +45,7 @@ public class GameServiceTest {
GameService gameService = new GameService();
gameService.getGame().setLastPlayedCard(new Card().setColor(Card.Color.RED).setValue(Card.Value.FIVE));
boolean answer = gameService.legalMove(new Player(), input);
boolean answer = gameService.legalMove(input);
// assert
assertEquals(expected, answer);
}
@ -60,7 +59,7 @@ public class GameServiceTest {
GameService gameService = new GameService();
gameService.getGame().setLastPlayedCard(new Card().setColor(Card.Color.BLUE).setValue(Card.Value.ONE));
boolean answer = gameService.legalMove(new Player(), input);
boolean answer = gameService.legalMove(input);
// assert
assertEquals(expected, answer);
}
@ -86,7 +85,7 @@ public class GameServiceTest {
GameService gameService = new GameService();
gameService.getGame().setLastPlayedCard(new Card().setColor(Card.Color.YELLOW).setValue(Card.Value.ONE));
boolean answer = gameService.legalMove(new Player(), input);
boolean answer = gameService.legalMove(input);
// assert
assertEquals(expected, answer);
}
@ -101,7 +100,7 @@ public class GameServiceTest {
GameService gameService = new GameService();
gameService.getGame().setLastPlayedCard(new Card().setColor(Card.Color.YELLOW).setValue(Card.Value.THREE));
boolean answer = gameService.legalMove(new Player(), input);
boolean answer = gameService.legalMove(input);
// assert
assertEquals(expected, answer);
}
@ -116,7 +115,7 @@ public class GameServiceTest {
GameService gameService = new GameService();
gameService.getGame().setLastPlayedCard(new Card().setColor(Card.Color.YELLOW).setValue(Card.Value.THREE));
boolean answer = gameService.legalMove(new Player(), input);
boolean answer = gameService.legalMove(input);
// assert
assertEquals(expected, answer);
}
@ -131,7 +130,7 @@ public class GameServiceTest {
GameService gameService = new GameService();
gameService.getGame().setLastPlayedCard(new Card().setColor(Card.Color.GREEN).setValue(Card.Value.FIVE));
boolean answer = gameService.legalMove(new Player(), input);
boolean answer = gameService.legalMove(input);
// assert
assertEquals(expected, 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;

Write Preview
Loading…
Cancel
Save