feat: added more tests for the check victor method

TeamIO-NZ · Oct 27, 2020 · 2996d37 · 2996d37
1 parent d9a8a95
commit 2996d37
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/Readme.md b/Readme.md
@@ -8,19 +8,21 @@
 |Task|Status|James|Joe|
 |:---|:---:|:---:|:---:|
 |Create Repo|[x]|[x]|[x]|
-|Collect requirements from Sim Discussion|[x]|[ ]|[ ]|
+|Collect requirements from Sim Discussion|[x]|[x]|[x]|
 |Put requirements in Readme.md|[x]|[x]|[x]|
-|User Acceptance Test Spreadsheet|[x]|[ ]|[ ]|
+|User Acceptance Test Spreadsheet|[x]|[x]|[x]|
 |Traceability Matrix|[x]|[x]|[x]|
-|Test plans (at least 2)|[ ]|[ ]|[ ]|
-|Code Program|[ ]|[ ]|[ ]|
-|Implement Unit Tests|[ ]|[ ]|[ ]|
+|Test plans (at least 2)|[ ]|[x]|[ ]|
+|Code Program|[x]|[x]|[x]|
+|Implement Unit Tests|[x]|[x]|[x]|
 |Explain away not included Methods|[ ]|[ ]|[ ]|
 |500-1000 word report per test run|[ ]|[ ]|[ ]|
 |Screenshots of tests in action|[ ]|[ ]|[ ]|
 |Executive Summary|[ ]|[ ]|[ ]|
 |Ensure Contribution gap < 20%|[ ]|[ ]|[ ]|
 
+Joe might have broken our contribution gap by writing CI/CD stuff
+
 ## Requirements
 
 //work on this section

diff --git a/src/test/java/com/iosoftworks/st/assignmenttwo/tests/GameManagerTest.java b/src/test/java/com/iosoftworks/st/assignmenttwo/tests/GameManagerTest.java
@@ -50,32 +50,34 @@ public void sumScoreAI_testChange_expectsNotZero(){
         GameManager.getInstance().getPlayers().get(1).sumScore();
         Assert.assertTrue(GameManager.getInstance().getPlayers().get(1).totalScore >= 0);
     }
-    //TODO
     @Test
-    public void CheckWinnerHuman_ExpectingTrue(){
+    public void CheckWinnerHuman_Score21bar2_ExpectingTrue(){
         GameManager.getInstance().getPlayers().get(0).totalScore = 21;
         GameManager.getInstance().getPlayers().get(1).totalScore = 2;
         Assert.assertEquals(GameManager.getInstance().getPlayers().get(0),GameManager.getInstance().checkVictor());
     }
-    //TODO
     @Test
-    public void CheckWinnerAI_ExpectingTrue(){
+    public void CheckWinnerAI_Score2bar21_ExpectingTrue(){
         GameManager.getInstance().getPlayers().get(0).totalScore = 2;
         GameManager.getInstance().getPlayers().get(1).totalScore = 21;
         Assert.assertEquals(GameManager.getInstance().getPlayers().get(1),GameManager.getInstance().checkVictor());
     }
-    //TODO
     @Test
-    public void CheckWinnerDraw_ExpectingTrue(){
+    public void CheckWinnerDraw_Score22bar22_ExpectingTrue(){
         GameManager.getInstance().getPlayers().get(0).totalScore = 22;
         GameManager.getInstance().getPlayers().get(1).totalScore = 22;
-        Assert.assertEquals(null,GameManager.getInstance().checkVictor());
+        Assert.assertNull(GameManager.getInstance().checkVictor());
     }
-    //TODO
     @Test
-    public void CheckWinnerNull_ExpectingTrue(){
-        GameManager.getInstance().getPlayers().get(0).totalScore = 22;
-        GameManager.getInstance().getPlayers().get(1).totalScore = 22;
-        Assert.assertEquals(null,GameManager.getInstance().checkVictor());
+    public void CheckWinnerHuman_Score21bar20_ExpectingTrue(){
+        GameManager.getInstance().getPlayers().get(0).totalScore = 21;
+        GameManager.getInstance().getPlayers().get(1).totalScore = 20;
+        Assert.assertEquals(GameManager.getInstance().getPlayers().get(0),GameManager.getInstance().checkVictor());
+    }
+    @Test
+    public void CheckWinnerAI_Score21bar20_ExpectingTrue(){
+        GameManager.getInstance().getPlayers().get(0).totalScore = 20;
+        GameManager.getInstance().getPlayers().get(1).totalScore = 21;
+        Assert.assertEquals(GameManager.getInstance().getPlayers().get(1),GameManager.getInstance().checkVictor());
     }
 }