Scoresheet Tests

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

@@ -21,21 +21,31 @@ public class ScoreSheet {
     public int getTotalScore() {
 
         int totalScore = 0;
-        totalScore = (totalScore + getScore(ScoreSheet.ROW.ACES) + getScore(ScoreSheet.ROW.TWOS) + getScore(ScoreSheet.ROW.THREES) + getScore(ScoreSheet.ROW.FOURS) + getScore(ScoreSheet.ROW.FIVES) + getScore(ScoreSheet.ROW.SIXES));
-        if (totalScore >= 63) {
+        int upperScore = 0;
+        int lowerScore = 0;
+        try {
+            upperScore = getScore(ScoreSheet.ROW.ACES) + getScore(ScoreSheet.ROW.TWOS) + getScore(ScoreSheet.ROW.THREES) + getScore(ScoreSheet.ROW.FOURS) + getScore(ScoreSheet.ROW.FIVES) + getScore(ScoreSheet.ROW.SIXES);
+        } catch (NullPointerException e){
+            upperScore = 0;
+        }
+        try {
+            lowerScore = getScore(ScoreSheet.ROW.THREEOFAKIND) + getScore(ScoreSheet.ROW.FOUROFAKIND) + getScore(ScoreSheet.ROW.FULLHOUSE) + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + getScore(ScoreSheet.ROW.YAHTZEE) + getScore(ScoreSheet.ROW.CHANCE);
+        } catch (NullPointerException e){
+            lowerScore = 0;
+        }
+        if (upperScore >= 63) {
             totalScore += 35;
         }
-        totalScore = (totalScore + getScore(ScoreSheet.ROW.THREEOFAKIND) + getScore(ScoreSheet.ROW.FOUROFAKIND) + getScore(ScoreSheet.ROW.FULLHOUSE) + getScore(ScoreSheet.ROW.SMALLSTRAIGHT) + getScore(ScoreSheet.ROW.LARGESTRAIGHT) + getScore(ScoreSheet.ROW.YAHTZEE) + getScore(ScoreSheet.ROW.CHANCE));
-
+        totalScore = totalScore + upperScore + lowerScore;
         return totalScore;
     }
 
     public String rowToString(ROW row, String description) {
         String rowInfo = String.format("%-35s",description);
         if(getScore(row) != null) {
-            rowInfo += "\n** " + getScore(row) + " **\n";
+            rowInfo += "** " + getScore(row) + " **\n";
         } else {
-            rowInfo += "\n** open **\n";
+            rowInfo += "** open **\n";
         }
         return rowInfo;
     }

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

@@ -131,7 +131,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
         ScoreSheet.ROW row = ScoreSheet.ROW.CHANCE;
 
         while (validEntry) {
-            dicePlayer.getScoreSheet().printScoreCard();
+            Printer.printMessage(dicePlayer.getScoreSheet().scoreCardToString());
             System.out.println();
             System.out.println("Which row would you like to apply your turn to on the scoresheet?.\n" +
                     "Remember you can only use each row once!");
@@ -190,7 +190,7 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
 
         dicePlayer.getScoreSheet().setRow(row, dicePlayer.getCup());
         System.out.println();
-        dicePlayer.getScoreSheet().printScoreCard();
+        Printer.printMessage(dicePlayer.getScoreSheet().scoreCardToString());
     }
 
     @Override

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

@@ -9,10 +9,18 @@ import java.util.Collections;
 
 public class ScoreSheetTest {
 
+    ScoreSheet scoreSheet = new ScoreSheet();
+    Dice dice1 = new Dice();
+    Dice dice2 = new Dice();
+    Dice dice3 = new Dice();
+    Dice dice4 = new Dice();
+    Dice dice5 = new Dice();
+    Dice[] cup = new Dice[5];
+
+
     @Test
     public void testCheckThreeOfAKindFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -28,7 +36,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckThreeOfAKindTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -44,7 +51,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFourOfAKindFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -60,7 +66,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFourOfAKindTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -76,7 +81,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckYahtzeeFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -92,7 +96,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckYahtzeeTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(2);
@@ -108,7 +111,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFullHouseFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -124,7 +126,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckFullHouseTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -140,7 +141,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckLargeStraightFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -157,7 +157,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckLargeStraightTrue() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -174,7 +173,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightFalse() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -191,7 +189,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightTrue1() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(5);
         test.add(3);
@@ -208,7 +205,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightTrue2() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(1);
         test.add(3);
@@ -225,7 +221,6 @@ public class ScoreSheetTest {
     @Test
     public void testCheckSmallStraightTrue3() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(1);
         test.add(3);
@@ -242,7 +237,6 @@ public class ScoreSheetTest {
     @Test
     public void testScoreNumbers() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -262,7 +256,6 @@ public class ScoreSheetTest {
     @Test
     public void testScoreTotalDice() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
         ArrayList<Integer> test = new ArrayList<>();
         test.add(2);
         test.add(3);
@@ -282,13 +275,6 @@ public class ScoreSheetTest {
     @Test
     public void testSetRowCHANCE() {
         //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
         cup[0] = dice1;
         cup[1] = dice2;
         cup[2] = dice3;
@@ -299,363 +285,316 @@ public class ScoreSheetTest {
         }
         int expected = dice1.getValue() + dice2.getValue() + dice3.getValue() + dice4.getValue() + dice5.getValue();
 
-        //When
-
-        scoreSheet.setRow(ScoreSheet.ROW.CHANCE, cup);
-        int actual = scoreSheet.getScore(ScoreSheet.ROW.CHANCE);
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.CHANCE, cup);
+            int actual = scoreSheet.getScore(ScoreSheet.ROW.CHANCE);
 
-        //Then
-        Assert.assertEquals(expected, actual);
+            //Then
+            Assert.assertEquals(expected, actual);
 
-    }
-
-    @Test
-    public void testSetRowACES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.ACES, cup);
+        @Test
+        public void testSetRowACES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.ACES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.ACES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.ACES) != null));
 
-    @Test
-    public void testSetRowTWOS() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.TWOS, cup);
+        @Test
+        public void testSetRowTWOS () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.TWOS, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.TWOS) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.TWOS) != null));
 
