From 7801e4f4f3c1d708872f3272fb74bf452cccd6e6 Mon Sep 17 00:00:00 2001 From: Mike Vink Date: Tue, 25 May 2021 09:52:46 +0200 Subject: test nog opgesplitst, steal and skip on last --- domain/src/main/java/mancala/domain/SmallBowl.java | 1 - domain/src/test/java/mancala/domain/BowlTest.java | 25 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/domain/src/main/java/mancala/domain/SmallBowl.java b/domain/src/main/java/mancala/domain/SmallBowl.java index e167081..b12b084 100644 --- a/domain/src/main/java/mancala/domain/SmallBowl.java +++ b/domain/src/main/java/mancala/domain/SmallBowl.java @@ -151,7 +151,6 @@ public class SmallBowl implements Bowl { return 1 + getNextSmallBowl().countSmallBowlsUntilKalahaFromHere(); } - // Deze package private methoden worden nog in de tests gebruikt private SmallBowl getOpposite() { SmallBowl opponentFirst = (SmallBowl) getKalaha().getNextBowl(); return opponentFirst.getNextSmallBowlTimes(countSmallBowlsUntilKalahaFromHere()); diff --git a/domain/src/test/java/mancala/domain/BowlTest.java b/domain/src/test/java/mancala/domain/BowlTest.java index 77b81e9..42c39f9 100644 --- a/domain/src/test/java/mancala/domain/BowlTest.java +++ b/domain/src/test/java/mancala/domain/BowlTest.java @@ -133,7 +133,16 @@ class BowlTest { assertTrue(opponent.won()); } - private void goToEndOfGameWhereOpponentWins() { + @Test + public void the_play_would_skip_past_opponent_kalaha_at_the_last_rock_and_steal_WHEN_played_THEN_should_skip_and_steal_correctly() { + goToSkipAndStealOnLast(); + SmallBowl firstSmallBowlOpponent = firstSmallBowlPlayer.getNextSmallBowlTimes(6); + assertEquals(3, firstSmallBowlPlayer.getNextSmallBowlTimes(5).getNextBowl().getMyRocks()); + firstSmallBowlOpponent.getNextSmallBowlTimes(3).play(); + assertEquals(19, firstSmallBowlOpponent.getNextSmallBowlTimes(5).getNextBowl().getMyRocks()); + } + + private void goToSkipAndStealOnLast() { SmallBowl firstSmallBowlOpponent = firstSmallBowlPlayer.getNextSmallBowlTimes(6); firstSmallBowlPlayer.getNextSmallBowlTimes(1).play(); firstSmallBowlOpponent.getNextSmallBowlTimes(2).play(); @@ -157,9 +166,12 @@ class BowlTest { assertEquals(8, firstSmallBowlPlayer.getNextSmallBowlTimes(5).getMyRocks()); // Result is big kalaha booty assertEquals(8, firstSmallBowlOpponent.getNextSmallBowlTimes(5).getNextBowl().getMyRocks()); - assertEquals(3, firstSmallBowlPlayer.getNextSmallBowlTimes(5).getNextBowl().getMyRocks()); + } + + private void goToEndOfGameWhereOpponentWins() { + goToSkipAndStealOnLast(); + SmallBowl firstSmallBowlOpponent = firstSmallBowlPlayer.getNextSmallBowlTimes(6); firstSmallBowlOpponent.getNextSmallBowlTimes(3).play(); - assertEquals(19, firstSmallBowlOpponent.getNextSmallBowlTimes(5).getNextBowl().getMyRocks()); firstSmallBowlPlayer.getNextSmallBowlTimes(1).play(); firstSmallBowlOpponent.getNextSmallBowlTimes(1).play(); firstSmallBowlPlayer.play(); @@ -307,11 +319,4 @@ class BowlTest { } } } - - - @Nested - @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class) - class in_a_game_of_mancala { - - } } \ No newline at end of file -- cgit v1.2.3