From 488ab47c8d35557aa911aa71054f327487aa7757 Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Tue, 5 Sep 2017 18:00:43 +1200 Subject: [PATCH] Finished off chat cucumber test. #story[1246] --- src/test/java/steps/SendChatSteps.java | 14 ++++++++------ src/test/java/steps/ToggleSailSteps.java | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/test/java/steps/SendChatSteps.java b/src/test/java/steps/SendChatSteps.java index b0701628..7d5499ad 100644 --- a/src/test/java/steps/SendChatSteps.java +++ b/src/test/java/steps/SendChatSteps.java @@ -3,19 +3,19 @@ package steps; import cucumber.api.java.en.Given; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; -import javafx.scene.layout.Pane; -import seng302.gameServer.GameStages; -import seng302.gameServer.GameState; +import javafx.util.Pair; +import org.junit.Assert; import seng302.gameServer.MainServerThread; +import seng302.model.stream.packets.StreamPacket; +import seng302.utilities.StreamParser; import seng302.visualiser.ClientToServerThread; -import seng302.visualiser.GameClient; /** + * Cucumber test for sending chat messages * Created by kre39 on 7/08/17. */ public class SendChatSteps { - private boolean dcSent = false; private ClientToServerThread client; private ClientToServerThread host; private MainServerThread mst; @@ -49,7 +49,9 @@ public class SendChatSteps { @Then("^the other client should receive the message \"([^\"]*)\"$") public void the_other_client_should_receive_the_message(String arg1) throws Throwable { - System.out.println("HERE IT IS" + host.getPacketQueue().peek()); + Object[] packets = host.getPacketQueue().toArray(); + Pair message = StreamParser.extractChatterText((StreamPacket) packets[packets.length - 1]); + Assert.assertEquals("[time_prefix] " + arg1, message.getValue()); mst.terminate(); host.setSocketToClose(); client.setSocketToClose(); diff --git a/src/test/java/steps/ToggleSailSteps.java b/src/test/java/steps/ToggleSailSteps.java index 6c3a2f9f..7dd98e37 100644 --- a/src/test/java/steps/ToggleSailSteps.java +++ b/src/test/java/steps/ToggleSailSteps.java @@ -13,6 +13,7 @@ import seng302.model.ServerYacht; import seng302.visualiser.ClientToServerThread; /** + * Cucumber test for toggling sail * Created by kre39 on 7/08/17. */ public class ToggleSailSteps {