-    @Test
-    public void testSetRowTHREES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.THREES, cup);
+        @Test
+        public void testSetRowTHREES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.THREES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREES) != null));
 
-    @Test
-    public void testSetRowFOURS() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FOURS, cup);
+        @Test
+        public void testSetRowFOURS () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.FOURS, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOURS) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOURS) != null));
 
-    @Test
-    public void testSetRowFIVES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FIVES, cup);
+        @Test
+        public void testSetRowFIVES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.FIVES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FIVES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FIVES) != null));
 
-    @Test
-    public void testSetRowSIXES() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.SIXES, cup);
+        @Test
+        public void testSetRowSIXES () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.SIXES, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SIXES) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SIXES) != null));
 
-    @Test
-    public void testSetRowThreeOfAKind() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
-        }
-
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.THREEOFAKIND, cup);
-
-
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREEOFAKIND) != null));
-
-    }
-
-    @Test
-    public void testSetRowFourOfAKind() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
-        }
-
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FOUROFAKIND, cup);
-
-
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOUROFAKIND) != null));
-
-    }
-
-    @Test
-    public void testSetRowFullHouse() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
-        }
-
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.FULLHOUSE, cup);
-
-
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FULLHOUSE) != null));
-
-    }
-
-    @Test
-    public void testSetRowSmallStraight() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.SMALLSTRAIGHT, cup);
+        @Test
+        public void testSetRowThreeOfAKind () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.THREEOFAKIND, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.THREEOFAKIND) != null));
 
-    @Test
-    public void testSetRowLargeStraight() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.LARGESTRAIGHT, cup);
+        @Test
+        public void testSetRowFourOfAKind () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+            }
 
+            //When
+            scoreSheet.setRow(ScoreSheet.ROW.FOUROFAKIND, cup);
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null));
 
-    }
+            //Then
+            Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FOUROFAKIND) != null));
 
