new blackjack added

pom.xml

@@ -9,16 +9,16 @@
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
+        <!-- https://mvnrepository.com/artifact/junit/junit -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>25.1-jre</version>
-        </dependency>
+
+
+
     </dependencies>
 </project>

src/main/.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>

src/main/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/main.iml" filepath="$PROJECT_DIR$/.idea/main.iml" />
+    </modules>
+  </component>
+</project>

src/main/.idea/workspace.xml

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="c8df5724-ffd8-4c06-bb3c-35b90be3dec0" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="BlackJack.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/java/io/zipcoder/casino/BlackJack.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-1040" />
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Card.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/java/io/zipcoder/casino/Card.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Casino.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/java/io/zipcoder/casino/Casino.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="NodePackageJsonFileManager">
+    <packageJsonPaths />
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="y" value="23" />
+    <option name="width" value="1280" />
+    <option name="height" value="705" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="main" type="b2602c69:ProjectViewProjectNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="main" type="b2602c69:ProjectViewProjectNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="main" type="b2602c69:ProjectViewProjectNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="io" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="main" type="b2602c69:ProjectViewProjectNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="io" type="462c0819:PsiDirectoryNode" />
+              <item name="zipcoder" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="main" type="b2602c69:ProjectViewProjectNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="io" type="462c0819:PsiDirectoryNode" />
+              <item name="zipcoder" type="462c0819:PsiDirectoryNode" />
+              <item name="casino" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <patterns />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <properties />
+      <listeners />
+    </configuration>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="c8df5724-ffd8-4c06-bb3c-35b90be3dec0" name="Default" comment="" />
+      <created>1528481282587</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1528481282587</updated>
+      <workItem from="1528481286696" duration="117000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="117000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="23" width="1280" height="705" extended-state="6" />
+    <layout>
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info id="Image Layers" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="right" id="Maven Projects" />
+      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info id="Capture Tool" />
+      <window_info id="Designer" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info anchor="right" id="Database" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info id="UI Designer" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/java/io/zipcoder/casino/BlackJack.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1040" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/java/io/zipcoder/casino/Card.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="12" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/java/io/zipcoder/casino/Casino.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>

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

