final

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

@@ -16,8 +16,7 @@ public class BlackJack extends CardGame implements Gambling {
     boolean playAgain = true;
 
     public BlackJack(Player aPlayer) {
-        this.aPlayer = aPlayer;
-    }
+        this.aPlayer = aPlayer;}
 
     int aPlayerScore = Game.playerScore;
     int aHouseScore = Game.houseScore;
@@ -49,25 +48,18 @@ public class BlackJack extends CardGame implements Gambling {
 
             if (value <= 10) {
                 sum += value;
-            }
-            if (rank.equals(Rank.JACK) || rank.equals(Rank.QUEEN) || rank.equals(Rank.KING)) {
+            } if (rank.equals(Rank.JACK) || rank.equals(Rank.QUEEN) || rank.equals(Rank.KING)) {
                 sum += 10;
-            }
-            if (rank.equals(Rank.ACE)) {
+            } if (rank.equals(Rank.ACE)) {
                 sum += 0;
-            }
-            if (rank.equals(Rank.ACE)) {
-                countAces += 1;
-            }
-        }
-        if (countAces == 0) {
+            } if (rank.equals(Rank.ACE)) {
+                countAces += 1;}
+            } if (countAces == 0) {
             return sum;
-        }
-        if ((sum + 11 + (countAces - 1)) <= 21) {
+            } if ((sum + 11 + (countAces - 1)) <= 21) {
             return sum + 11 + (countAces - 1);
-        } else {
-            return sum + countAces;
-        }
+            } else {
+            return sum + countAces; }
     }
 
     //lets the player know of the starting hand
@@ -75,8 +67,7 @@ public class BlackJack extends CardGame implements Gambling {
         StringBuilder builder = new StringBuilder();
         for (Card c : hand) {
             String cardString = (c.getRank() + " of " + c.getSuit());
-            builder.append(cardString).append("\n");
-        }
+            builder.append(cardString).append("\n"); }
         return builder.toString();
     }
 
@@ -84,27 +75,23 @@ public class BlackJack extends CardGame implements Gambling {
     public String houseHandToString(List<Card> hand, int cardsToShow) {
         StringBuilder builder = new StringBuilder();
         for (int i = 0; i < cardsToShow; i++) {
-            builder.append(hand.get(i).getRank() + " of " + hand.get(i).getSuit() + "\n");
-        }
+            builder.append(hand.get(i).getRank() + " of " + hand.get(i).getSuit() + "\n"); }
         return builder.toString();
     }
 
 
     //draws a singe card
     public Card drawSingleCard() {
-
         return deck.draw();
     }
 
     //Gets the int value of a single drawn card
     public int getSingleCardValue(List<Card> hand) {
         int cardValue = 0;
-
         for (Card c : hand) {
             Rank rank = c.getRank();
             int value = rank.getValue();
-            cardValue += value;
-        }
+            cardValue += value; }
         return cardValue;
     }
 
@@ -152,7 +139,6 @@ public class BlackJack extends CardGame implements Gambling {
             aHouseScore = houseHandTotal;
 
             //show the player one of house's card
-            //I need to figure out how I could only show one card
             String houseHandString = houseHandToString(houseHand, 1);
             aConsole.println("-The house has drawn: \n" + houseHandString +
                     "And has one card faced down\n");
@@ -171,45 +157,9 @@ public class BlackJack extends CardGame implements Gambling {
                 if (playerDecision.equalsIgnoreCase("Stand")) {
                     //House start drawing cards
                     houseDraws(houseHand);
-                    break;
-                }
+                    break; }
             }
 
