diff --git a/visualiser/src/main/java/seng302/Mock/StreamedBoat.java b/visualiser/src/main/java/seng302/Mock/StreamedBoat.java index 6c5a9c89..419478d9 100644 --- a/visualiser/src/main/java/seng302/Mock/StreamedBoat.java +++ b/visualiser/src/main/java/seng302/Mock/StreamedBoat.java @@ -49,8 +49,4 @@ public class StreamedBoat extends Boat { } return azimuth; } - - public int getSourceID() { - return sourceID; - } } diff --git a/visualiser/src/main/java/seng302/VisualiserInput.java b/visualiser/src/main/java/seng302/VisualiserInput.java index b538fc24..3eb1575d 100644 --- a/visualiser/src/main/java/seng302/VisualiserInput.java +++ b/visualiser/src/main/java/seng302/VisualiserInput.java @@ -1,4 +1,4 @@ -package seng302.Networking; +package seng302; import org.xml.sax.SAXException; import seng302.Mock.*; import seng302.Networking.BinaryMessageDecoder; @@ -37,14 +37,13 @@ public class VisualiserInput implements Runnable private Map boatLocation; - public VisualiserInput(Socket connectionSocket) throws IOException{ + public VisualiserInput(StreamedCourse course) throws IOException{ //connectionSocket = new Socket(InetAddress.getLocalHost(), 4942); - this.connectionSocket = connectionSocket; + this.connectionSocket = new Socket("livedata.americascup.com",4941); - this.course = new StreamedCourse(); + this.course = course; this.boatLocation = new HashMap<>(); - this.connectionSocket = connectionSocket; //start Time @@ -209,9 +208,7 @@ public class VisualiserInput implements Runnable public static void main(String argv[]) throws Exception { - //this is the test data that streams form the AC35 website - Socket socket = new Socket("livedata.americascup.com",4941); - VisualiserInput receiver = new VisualiserInput(socket); + VisualiserInput receiver = new VisualiserInput(new StreamedCourse()); receiver.run(); } diff --git a/visualiser/src/test/java/seng302/Mock/FailBoatXMLTest.java b/visualiser/src/test/java/seng302/Mock/FailBoatXMLTest.java index 5b616a4c..d055d410 100644 --- a/visualiser/src/test/java/seng302/Mock/FailBoatXMLTest.java +++ b/visualiser/src/test/java/seng302/Mock/FailBoatXMLTest.java @@ -21,11 +21,6 @@ import static org.junit.Assert.assertTrue; public class FailBoatXMLTest { String path = "mockXML/boatXML/"; - @Test(expected = SAXException.class) - public void emptyFile() throws SAXException, ParserConfigurationException, ParseException, IOException { - new BoatXMLReader("empty.xml"); - } - @Test(expected = NumberFormatException.class) public void invalidSourceID() throws SAXException, ParserConfigurationException, ParseException, IOException { new BoatXMLReader(path + "invalidSourceID.xml");