tests fixed, highlow fixed

pom.xml

@@ -9,16 +9,11 @@
     <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>3.8.1</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.2.0</version>
             <scope>test</scope>
         </dependency>
-
-
-
     </dependencies>
 </project>

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

@@ -321,4 +321,3 @@ public class BlackJack {
         }
     }
 }
->>>>>>> newblackjack

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

@@ -18,9 +18,9 @@ public abstract class DiceGame implements Gamble, Game{
 
     public abstract int rollDice();
 
-    public abstract void winBet();
+    public abstract void winBet(int currentBet);
 
-    public abstract void loseBet();
+    public abstract void loseBet(int currentBet);
 
     public abstract void declareWinner();
 }

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

@@ -32,6 +32,10 @@ public class HighLow extends DiceGame{
         return wager;
     }
 
+    public void bet(int bet) {
+
+    }
+
     public String makeBet() {
         betCondition = Console.askForInput("What are you betting on?  (H / L / 7)");
         if (betCondition.toLowerCase().equals("h") ||
@@ -55,9 +59,9 @@ public class HighLow extends DiceGame{
                 (betCondition.toUpperCase().equals("L") && rolledDiceResult <  7) ||
                 (betCondition.toUpperCase().equals("7") && rolledDiceResult == 7)) {
             winnings = rolledDiceResult == 7 ? this.totalBet * 4 : this.totalBet * 2;
-            winBet();
+            winBet(winnings);
         } else {
-            loseBet();
+            loseBet(winnings);
         }
     }
 
@@ -76,12 +80,12 @@ public class HighLow extends DiceGame{
         return askToContinue();
     }
 
-    public void winBet() {
+    public void winBet(int winnings) {
         player.addToBankroll(winnings);
         Console.output("You won " + winnings);
     }
 
-    public void loseBet() {
+    public void loseBet(int bet) {
         Console.output("You lost :(");
     }
 

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

@@ -1,8 +1,7 @@
 package io.zipcoder.casino;
 
-import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 class BlackJackTest {
 

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

@@ -1,51 +1,10 @@
- HEAD
 package io.zipcoder.casino;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.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;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DiceTest {
 
@@ -54,7 +13,7 @@ public class DiceTest {
         Dice dice = new Dice(2);
         int expected = 6;
         int actual = dice.getSum();
-        Assert.assertEquals(expected, actual, 6);
+        assertEquals(expected, actual, 6);
     }
 
     @Test
@@ -62,7 +21,7 @@ public class DiceTest {
         Dice dice = new Dice(5);
         int expected = 13;
         int actual = dice.getSum();
-        Assert.assertEquals(expected, actual, 12);
+        assertEquals(expected, actual, 12);
     }
 
     @Test
@@ -70,7 +29,7 @@ public class DiceTest {
         Dice dice = new Dice(2);
         int expected = 3;
         int actual = dice.getEach()[1];
-        Assert.assertEquals(expected, actual, 3);
+        assertEquals(expected, actual, 3);
     }
 
     @Test
@@ -78,7 +37,6 @@ public class DiceTest {
         Dice dice = new Dice(6);
         int expected = 3;
         int actual = dice.getEach()[3];
-        Assert.assertEquals(expected, actual, 3);
+        assertEquals(expected, actual, 3);
     }
 }
->>>>>>> origin/dev

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

@@ -1,7 +1,9 @@
 package io.zipcoder.casino;
 
-import org.junit.Assert;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HighLowTest {
 
@@ -12,8 +14,32 @@ public class HighLowTest {
     public void rollDice1(){
         int expected = 6;
         int actual = game.rollDice();
-        Assert.assertEquals(expected, actual, 6);
+        assertEquals(expected, actual, 6);
     }
 
+    @Test
+    public void askForWager() {
+        int expected = 10;
+
+        int wager = 0;
+        boolean flag = true;
+        Console.output("Current bankroll: " + this.player.getBankroll());
+        while (flag) {
+            try {
+                wager = 10;
+                if (wager <= 0 || wager > this.player.getBankroll()) {
+                    Console.output("Wrong input! Try again!");
+                } else {
+                    flag = false;
+                }
+            } catch(NumberFormatException e) {
+                Console.output("Wrong input! Try again!");
+            }
+        }
+        this.player.subtractFromBankroll(wager);
+        int actual = wager;
+
+        assertEquals(expected, actual);
+    }
 
 }