Merge branch 'master' into story_61

Also got client-server handshake working. Multiple clients can connect and control their own boat.
The client's boat has a larger black triangle drawn around it. Probably needs tidying up.
Added isClientBoat boolean to VisualiserBoat.

WindGenerator is now an interface, implemented by ConstantWindGenerator (useful for testing) and RandomWindGenerator. Added ConstantWindGeneratorTest.
RandomWindGenerator was formerly WindGenerator.
The WindGenerator is passed in to MockRace.

CommandFactory throws a CommandConstructionException if it cannot create a command.

MessageSerialiser and MessageDeserialiser correctly terminate on error.

Readded VisualiserInput's switch statement in the main loop, pending a refactor.

Removed the sleep statement from LobbyController - it was blocking javaFX thread.

Lobby.fxml: moved buttons and text input into grid panes, so they don't break when you resize screen.

Added some test object creation functions in several test classes (MockRaceTest.createMockRace(), BoatXMLReaderTest.createBoatDataSource(), etc...).

#story[1095]

racevisionGame/src/test/java/mock/model/commandFactory/WindCommandTest.java

@@ -1,31 +1,72 @@
 package mock.model.commandFactory;
 
+import mock.exceptions.CommandConstructionException;
+import mock.model.MockBoat;
 import mock.model.MockRace;
+import mock.model.MockRaceTest;
+import network.Messages.BoatAction;
 import network.Messages.Enums.BoatActionEnum;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
+import shared.exceptions.InvalidBoatDataException;
+import shared.exceptions.InvalidRaceDataException;
+import shared.exceptions.InvalidRegattaDataException;
+import shared.model.Bearing;
 import shared.model.Boat;
 import shared.model.Race;
 import visualiser.model.VisualiserRace;
 
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.*;
+import static org.mockito.Mockito.mock;
 
 /**
  * Created by connortaylorbrown on 4/08/17.
  */
 public class WindCommandTest {
-    private Race race;
-    private Boat boat;
+    private MockRace race;
+    private MockBoat boat;
     private Command upwind;
     private Command downwind;
+    private double initial;
+
+    private double offset = 3.0;
 
     @Before
-    public void setUp() {
-        boat = new Boat(0, "Bob", "NZ");
+    public void setUp() throws CommandConstructionException, InvalidBoatDataException, InvalidRegattaDataException, InvalidRaceDataException {
+        race = MockRaceTest.createMockRace();
+
+        boat = race.getBoats().get(0);
+
+
+        //when(race.getWindDirection()).thenReturn(Bearing.fromDegrees(0.0));
+        boat.setBearing(Bearing.fromDegrees(45.0));
+
+        BoatAction upwindAction = new BoatAction(BoatActionEnum.UPWIND);
+        upwindAction.setSourceID(boat.getSourceID());
+
+        BoatAction downwindAction = new BoatAction(BoatActionEnum.DOWNWIND);
+        downwindAction.setSourceID(boat.getSourceID());
+
+        upwind = CommandFactory.createCommand(race, upwindAction);
+        downwind = CommandFactory.createCommand(race, downwindAction);
+
+        initial = boat.getBearing().degrees();
+    }
+
+    /**
+     * Ensure the difference between initial and final angle is 3 degrees
+     */
+    @Test
+    public void upwindCommandDecreasesAngle() {
+        upwind.execute();
+        assertEquals(initial - boat.getBearing().degrees(), -offset, 1e-5);
     }
 
     @Test
-    public void upwindCommandDecreasesAngle() {
-
+    public void downwindCommandIncreasesAngle() {
+        downwind.execute();
+        assertEquals(initial - boat.getBearing().degrees(), offset, 1e-5);
     }
-}
+}