Tests written for Yahtzee Class

src/main/java/io/zipcoder/casino/Game.java

@@ -1,7 +1,7 @@
 package io.zipcoder.casino;
 
 public interface Game {
-     void quit();
+
      void startGame();
      void startRound();
 }

src/main/java/io/zipcoder/casino/SlotMachine.java

@@ -29,10 +29,6 @@ public class SlotMachine implements Game, Gamble {
 
     // implementd from game
 
-    @Override
-    public void quit() {
-
-    }
 
     @Override
     public void startGame() {

src/main/java/io/zipcoder/casino/War.java

@@ -137,9 +137,6 @@ public class War extends CardGame implements Gamble, Game {
      * Below 3 Implemented from Game
      */
 
-    public void quit() {
-
-    }
 
     public void startGame() {
         System.out.println("Welcome to war!");

src/main/java/io/zipcoder/casino/Yahtzee.java

@@ -43,22 +43,26 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         for (int i = 0; i < ScoreSheet.getSize(); i++) {
             rollAll();
             for(int j = 0; j < 2; j++) {
-                int choice = console.getIntFromUser("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3. Stop rolling and score.\nNumber of Selection: ");
-                rollOptions(choice); }
+                int rollChoice = console.getIntFromUser("Would you like to:\n1. Roll all dice again.\n2. Roll some dice again.\n3. Stop rolling and score.\nNumber of Selection: ");
+                String diceToRoll = "";
+                if(rollChoice == 2) {
+                    diceToRoll = console.getLineFromUser("Which numbers would you like to reroll? List the numbers separated by spaces.");
+                }
+                rollOptions(rollChoice, diceToRoll); }
 
             boolean validEntry = false;
             ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
             while (!validEntry) {
                 Printer.printMessage(dicePlayer.getScoreSheet().scoreCardToString());
 
-                int choice = console.getIntFromUser("Which row would you like to apply your turn to on the scoresheet?.\n" +
+                int rowChoice = console.getIntFromUser("Which row would you like to apply your turn to on the scoresheet?.\n" +
                         "Remember you can only use each row once!");
-                row = selectingRow(choice);
+
+                row = selectingRow(rowChoice);
                 validEntry = checkEmptyRow(row);
             }
             dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
             Printer.printMessage("\n" + dicePlayer.getScoreSheet().scoreCardToString());
-
         }
 
     }
@@ -71,7 +75,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
     }
 
 
-    public void rollOptions(int choice) {
+    public void rollOptions(int choice, String diceToRoll) {
 
         switch (choice) {
             case 1:
@@ -79,7 +83,6 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
                 break;
 
             case 2:
-                String diceToRoll = console.getLineFromUser("Which numbers would you like to reroll? List the numbers separated by spaces.");
                 reRoll(diceToRoll);
                 break;
 
@@ -180,14 +183,8 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         int payOut = 0;
         if (score == 1575) {
             payOut = getBid() * 100;
-        } else if (score > 1000) {
-            payOut = getBid() * 20;
         } else if (score > 500) {
             payOut = getBid() * 10;
-        } else if (score > 400) {
-            payOut = getBid() * 5;
-        } else if (score > 300) {
-            payOut = getBid() * 3;
         } else if (score > 200) {
             payOut = getBid() * 2;
         } else {
@@ -197,10 +194,6 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         Printer.printMessage("You won $" + payOut);
     }
 
-    @Override
-    public void quit() {
-
-    }
 
     public DicePlayer getDicePlayer() {
         return dicePlayer;

src/test/java/io/zipcoder/casino/YahtzeeTest.java

@@ -50,7 +50,7 @@ public class YahtzeeTest {
         //When
         yahtzee.startGame();
         String expected = yahtzee.getDicePlayer().cupToString();
-        yahtzee.rollOptions(3);
+        yahtzee.rollOptions(3, "");
         String actual = yahtzee.getDicePlayer().cupToString();
 
         //Then
@@ -64,7 +64,7 @@ public class YahtzeeTest {
         //When
         yahtzee.startGame();
         String expected = yahtzee.getDicePlayer().cupToString();
-        yahtzee.rollOptions(1);
+        yahtzee.rollOptions(1, "");
         String actual = yahtzee.getDicePlayer().cupToString();
 
         //Then
@@ -79,7 +79,7 @@ public class YahtzeeTest {
         yahtzee.startGame();
         int diceOneValue = yahtzee.getDicePlayer().getCup()[0].getValue();
         int diceTwoValue = yahtzee.getDicePlayer().getCup()[1].getValue();
-        yahtzee.reRoll(Integer.toString(diceTwoValue));
+        yahtzee.rollOptions(2, Integer.toString(diceTwoValue));
         int actual = yahtzee.getDicePlayer().getCup()[0].getValue();
 
         //Then
@@ -112,5 +112,159 @@ public class YahtzeeTest {
 
     }
 
+    @Test
+    public void testPayout() {
+        //When
+        int expected = yahtzee.getDicePlayer().getPlayer().getCurrentBalance();
+        yahtzee.payout();
+        int actual = yahtzee.getDicePlayer().getPlayer().getCurrentBalance();
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+
+    @Test
+    public void testSelectingRow1() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.ACES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(1);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow2() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.TWOS;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(2);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow3() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.THREES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(3);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow4() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FOURS;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(4);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow5() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FIVES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(5);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow6() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.SIXES;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(6);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
 
+    @Test
+    public void testSelectingRow7() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.THREEOFAKIND;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(7);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow8() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FOUROFAKIND;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(8);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow9() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.FULLHOUSE;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(9);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow10() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.SMALLSTRAIGHT;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(10);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow11() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.LARGESTRAIGHT;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(11);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow12() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.YAHTZEE;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(12);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
+
+    @Test
+    public void testSelectingRow13() {
+        //When
+        ScoreSheet.ROW expected = ScoreSheet.ROW.CHANCE;
+        ScoreSheet.ROW actual = yahtzee.selectingRow(13);
+
+        //Then
+        Assert.assertEquals(expected, actual);
+
+    }
 }