Merge branch 'develop' into Story64_SailsAnimations

# Conflicts:
#	src/main/java/seng302/visualiser/GameClient.java

src/test/java/seng302/TestRaceTimer.java

@@ -1,22 +0,0 @@
-package seng302;
-
-import org.junit.Test;
-
-
-public class TestRaceTimer {
-    @Test
-    public void testPositiveTimeString(){
-//        RaceViewController controller = new RaceViewController();
-//        String result = controller.convertTimeToMinutesSeconds(61);
-//
-//        assertTrue(result.equals("01:01"));
-   }
-
-   @Test
-   public void testNegativeTimeString(){
-//		RaceViewController controller = new RaceViewController();
-//        String result = controller.convertTimeToMinutesSeconds(-61);
-//
-//        assertTrue(result.equals("-01:01"));
-    }
-}

src/test/java/seng302/models/YachtTest.java

@@ -37,12 +37,12 @@ public class YachtTest {
         for (Double begin : values.keySet()) {
             y1.setHeading(begin);
             y1.tackGybe(windDirection);
-            for (int i = 0; i < 50; i++) {
+
+            for (int i = 0; i < 200; i++) {
                 y1.runAutoPilot();
             }
             assertEquals(values.get(begin), y1.getHeading(), 5.0);
         }
-
     }
 
     @Test
@@ -67,12 +67,10 @@ public class YachtTest {
         values.put(350d, downwindRight);
 
         for (Double begin : values.keySet()) {
-            System.out.println(begin);
             y1.setHeading(begin);
             y1.turnToVMG();
-            for (int i = 0; i < 50; i++) {
+            for (int i = 0; i < 200; i++) {
                 y1.runAutoPilot();
-                System.out.println(y1.getHeading());
             }
             y1.disableAutoPilot();
             assertEquals(values.get(begin), y1.getHeading(), 5.0);

src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java

@@ -0,0 +1,80 @@
+package seng302.visualiser.ClientToServerTests;
+
+import java.util.ArrayList;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import seng302.gameServer.GameStages;
+import seng302.gameServer.GameState;
+import seng302.gameServer.MainServerThread;
+import seng302.gameServer.server.messages.BoatAction;
+import seng302.model.Yacht;
+import seng302.visualiser.ClientToServerThread;
+
+/**
+ * Test for checking how regularly packets are sent from ClientToServer Thread.
+ */
+public class RegularPacketsTest {
+
+    private MainServerThread serverThread;
+    private ClientToServerThread clientThread;
+
+    @Before
+    public void setup() throws Exception {
+        new GameState("localhost");
+        serverThread = new MainServerThread();
+        clientThread = new ClientToServerThread("localhost", 4942);
+        GameState.setCurrentStage(GameStages.RACING);
+    }
+
+    @Test
+    public void packetsSentAtRegularIntervals () throws Exception {
+        final double TEST_DISTANCE = 10.0;
+        serverThread.startGame();
+        SleepThreadMaxDelay();
+        Yacht yacht = new ArrayList<>(GameState.getYachts().values()).get(0);
+        double startAngle = yacht.getHeading();
+        long startTime = System.currentTimeMillis();
+        clientThread.sendBoatAction(BoatAction.UPWIND);
+        Thread.sleep(200);
+        while (Math.abs(yacht.getHeading() - startAngle) < TEST_DISTANCE) {
+            Thread.sleep(1);
+        }
+        clientThread.sendBoatAction(BoatAction.MAINTAIN_HEADING);
+        long endTime = System.currentTimeMillis();
+        SleepThreadMaxDelay();
+        //Allowed to be two loops of delay due to loop delay and processing delay at client + server ends.
+        Assert.assertEquals(TEST_DISTANCE / Yacht.TURN_STEP * ClientToServerThread.PACKET_SENDING_INTERVAL_MS,
+            (endTime - startTime), 2 * ClientToServerThread.PACKET_SENDING_INTERVAL_MS);
+    }
+
+//    @Test
+//    public void testArbitraryPacketSent() throws Exception {
+//        serverThread.startGame();
+//        SleepThreadMaxDelay();
+//        Yacht yacht = new ArrayList<>(GameState.getYachts().values()).get(0);
+//        boolean startState = yacht.getSailIn();
+//        clientThread.sendBoatAction(BoatAction.SAILS_IN);
+//        SleepThreadMaxDelay();
+//        Assert.assertEquals(startState, !yacht.getSailIn());
+//    }
+
+    /**
+     * Give time for processing and packet sending. 200ms listed as absolute maximum for an
+     * acceptable delay.
+     * @throws Exception Thrown if thread crashes or something
+     */
+    private void SleepThreadMaxDelay() throws Exception {
+        Thread.sleep(200);
+    }
+
+    @After
+    public void teardown () throws Exception {
+        clientThread.setSocketToClose();
+        serverThread.terminate();
+        GameState.setCurrentStage(GameStages.LOBBYING);
+        for (int i = 0; i<20; i++)
+            SleepThreadMaxDelay(); //Make sure socket is closed and toolkit remade.
+    }
+}

src/test/java/seng302/visualiser/annotations/TestImportantAnnotationState.java

@@ -1,4 +1,4 @@
-package seng302.visualizer.annotations;
+package seng302.visualiser.annotations;
 
 import static org.junit.Assert.assertEquals;