Merge pull request #1222 from TimoleonLatinopoulos/master

Added test cases as per #1161

exercises/bowling/.meta/src/reference/java/BowlingGame.java

@@ -25,7 +25,7 @@ class BowlingGame {
                 }
 
                 int strikeBonus = strikeBonus(frameIndex);
-                if (strikeBonus > MAXIMUM_FRAME_SCORE && !isStrike(frameIndex + 1)) {
+                if (strikeBonus > MAXIMUM_FRAME_SCORE && !isStrike(frameIndex + 1) || spareBonus(frameIndex) > 10) {
                     throw new IllegalStateException("Pin count exceeds pins on the lane");
                 }
 

exercises/bowling/.meta/version

@@ -0,0 +1 @@
+1.1.0

exercises/bowling/src/test/java/BowlingTest.java

@@ -189,6 +189,19 @@ public class BowlingTest {
 
     @Ignore("Remove to run test")
     @Test
+    public void bonusRollAfterAStrikeInTheLastFrameCanNotScoreMoreThan10Points() {
+        int[] rolls = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 11, 0};
+
+        playGame(rolls);
+
+        expectedException.expect(IllegalStateException.class);
+        expectedException.expectMessage("Pin count exceeds pins on the lane");
+
+        game.score();
+    }
+    
+    @Ignore("Remove to run test")
+    @Test
     public void twoBonusRollsAfterAStrikeInTheLastFrameCanNotScoreMoreThan10Points() {
         int[] rolls = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 5, 6};
 
@@ -209,7 +222,33 @@ public class BowlingTest {
 
         assertEquals(26, game.score());
     }
+    
+    @Ignore("Remove to run test")
+    @Test
+    public void theSecondBonusRollsAfterAStrikeInTheLastFrameCanNotBeAStrikeIfTheFirstOneIsNotAStrike() {
+        int[] rolls = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 6, 10};
 
+        playGame(rolls);
+
+        expectedException.expect(IllegalStateException.class);
+        expectedException.expectMessage("Pin count exceeds pins on the lane");
+
+        game.score();
+    }
+    
+    @Ignore("Remove to run test")
+    @Test
+    public void secondBonusRollAfterAStrikeInTheLastFrameCanNotScoreMoreThan10Points() {
+        int[] rolls = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 10, 11};
+
+        playGame(rolls);
+
+        expectedException.expect(IllegalStateException.class);
+        expectedException.expectMessage("Pin count exceeds pins on the lane");
+
+        game.score();
+    }
+    
     @Ignore("Remove to run test")
     @Test
     public void anUnstartedGameCanNotBeScored() {
@@ -238,7 +277,7 @@ public class BowlingTest {
 
     @Ignore("Remove to run test")
     @Test
-    public void aGameWithMoreThanTenFramesCanNotBeScored() {
+    public void canNotRollIfGameAlreadyHasTenFrames() {
         int[] rolls = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
         playGame(rolls);