-
-////<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-//
-//            //working on extracting methods from the big method
-//
-//            public void decision() {
-//                //House winning situations
-//                //Bust
-//                if (aPlayerScore > 21) {
-//                    playerBust();
-//                }
-//
-//                //House has higher score
-//                else if ((aHouseScore >= aPlayerScore && aHouseScore < 21) || aHouseScore == 21) {
-//                    houseHigherScore();
-//                }
-//
-//
-//                //Player winning situation
-//                //houseBust
-//                else if (aHouseScore < 21) {
-//                    houseBust();
-//                }
-//
-//                //Other winning situations
-//                else {
-//                    everyPossibleWinningSituation();
-//                }
-//
-//            }
-////<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-
-
-            //House winning situations
             //Bust
             if (aPlayerScore > 21) {
                 aConsole.println("\nBust!\n");
@@ -226,9 +176,6 @@ public class BlackJack extends CardGame implements Gambling {
                 betChages(bet);
                 aConsole.println("Your current available chips: \n" + aPlayer.getTotalChips() + "\n");
             }
-
-
-
             //Player winning situation
             else if (aHouseScore < 21) {
                 aConsole.println("\nYou win!\n");
@@ -243,9 +190,6 @@ public class BlackJack extends CardGame implements Gambling {
                 betChages(bet);
                 aConsole.println("Your current available chips: \n" + aPlayer.getTotalChips() + "\n");
             }
-
-
-
             //End of the game
             if ((aPlayer.getTotalChips() == 0) || aConsole.yesOrNo("Would you like to play again?").equalsIgnoreCase("no")) {
                 playAgain = false;
@@ -313,69 +257,6 @@ public class BlackJack extends CardGame implements Gambling {
             aPlayer.setTotalChips(totalChips - wageAmount);
         }
     }
-
-
-
-
-
-
-
-
-
-////<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-//
-//    //working on extracting methods from the big method
-//
-//
-//    public void playerBust() {
-//        //if (aPlayerScore > 21) {
-//            aConsole.println("\nBust!\n");
-//           win = false;
-//           betChages(bet);
-//           aConsole.println("Your current available chips: \n" + aPlayer.getTotalChips());
-//        //}
-//    }
-//
-//    public void  houseHigherScore() {
-//        //if ((aHouseScore >= aPlayerScore && aHouseScore < 21) || aHouseScore == 21) {
-//            aConsole.println("\nYou lose\n" + "Your score: " + aPlayerScore +
-//                    "\nHouse score: " + aHouseScore + "\n");
-//            aConsole.println("-Dealer's hand: \n" + handToString(houseHand));
-//            win = false;
-//            betChages(bet);
-//            aConsole.println("Your current available chips: \n" + aPlayer.getTotalChips() + "\n");
-//        //}
-//    }
-//
-//
-//
-//    public void houseBust() {
-//        //if (aHouseScore < 21) {
-//            aConsole.println("\nYou win!\n");
-//            win = true;
-//            betChages(bet);
-//            aConsole.println("Your current available chips: \n" + aPlayer.getTotalChips() + "\n");
-//        //}
-//    }
-//
-//
-//
-//
-//public void everyPossibleWinningSituation() {
-//    //else{
-//        //aConsole.println("You win!");
-//        aConsole.println("\nYou win!\n" + "Your score: " + aPlayerScore +
-//                "\nHouse score: " + aHouseScore + "\n");
-//        win = true;
-//        betChages(bet);
-//        aConsole.println("Your current available chips: \n" + aPlayer.getTotalChips() + "\n");
-//    //}
-//}
-//
-////<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-
-
 }
 
 

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

@@ -23,28 +23,6 @@ public class BlackJackTest {
         this.testBlackJack = new BlackJack(p);
     }
 
-//    @Test
-//    public void testStartPlayerScore() {
-//        //Given
-//
-//        //When
-//        int expected = 8;
-//        int actual = 8;
-//        //Result
-//        assertEquals(actual, expected);
-//    }
-//
-//    @Test
-//    public void testStartHouseScore() {
-//        //Given
-//
-//        //When
-//        int expected = 21;
-//        int actual = 21;
-//        //Result
-//        assertEquals(actual, expected);
-//    }
-
     @Test
     public void testDrawNewHandHasTwoCards() {
         int expected = 2;
@@ -102,7 +80,6 @@ public class BlackJackTest {
         assertEquals(expected, actual);
     }
 
-
 @Test
     public void testPlayerHit() {
         Card c = new Card(Rank.TWO, Suit.SPADES);