Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock

mock/src/main/java/seng302/Data/RaceData.java

@@ -153,6 +153,8 @@ public class RaceData {
             StreamResult result = new StreamResult(stringWriter);
             transformer.transform(source,result);
 
+            System.out.println(stringWriter.toString());
+
             return stringWriter.toString();
 
 

mock/src/main/java/seng302/Model/Race.java

@@ -64,6 +64,11 @@ public class Race implements Runnable {
 
     }
 
+    //Constructor used in testing
+    public Race(List<BoatInRace> boats, List<Leg> legs, int scaleFactor) {
+        this(boats, legs, scaleFactor, null);
+    }
+
     public Race(RaceDataSource raceData, int scaleFactor, OutputStream outputStream) {
         this(raceData.getBoats(), raceData.getLegs(), scaleFactor, outputStream);
     }

mock/src/test/java/seng302/Model/RaceTest.java

@@ -3,8 +3,13 @@ package seng302.Model;
 import javafx.scene.paint.Color;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.xml.sax.SAXException;
 import seng302.GPSCoordinate;
+import seng302.Mock.RaceDataSource;
+import seng302.RaceXMLReader;
 
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -22,7 +27,7 @@ public class RaceTest {
 
     @Ignore
     @Test
-    public void timerCanBeDisabled() {
+    public void timerCanBeDisabled(){
         BoatInRace boat1 = new BoatInRace("Test 1", 10000, Color.ALICEBLUE, "t1", 1);
         BoatInRace boat2 = new BoatInRace("Test 2", 10000, Color.BURLYWOOD, "t2", 2);
         //BoatInRace[] boats = new BoatInRace[]{boat1, boat2};