-    @Test
-    public void testSetRowYahtzee() {
-        //Given
-        ScoreSheet scoreSheet = new ScoreSheet();
-        Dice dice1 = new Dice();
-        Dice dice2 = new Dice();
-        Dice dice3 = new Dice();
-        Dice dice4 = new Dice();
-        Dice dice5 = new Dice();
-        Dice[] cup = new Dice[5];
-        cup[0] = dice1;
-        cup[1] = dice2;
-        cup[2] = dice3;
-        cup[3] = dice4;
-        cup[4] = dice5;
-        for (Dice d : cup) {
-            d.roll();
         }
 
-        //When
-        scoreSheet.setRow(ScoreSheet.ROW.YAHTZEE, cup);
-
+        @Test
+        public void testSetRowFullHouse () {
+            //Given
+            cup[0] = dice1;
+            cup[1] = dice2;
+            cup[2] = dice3;
+            cup[3] = dice4;
+            cup[4] = dice5;
+            for (Dice d : cup) {
+                d.roll();
+
+            }
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.FULLHOUSE, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.FULLHOUSE) != null));
+
+            }
+
+            @Test
+            public void testSetRowSmallStraight () {
+                //Given
+                cup[0] = dice1;
+                cup[1] = dice2;
+                cup[2] = dice3;
+                cup[3] = dice4;
+                cup[4] = dice5;
+                for (Dice d : cup) {
+                    d.roll();
+                }
+
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.SMALLSTRAIGHT, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.SMALLSTRAIGHT) != null));
+
+            }
+
+            @Test
+            public void testSetRowLargeStraight () {
+                //Given
+                cup[0] = dice1;
+                cup[1] = dice2;
+                cup[2] = dice3;
+                cup[3] = dice4;
+                cup[4] = dice5;
+                for (Dice d : cup) {
+                    d.roll();
+                }
+
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.LARGESTRAIGHT, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.LARGESTRAIGHT) != null));
+
+            }
+
+            @Test
+            public void testSetRowYahtzee () {
+                //Given
+                cup[0] = dice1;
+                cup[1] = dice2;
+                cup[2] = dice3;
+                cup[3] = dice4;
+                cup[4] = dice5;
+                for (Dice d : cup) {
+                    d.roll();
+                }
+
+                //When
+                scoreSheet.setRow(ScoreSheet.ROW.YAHTZEE, cup);
+
+
+                //Then
+                Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.YAHTZEE) != null));
+
+            }
+
+            @Test
+            public void testGetSize () {
+                //Given
+                int expected = 13;
+
+                //When
+                int actual = ScoreSheet.getSize();
+
+                //Then
+                Assert.assertEquals(expected, actual);
+
+            }
+
+            @Test
+            public void testScoreCardToString () {
+                //Given
+                String expected = "1. Aces: Totals all Ones           ** open **\n" +
+                        "2. Twos: Totals all Twos           ** open **\n" +
+                        "3. Threes: Totals all Threes       ** open **\n" +
+                        "4. Fours: Totals all Fours         ** open **\n" +
+                        "5. Fives: Totals all Fives         ** open **\n" +
+                        "6. Sixes: Totals all Sixes         ** open **\n" +
+                        "7. 3 of a Kind                     ** open **\n" +
+                        "8. 4 of a Kind                     ** open **\n" +
+                        "9. Full House                      ** open **\n" +
+                        "10. Small Straight: Sequence of 4  ** open **\n" +
+                        "11. Large Striaght: Sequence of 5  ** open **\n" +
+                        "12. Yahtzee: 5 of a Kind           ** open **\n" +
+                        "13. Chance: Sum of Dice            ** open **\n";
 
-        //Then
-        Assert.assertTrue((scoreSheet.getScore(ScoreSheet.ROW.YAHTZEE) != null));
-
-    }
+                //When
+                String actual = scoreSheet.scoreCardToString();
+
+                //Then
+                Assert.assertEquals(expected, actual);
+
+            }
 
     @Test
-    public void testGetSize() {
+    public void testTotalScore () {
         //Given
-        int expected = 13;
+        int expected = 0;
 
         //When
-        int actual = ScoreSheet.getSize();
+        int actual = scoreSheet.getTotalScore();
 
         //Then
         Assert.assertEquals(expected, actual);
 
     }
+        }
 
-}