From 9c1fe72f6b6029c199d17673134c28f4611aece4 Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Mon, 14 Aug 2017 13:35:18 +1200 Subject: [PATCH] Merge and tests fix --- src/test/java/steps/ToggleSailSteps.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/test/java/steps/ToggleSailSteps.java b/src/test/java/steps/ToggleSailSteps.java index 2347c9ce..222f4b3d 100644 --- a/src/test/java/steps/ToggleSailSteps.java +++ b/src/test/java/steps/ToggleSailSteps.java @@ -7,13 +7,11 @@ import org.junit.Assert; import seng302.gameServer.GameStages; import seng302.gameServer.GameState; import seng302.gameServer.MainServerThread; -import seng302.gameServer.server.messages.BoatActionMessage; -import seng302.gameServer.server.messages.BoatActionType; +import seng302.gameServer.server.messages.BoatAction; import seng302.model.Yacht; import seng302.visualiser.ClientToServerThread; import java.util.ArrayList; -import java.util.Collections; /** * Created by kre39 on 7/08/17. @@ -44,11 +42,7 @@ public class ToggleSailSteps { public void the_user_has_pressed(String arg1) throws Throwable { startTime = System.currentTimeMillis(); if (arg1 == "shift") { - if (sailsIn) { - client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_OUT)); - } else { - client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_IN)); - } + client.sendBoatAction(BoatAction.SAILS_IN); } }