@@ -1,77 +1,324 @@
-//package io.zipcoder.casino;
-//
-//public class BlackJack extends CardGames {
-//    int playerHand;
-//    int dealerHand;
-//    int currentBet;
-//    boolean playingBJ = false;
-//    CardDeck deck = new CardDeck();
-//    Player player;
-//
-//    public void start() {
-//        playingBJ = true;
-//
-//    }
-//
-//    public BlackJack(Player player) {
-//
-//    }
-//
-//
-//
-//while(playingBJ == true){
-//        Console.output("Welcome to BlackJack " + player.name + ". I am your dealer Vince and I am here to take your money!");
-//        currentBet = Console.numberFromString(Console.askForInput("How much would you like to bet?"));
-//        deck.deal();
-//        if (dealerHand == 21) {
-//            Console.output("Dealer has BlackJack! You lose!");
-//            loseBet(currentBet);
-//            currentBet = 0;
-//            deck.deal();
-//        } else if (playerHand == 21) {
-//            Console.output("You have BlackJack! You win!");
-//            winBet((currentBet * 3) / 2);
-//            currentBet = 0;
-//            deck.deal();
-//
-//        }
-//        while (playerHand < 21) {
-//            String action = Console.askForInput("Dealer is showing: " + "You have " + playerHand + ". Please enter 'hit' or 'stay'.");
-//            if (action.equals("hit")) {
-//                drawCard();
-//                cardValue += playerHand;
-//                if (playerHand > 21) {
-//                    Console.output("You have " + playerHand + " and bust, you suck!");
-//                    loseBet(currentBet);
-//                    currentBet = 0;
-//                }
-//            } else if (action.equals("stay")) {
-//                break;
-//            }
-//        }
-//        while (dealerHand < 17 && dealerHand < 21) {
-//            Console.output("Dealer has " + dealerHand + " and hits.");
-//            drawcard();
-//            cardValue += dealerHand;
-//            if (dealerHand > 21) {
-//                Console.output("Dealer has " + dealerHand + " and busts, you win!");
-//                winBet(currentBet);
-//                currentBet = 0;
-//            } else if (dealerHand >= 17 && dealerHand < 21) {
-//                Console.output("Dealer has " + dealerHand + " and stands.");
-//            }
-//        }
-//
-//
-//
-//    }
-//
-//}
-//
-//
-//
-//
-//
-//
-//
-//
+
+package io.zipcoder.casino;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+
+public class BlackJack {
+
+
+    private ArrayList<Card> playerHand = new ArrayList<Card>();
+    private ArrayList<Card> dealerHand = new ArrayList<Card>();
+    private int currentBet;
+    private boolean playingBJ = false;
+    private boolean playingHands = true;
+    private boolean askToPlayAgain = false;
+    boolean dStay = true;
+    boolean pStay = false;
+    private CardDeck deck = new CardDeck();
+    private static Player player;
+
+    public BlackJack() {
+        this.player = new Player("Eugene");
+    }
+
+    public void start() {
+        playingBJ = true;
+        this.deck.shuffle();
+    }
+
+    private void dealToPlayerHand(int amountOfCards) {
+        for (int i = 0; i < amountOfCards; i++) {
+            this.playerHand.add(deck.draw());
+        }
+    }
+
+    private void dealToDealerHand(int amountOfCards) {
+        for (int i = 0; i < amountOfCards; i++) {
+            this.dealerHand.add(deck.draw());
+        }
+    }
+
+    private void setPlayingHands(boolean bool) {
+        this.playingHands = bool;
+    }
+
+    private String getPlayerHand() {
+
+        return Arrays.toString(this.playerHand.toArray());
+    }
+
+    private String getDealerHand() {
+        return Arrays.toString(this.dealerHand.toArray());
+    }
+
+    private String showDealerHand() {
+        Card[] filteredArray = this.dealerHand.toArray(new Card[this.dealerHand.size()]);
+        filteredArray[0] = new Card();
+        return Arrays.toString(filteredArray);
+    }
+
+    private void setCurrentBet(int bet) {
+        this.currentBet = bet;
+    }
+
+    private void setAskToPlayAgain(boolean bool) {
+        this.askToPlayAgain = bool;
+    }
+
+    private void resetHands() {
+        this.playerHand = new ArrayList<Card>();
+        this.dealerHand = new ArrayList<Card>();
+    }
+
+    private void startHands() {
+        this.deck = new CardDeck();
+        this.deck.shuffle();
+        resetHands();
+        dealToPlayerHand(2);
+        dealToDealerHand(2);
+    }
+
+    private void startNextHand() {
+        setCurrentBet(0);
+        setAskToPlayAgain(true);
+        setPlayingHands(false);
+    }
+
+    private int getCardValue(Card card) {
+        Rank rank = card.getRank();
+        int calcValue = 0;
+        switch (rank) {
+            case ACE:
+                calcValue = 11;
+                break;
+            case TWO:
+                calcValue = 2;
+                break;
+            case THREE:
+                calcValue = 3;
+                break;
+            case FOUR:
+                calcValue = 4;
+                break;
+            case FIVE:
+                calcValue = 5;
+                break;
+            case SIX:
+                calcValue = 6;
+                break;
+            case SEVEN:
+                calcValue = 7;
+                break;
+            case EIGHT:
+                calcValue = 8;
+                break;
+            case NINE:
+                calcValue = 9;
+                break;
+            case TEN:
+                calcValue = 10;
+                break;
+            case JACK:
+            case QUEEN:
+            case KING:
+                calcValue = 10;
+                break;
+        }
+        return calcValue;
+    }
+
+    private int calcHand(ArrayList<Card> hand) {
+        int totalScore = 0;
+        int aceCount = 0;
+        for (int i = 0; i < hand.size(); i++) {
+            totalScore += getCardValue(hand.get(i));
+            if(getCardValue(hand.get(i)) == 11){
+                aceCount++;
+            }
+        }
+        if(totalScore > 21 && aceCount > 0){
+            totalScore -= 10;
+            aceCount--;
+        }
+        return totalScore;
+    }
+
+    private void playerBust() {
+        Console.output("Dealer wins! You bust.");
+        player.subtractFromBankroll(currentBet);
+        pStay = true;
+        startNextHand();
+    }
+
+    private void dealerBust() {
+        Console.output("Dealer busts! You win");
+        player.addToBankroll(currentBet);
+        startNextHand();
+        dStay = true;
+    }
+
+    private void delay(int time) {
+        try {
+            Thread.sleep(time);
+        } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    private void playerHits() {
+        dealToPlayerHand(1);
+        delay(1500);
+        Console.output("You now have:\n" + getPlayerHand() + " for a total of " + calcHand(playerHand));
+        if (calcHand(playerHand) > 21) {
+            delay(1500);
+            playerBust();
+        }
+    }
+
+    private void playerDoubles() {
+        Console.output("Doubling down...");
+        delay(1500);
+        setCurrentBet(currentBet * 2);
+        dealToPlayerHand(1);
+        pStay = true;
+        dStay = false;
+        Console.output("You now have:\n" + getPlayerHand() + " for a total of " + calcHand(playerHand));
+        if (calcHand(playerHand) > 21) {
+            delay(1500);
+            playerBust();
+            dStay = true;
+        }
+    }
+
+    private void playerStays() {
+        Console.output("Player Stays.");
+        delay(1500);
+        pStay = true;
+        dStay = false;
+    }
+
+    private void dealerHits() {
+        dealToDealerHand(1);
+        delay(1500);
+        Console.output("Dealer hits.");
+        delay(1500);
+        Console.output("Dealer has: " + getDealerHand() + " for a total of " + calcHand(dealerHand));
+    }
+
+    private void dealerStays() {
+        delay(1500);
+        Console.output("Dealer stays.");
+        dStay = true;
+    }
+
+    private void dealerBj() {
+        delay(1500);
+        Console.output("Dealer has BlackJack! You lose!");
+        player.subtractFromBankroll(currentBet);
+        startNextHand();
+    }
+
+    private void playerBj() {
+        delay(1500);
+        Console.output("You have BlackJack! You win!");
+        player.addToBankroll((currentBet * 3) / 2);
+        startNextHand();
+    }
+
+    private void playerPush(){
+        delay(1500);
+        Console.output("It's a push!");
+        startNextHand();
+    }
+
+    private void playerWins(){
+        delay(1500);
+        Console.output("You win!");
+        player.addToBankroll(currentBet);
+    }
+
+    private void dealerWins(){
+        delay(1500);
+        Console.output("You lose!");
+        player.subtractFromBankroll(currentBet);
+
+    }
+
+    private void newDeal(){
+        Console.output("You have " + player.getBankroll() + " in your players account.");
+        delay(1000);
+        int bet = Console.numberFromString(Console.askForInput("How much would you like to bet? "));
+        setCurrentBet(bet);
+        Console.output("Dealing...");
+        delay(2000);
+        startHands();
+        Console.output("You have: " + getPlayerHand() + " for a total of " + calcHand(playerHand));
+        Console.output("Dealer is showing: " + showDealerHand());
+        pStay = false;
+    }
+
+    public void startGame() {
+        start();
+        Console.output("Welcome. I am your dealer Vince.");
+        delay(1000);
+        Console.output("Starting BlackJack...");
+        delay(1000);
+        while (playingBJ) {
+            while (askToPlayAgain) {
+                delay(1000);
+                String answer = Console.askForInput("Would you like to play again? (Y/N)");
+                if (answer.equals("y")) {
+                    setPlayingHands(true);
+                    setAskToPlayAgain(false);
+                } else {
+                    setPlayingHands(false);
+                    setAskToPlayAgain(false);
+                }
+            }
+            while (playingHands) {
+                newDeal();
+                while ((calcHand(playerHand) < 21 && calcHand(dealerHand) < 21) && pStay == false) {
+                    delay(1500);
+                    String action = Console.askForInput("Hit, Stay, Double Down? (H/S/DD)");
+                    if (action.equals("h")) {
+                        playerHits();
+                    }
+                    if (action.equals("dd")) {
+                        playerDoubles();
+                    }
+                    if (action.equals("s")) {
+                        playerStays();
+                    }
+                }
+                Console.output("Dealer has: " + getDealerHand() + " for a total of " + calcHand(dealerHand));
+                while (!dStay) {
+                    if (calcHand(dealerHand) > 21) {
+                        dealerBust();
+                    }
+                    if (calcHand(dealerHand) < 17) {
+                        dealerHits();
+
+                    } else if (calcHand(dealerHand) >= 17 && calcHand(dealerHand) <= 21) {
+                        dealerStays();
+                    }
+                }
+                if (calcHand(dealerHand) == 21) {
+                    dealerBj();
+                } else if (calcHand(playerHand) == 21) {
+                    playerBj();
+                } else if (calcHand(playerHand) == calcHand(dealerHand)) {
+                    playerPush();
+                } else if ((calcHand(playerHand) < 22) && (calcHand(playerHand) > calcHand(dealerHand))) {
+                    playerWins();
+                } else if ((calcHand(dealerHand) < 22) && (calcHand(dealerHand) > calcHand(playerHand))) {
+                    dealerWins();
+                }
+                startNextHand();
+
+            }
+        }
+    }
+}
+>>>>>>> newblackjack

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

@@ -13,6 +13,12 @@ public class Card {
         x = 0;
     }
 
+    public Card() {
+
+    }
+
+
+
     public Rank getRank() {
         return rank;
     }
@@ -32,16 +38,16 @@ public class Card {
     @Override
     public String toString() {
         String describe = "";
-        int x = 5;
-        if (suit.equals(Suit.SPADES)) {
-            describe = rank + "\u2660 of " + suit + "\n";
-        } else if (suit.equals(Suit.CLUBS)) {
-            describe = rank + "\u2663 of " + suit + "\n";
-        } else if (suit.equals(Suit.DIAMONDS)) {
-            describe = rank + "\u2666 of " + suit + "\n";
-        } else if (suit.equals(Suit.HEARTS)) {
-            describe = rank + "\u2665 of " + suit + "\n";
+
+        if (suit == Suit.SPADES) {
+            describe = rank + "\u2660 of " + suit;
+        } else if (suit == Suit.CLUBS) {
+            describe = rank + "\u2663 of " + suit;
+        } else if (suit == Suit.DIAMONDS) {
+            describe = rank + "\u2666 of " + suit;
+        } else if (suit == Suit.HEARTS) {
+            describe = rank + "\u2665 of " + suit;
         }
-        return describe + x;
+        return describe;
     }
 }

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

@@ -14,26 +14,29 @@ public class Casino {
             System.out.println("Which game would you like to play? ");
             System.out.println("1: BlackJack");
             System.out.println("2: Baccarat");
-            choice = Console.askForInput("3: Craps");
-            System.out.println(choice);
+            System.out.println("3: Craps");
+
+            choice = Console.askForInput("Which game would you like to play? ");
 
             if (choice.equalsIgnoreCase("1")) {
+                BlackJack blackjack = new BlackJack();
 
+                blackjack.startGame();
             }
         } while (false);
 
         }
- //   }
+
 
     public static void main(String[] args) {
 
-        CardDeck cardDeck = new CardDeck();
-        cardDeck.getDeck();
-        cardDeck.shuffle();
-        cardDeck.getDeck();
-        System.out.println(cardDeck.draw());
-        cardDeck.deal(2);
-        Casino cas = new Casino();
-        cas.startCasino();
+//        CardDeck cardDeck = new CardDeck();
+//        cardDeck.getDeck();
+//        cardDeck.shuffle();
+//        cardDeck.getDeck();
+//        System.out.println(cardDeck.draw());
+//        cardDeck.deal(2);
+//        Casino cas = new Casino();
+//        cas.startCasino();
     }
 }

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

