From 302bc91461330636b69a4cd736e26ac7abbbae16 Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Tue, 5 Sep 2017 18:17:20 +1200 Subject: [PATCH] Tried to fix build by removing invalid '>' char. #story[1246] --- .../java/seng302/gameServer/ServerToClientThread.java | 4 ++-- src/test/java/features/chatterMessage.feature | 1 - .../seng302/gameServer/server/ChatCommandsTest.java | 10 +++++----- src/test/java/seng302/models/YachtTest.java | 1 + 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 src/test/java/features/chatterMessage.feature diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java index 2b447cf1..73c731e7 100644 --- a/src/main/java/seng302/gameServer/ServerToClientThread.java +++ b/src/main/java/seng302/gameServer/ServerToClientThread.java @@ -388,7 +388,7 @@ public class ServerToClientThread implements Runnable, Observer { String[] words = chatterText.split("\\s+"); if (words.length > 2 && isHost) { switch (words[2].trim()) { - case ">speed": + case "/speed": try { GameState.setSpeedMultiplier(Double.valueOf(words[3])); GameState.broadcastChatter(new ChatterMessage( @@ -399,7 +399,7 @@ public class ServerToClientThread implements Runnable, Observer { logger.error("cannot parse >speed value"); } return; - case ">finish": + case "/finish": GameState.broadcastChatter(new ChatterMessage( chatterPayload[1], "SERVER: Game will now finish" diff --git a/src/test/java/features/chatterMessage.feature b/src/test/java/features/chatterMessage.feature deleted file mode 100644 index 20bedb70..00000000 --- a/src/test/java/features/chatterMessage.feature +++ /dev/null @@ -1 +0,0 @@ -Feature: Sending chatter packets over the web. \ No newline at end of file diff --git a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java index 16e51f2c..51d766b1 100644 --- a/src/test/java/seng302/gameServer/server/ChatCommandsTest.java +++ b/src/test/java/seng302/gameServer/server/ChatCommandsTest.java @@ -65,7 +65,7 @@ public class ChatCommandsTest { } catch (InterruptedException ie) { ie.printStackTrace(); } - host.sendChatterMessage("[time_prefix] >finish"); + host.sendChatterMessage("[time_prefix] /finish"); dcSent = true; try { Thread.sleep(2000); @@ -101,7 +101,7 @@ public class ChatCommandsTest { ie.printStackTrace(); } mst.startGame(); - host.sendChatterMessage("[time_prefix] >speed 5.0"); + host.sendChatterMessage("[time_prefix] /speed 5.0"); try { Thread.sleep(100); } catch (InterruptedException ie) { @@ -142,7 +142,7 @@ public class ChatCommandsTest { ie.printStackTrace(); } mst.startGame(); - host.sendChatterMessage("[time_prefix] >speed fdgdgdfg"); + host.sendChatterMessage("[time_prefix] /speed fdgdgdfg"); try { Thread.sleep(100); } catch (InterruptedException ie) { @@ -190,7 +190,7 @@ public class ChatCommandsTest { } catch (InterruptedException ie) { ie.printStackTrace(); } - client.sendChatterMessage("[time_prefix] >speed 5.0"); + client.sendChatterMessage("[time_prefix] /speed 5.0"); try { Thread.sleep(200); } catch (InterruptedException ie) { @@ -264,7 +264,7 @@ public class ChatCommandsTest { // } catch (InterruptedException ie) { // ie.printStackTrace(); // } - host.sendChatterMessage("[time_prefix] >finish"); + host.sendChatterMessage("[time_prefix] /finish"); dcSent = true; // try { // Thread.sleep(200); diff --git a/src/test/java/seng302/models/YachtTest.java b/src/test/java/seng302/models/YachtTest.java index 98cba53b..12178ada 100644 --- a/src/test/java/seng302/models/YachtTest.java +++ b/src/test/java/seng302/models/YachtTest.java @@ -21,6 +21,7 @@ public class YachtTest { @BeforeClass public static void setUp() { + new GameState("localhost"); y1 = new ServerYacht("Yacht", 1, "Y1", "Y1", "Yacht 1", "C1"); gs = new GameState("localhost"); }