From ec7ee34305a92dbf7af8a7b837ce00908101d257 Mon Sep 17 00:00:00 2001
From: Kusal Ekanayake <kre39@uclive.ac.nz>
Date: Tue, 12 Sep 2017 16:52:26 +1200
Subject: [PATCH] Fixed tests.

---
 .../visualiser/fxObjects/ChatHistory.java     |  3 ++
 .../gameServer/server/ChatCommandsTest.java   | 11 ++++--
 src/test/java/steps/SendChatSteps.java        |  6 ++++
 src/test/java/steps/ToggleSailSteps.java      | 35 ++++++++++---------
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/main/java/seng302/visualiser/fxObjects/ChatHistory.java b/src/main/java/seng302/visualiser/fxObjects/ChatHistory.java
index 3292bf6f..87e920a0 100644
--- a/src/main/java/seng302/visualiser/fxObjects/ChatHistory.java
+++ b/src/main/java/seng302/visualiser/fxObjects/ChatHistory.java
@@ -70,4 +70,7 @@ public class ChatHistory extends ScrollPane {
         }
 
     }
+
+
+
 }
diff --git a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java
index 07f6baf2..221a6782 100644
--- a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java
+++ b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java
@@ -68,9 +68,11 @@ public class ChatCommandsTest {
             } catch (InterruptedException ie) {
                 ie.printStackTrace();
             }
+            mst.terminate();
             host = null;
             client = null;
             mst = null;
+
         } catch (IOException ioe) {
             ioe.printStackTrace();
         }
@@ -86,6 +88,11 @@ public class ChatCommandsTest {
         new GameState("localhost");
         mst = new MainServerThread();
         host = null;
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException ie) {
+            ie.printStackTrace();
+        }
         try {
             host = new ClientToServerThread("localhost", 4942);
         } catch (IOException ioe) {
@@ -97,7 +104,7 @@ public class ChatCommandsTest {
             ie.printStackTrace();
         }
         mst.startGame();
-        host.sendChatterMessage("[time_prefix] <name_prefix> >speed 5.0");
+        host.sendChatterMessage("[time_prefix] <name_prefix> >speed 5");
         try {
             Thread.sleep(100);
         } catch (InterruptedException ie) {
@@ -106,7 +113,7 @@ public class ChatCommandsTest {
         Assert.assertEquals(5.0, GameState.getSpeedMultiplier(), 0.00001);
         mst.terminate();
         try {
-            Thread.sleep(2000);
+            Thread.sleep(200);
         } catch (InterruptedException ie) {
             ie.printStackTrace();
         }
diff --git a/src/test/java/steps/SendChatSteps.java b/src/test/java/steps/SendChatSteps.java
index 3c10260d..e9e1ff2e 100644
--- a/src/test/java/steps/SendChatSteps.java
+++ b/src/test/java/steps/SendChatSteps.java
@@ -5,6 +5,7 @@ import cucumber.api.java.en.Then;
 import cucumber.api.java.en.When;
 import javafx.util.Pair;
 import org.junit.Assert;
+import seng302.gameServer.GameState;
 import seng302.gameServer.MainServerThread;
 import seng302.model.stream.packets.StreamPacket;
 import seng302.utilities.StreamParser;
@@ -24,6 +25,11 @@ public class SendChatSteps {
     @Given("^There are two games running$")
     public void the_are_two_games_running() throws Throwable {
         mst = new MainServerThread();
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException ie) {
+            ie.printStackTrace();
+        }
         host = new ClientToServerThread("localhost", 4942);
         try {
             Thread.sleep(100);
diff --git a/src/test/java/steps/ToggleSailSteps.java b/src/test/java/steps/ToggleSailSteps.java
index 034c10e1..347fe1d1 100644
--- a/src/test/java/steps/ToggleSailSteps.java
+++ b/src/test/java/steps/ToggleSailSteps.java
@@ -23,31 +23,32 @@ public class ToggleSailSteps {
 
     @Given("^The game is running$")
     public void the_game_is_running() throws Throwable {
-//        mst = new MainServerThread();
-//        client = new ClientToServerThread("localhost", 4942);
-//        GameState.setCurrentStage(GameStages.RACING);
-//        Thread.sleep(200); // Sleep needed to help the threads all be up to speed with each other
-//        ServerYacht yacht = (new ArrayList<>(GameState.getYachts().values())).get(0);
-//        Assert.assertFalse(yacht.getSailIn());
+        mst = new MainServerThread();
+        client = new ClientToServerThread("localhost", 4942);
+        GameState.setCurrentStage(GameStages.RACING);
+        Thread.sleep(200); // Sleep needed to help the threads all be up to speed with each other
+        ServerYacht yacht = (new ArrayList<>(GameState.getYachts().values())).get(0);
+        Assert.assertFalse(yacht.getSailIn());
     }
 
 
     @When("^the user has pressed \"([^\"]*)\"$")
     public void the_user_has_pressed(String arg1) throws Throwable {
-//        startTime = System.currentTimeMillis();
-//        if (arg1 == "shift") {
-//            client.sendBoatAction(BoatAction.SAILS_IN);
-//        }
+        startTime = System.currentTimeMillis();
+        if (arg1 == "shift") {
+            client.sendBoatAction(BoatAction.SAILS_IN);
+        }
     }
 
     @Then("^the sails are \"([^\"]*)\"$")
     public void the_sails_are(String arg1) throws Throwable {
-//        Thread.sleep(200); // Sleep needed to help the threads all be up to speed with each other
-//        ServerYacht yacht = (new ArrayList<>(GameState.getYachts().values())).get(0);
-//        if (arg1 == "in") {
-//            Assert.assertTrue(yacht.getSailIn());
-//        } else {
-//            Assert.assertFalse(yacht.getSailIn());
-//        }
+        Thread.sleep(200); // Sleep needed to help the threads all be up to speed with each other
+        ServerYacht yacht = (new ArrayList<>(GameState.getYachts().values())).get(0);
+        if (arg1 == "in") {
+            Assert.assertTrue(yacht.getSailIn());
+        } else {
+            Assert.assertFalse(yacht.getSailIn());
+        }
+        mst.terminate();
     }
 }