@@ -1,11 +1,11 @@
 package io.zipcoder.casino;
 
 public class Main {
-//    public static void main(String[] args){
-//        Casino casino =  new Casino();
-//        casino.start();
+    public static void main(String[] args){
+        BlackJack bj =  new BlackJack();
+        bj.startGame();
 
-//    }
+    }
 
 
 }

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

@@ -2,5 +2,5 @@ package io.zipcoder.casino;
 
 public enum Suit {
 
-    SPADES, HEARTS, DIAMONDS, CLUBS;
+    SPADES, HEARTS, DIAMONDS, CLUBS
 }

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

@@ -0,0 +1,99 @@
+package io.zipcoder.casino;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class BlackJackTest {
+
+    @Test
+    void start() {
+    }
+
+    @Test
+    void dealToPlayerHand() {
+    }
+    @Test
+    void dealToDealerHand() {
+    }
+
+    @Test
+    void setPlayingHands() {
+    }
+    @Test
+    void getPlayerHand() {
+    }
+
+    @Test
+    void getDealerHand() {
+    }
+    @Test
+    void showDealerHand() {
+    }
+
+    @Test
+    void setCurrentBet() {
+    }
+    @Test
+    void setAskToPlayAgain() {
+    }
+
+    @Test
+    void resetHands() {
+    }
+    @Test
+    void startHands() {
+    }
+    @Test
+    void startNextHand() {
+    }
+
+    @Test
+    void getCardValue() {
+    }
+    @Test
+    void calcHand() {
+    }
+    @Test
+    void playerBust() {
+    }
+
+    @Test
+    void dealerBust() {
+    }
+    @Test
+    void playerHits() {
+    }
+    @Test
+    void playerDoubles() {
+    }
+
+    @Test
+    void playerStays() {
+    }
+    @Test
+    void dealerHits() {
+    }
+    @Test
+    void dealerStays() {
+    }
+    @Test
+    void dealerBj() {
+    }
+    @Test
+    void playerBj() {
+    }
+    @Test
+    void playerPush() {
+    }
+    @Test
+    void playerWins() {
+    }
+    @Test
+    void dealerWins() {
+    }
+    @Test
+    void newDeal() {
+    }
+
+}

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

@@ -1,3 +1,46 @@
+ HEAD
+package io.zipcoder.casino;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class DiceTest {
+
+    @Test
+    public void getSum1(){
+        Dice dice = new Dice(2);
+        int expected = 6;
+        int actual = dice.getSum();
+        Assert.assertEquals(expected, actual, 6);
+    }
+
+    @Test
+    public void getSum2(){
+        Dice dice = new Dice(5);
+        int expected = 13;
+        int actual = dice.getSum();
+        Assert.assertEquals(expected, actual, 12);
+    }
+
+    @Test
+    public void getEach1(){
+        Dice dice = new Dice(2);
+        int expected = 3;
+        int actual = dice.getEach()[1];
+        Assert.assertEquals(expected, actual, 3);
+    }
+
+    @Test
+    public void getEach2(){
+        Dice dice = new Dice(6);
+        int expected = 3;
+        int actual = dice.getEach()[3];
+        Assert.assertEquals(expected, actual, 3);
+    }
+}
+=======
 package io.zipcoder.casino;
 
 import org.junit.Assert;
@@ -38,3 +81,4 @@ public class DiceTest {
         Assert.assertEquals(expected, actual, 3);
     }
 }
+>>>>>>> origin/dev