Merge branch 'master' of laurengreen/ZCW-OOP-Casino into working

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

@@ -14,22 +14,15 @@ public class Card {
         this.name = cardValue + " of " + suit;
     }
 
+
     public String getName() {
         return name;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public boolean isVisible() {
         return isVisible;
     }
 
-    public void setVisible(boolean visible) {
-        isVisible = visible;
-    }
-
     public void setVisibility(boolean visibility){
         isVisible = visibility;
     }
@@ -39,21 +32,11 @@ public class Card {
         return suit;
     }
 
-    public void setSuit(Suit suit)
-    {
-        this.suit = suit;
-    }
-
     public int getCardValue()
     {
         return cardValue.getCardValue();
     }
 
-    public void setCardValue(CardValue cardValue)
-    {
-        this.cardValue = cardValue;
-    }
-
     public enum CardValue
     {
         TWO(2),
@@ -94,11 +77,5 @@ public class Card {
         Suit (String suitValue)
         {
             this.suitValue = suitValue;
-        }
-
-        public String getSuitValue(){
-            return suitValue;
-        }
-
-    }
+        }}
 }

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

@@ -27,11 +27,6 @@ public abstract class CardGame {
     // public abstract void deal();
     // public abstract void deal(ArrayList<CardPlayer> players); // NEEDED FOR STUD
 
-    public void shuffle(){
-
-        //shuffle the card stack
-
-    }
 
     public Deck getDeck() {
         return deck;

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

@@ -114,6 +114,7 @@ public class War extends CardGame implements Gamble, Game {
         }
     }
 
+
     public void startGame(){
         Printer.printMessage("Welcome to War!");
         super.chooseStatingPlayer();
@@ -122,6 +123,8 @@ public class War extends CardGame implements Gamble, Game {
         startRound();
     }
 
+
+
     public void startRound() {
         while(super.getLoser() == null) {
             String input = console.getCMDFromUser("Type 'FLIP' to play the card at the top of your pile");

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

@@ -1,7 +1,6 @@
 package io.zipcoder.casino;
 
 import java.util.ArrayList;
-import java.util.Scanner;
 
 public class Yahtzee extends DiceGame implements Game, Gamble {
 
@@ -46,7 +45,8 @@ public class Yahtzee extends DiceGame implements Game, Gamble {
                 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.");
+                    Console console2 = new Console();
+                    diceToRoll = console2.getLineFromUser("Which numbers would you like to reroll? List the numbers separated by spaces.");
                 }
                 rollOptions(rollChoice, diceToRoll); }
 

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

@@ -1,20 +1,40 @@
 package io.zipcoder.casino;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class CardTest {
 
     @Test
-    public void createCard(){
+    public void testCreateCard(){
         Card card = new Card(Card.CardValue.TWO, Card.Suit.CLUBS);
-        System.out.println(card.getName());
+        String expected = "TWO of CLUBS";
+        String actual = card.getName();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void createCard2(){
-        Card card = new Card(Card.CardValue.TWO, Card.Suit.CLUBS);
-        Card card1 = new Card(Card.CardValue.QUEEN, Card.Suit.HEARTS);
-        System.out.println(card.getName());
-        System.out.println(card1.getName());
+    public void testGetSuit(){
+        Card card = new Card(Card.CardValue.THREE, Card.Suit.DIAMONDS);
+        Card.Suit expected = Card.Suit.DIAMONDS;
+        Card.Suit actual = card.getSuit();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testGetCardValue(){
+        Card card = new Card(Card.CardValue.ACE, Card.Suit.HEARTS);
+        int expected = 14;
+        int actual = card.getCardValue();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testVisibility(){
+        Card card = new Card(Card.CardValue.KING, Card.Suit.SPADES);
+        boolean before = card.isVisible();
+        card.setVisibility(true);
+        boolean after = card.isVisible();
+        Assert.assertNotEquals(before, after);
     }
 }

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

@@ -244,6 +244,7 @@ public class StudTest {
     @Test //Either payAnte or Test is broken, Ante is not deducted. Test set to pass
     public void payAnteTest(){
         stud.payAnte(players);
+        System.out.println(players.get(0).getPlayer().getCurrentBalance());
         //WHEN @Before
         int expected = 10;
         //THEN