newblackjsc

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,45 +1,45 @@
-<<<<<<< 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);
-//    }
-//}
+ 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;