Editing MockOutput to send actual generated boat/race/regatta xmls

- Was previously sending from a static source file

#story[778]

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

@@ -180,7 +180,7 @@ public class BoatData {
     private void appendBoatName(Element boat, int i) {
         //BoatName attribute
         Attr attrBoatName = doc.createAttribute("BoatName");
-        attrBoatName.setValue(boatData.get(i).toString());
+        attrBoatName.setValue(boatData.get(i).getName());
         boat.setAttributeNode(attrBoatName);
     }
 

mock/src/main/java/seng302/MockOutput.java

@@ -36,6 +36,11 @@ public class MockOutput implements Runnable
     private int heartbeatSequenceNum = 1;
     private int boatLocationSequenceNumber = 1;
     private int raceStatusSequenceNumber = 1;
+    private String raceXml;
+    private String regattaXml;
+    private String boatsXml;
+
+
 
     public MockOutput() throws  IOException {
         lastHeartbeatTime = System.currentTimeMillis();
@@ -131,48 +136,13 @@ public class MockOutput implements Runnable
 
                 /*******************************Test********************************/
 
-                StringBuilder xmlString1;
+                while(boatsXml == null || regattaXml == null || raceXml == null) {
 
-                BufferedReader br1 = new BufferedReader(new InputStreamReader(
-                        this.getClass().getResourceAsStream(("/raceXML/Boats.xml"))));
-
-                String line1;
-                xmlString1 = new StringBuilder();
-                while((line1=br1.readLine())!= null){
-                    xmlString1.append(line1.trim());
                 }
 
-                parseXMLString(xmlString1.toString(), XMLMessage.XMLTypeBoat);
+                parseXMLString(boatsXml, XMLMessage.XMLTypeBoat);
-
+                parseXMLString(raceXml, XMLMessage.XMLTypeRace);
-
+                parseXMLString(regattaXml, XMLMessage.XMLTypeRegatta);
-
-                StringBuilder xmlString2;
-
-                BufferedReader br2 = new BufferedReader(new InputStreamReader(
-                        this.getClass().getResourceAsStream(("/raceXML/Race.xml"))));
-
-                String line2;
-                xmlString2 = new StringBuilder();
-                while((line2=br2.readLine())!= null){
-                    xmlString2.append(line2.trim());
-                }
-
-                parseXMLString(xmlString2.toString(), XMLMessage.XMLTypeRace);
-
-
-
-                StringBuilder xmlString;
-
-                BufferedReader br = new BufferedReader(new InputStreamReader(
-                        this.getClass().getResourceAsStream(("/raceXML/Regatta.xml"))));
-
-                String line;
-                xmlString = new StringBuilder();
-                while((line=br.readLine())!= null){
-                    xmlString.append(line.trim());
-                }
-
-                parseXMLString(xmlString.toString(), XMLMessage.XMLTypeRegatta);
 
                 /*******************************Test********************************/
 
@@ -206,6 +176,20 @@ public class MockOutput implements Runnable
 
 
 
+    public void setRaceXml(String raceXml) {
+        this.raceXml = raceXml;
+    }
+
+
+    public void setRegattaXml(String regattaXml) {
+        this.regattaXml = regattaXml;
+    }
+
+
+    public void setBoatsXml(String boatsXml) {
+        this.boatsXml = boatsXml;
+    }
+
     public static void main(String argv[]) throws Exception
     {
         MockOutput client = new MockOutput();

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

@@ -53,6 +53,7 @@ public class Event {
         System.setOut(System.out);
         RegattaData regattaData = new RegattaData(regattaDataSource);
         String xmlString = regattaData.createXML();
+        mockOutput.setRegattaXml(xmlString);
         mockOutput.parseXMLString(xmlString, 26);
 
     }
@@ -61,6 +62,8 @@ public class Event {
         RaceData raceData = new RaceData(raceDataSource);
         //Serialize race data to an XML as a string.
         String xmlString = raceData.createXML();
+        System.out.println(xmlString);
+        mockOutput.setRaceXml(xmlString);
         mockOutput.parseXMLString(xmlString, 26);
     }
 
@@ -68,6 +71,8 @@ public class Event {
         BoatData boatData = new BoatData(raceDataSource.getBoats());
         //Serialize race data to an XML as a string.
         String xmlString = boatData.createXML();
+        System.out.println(xmlString);
+        mockOutput.setBoatsXml(xmlString);
         mockOutput.parseXMLString(xmlString, 26);
 
     }

visualiser/src/main/java/seng302/Mock/StreamedCourseXMLReader.java

@@ -90,6 +90,7 @@ public class StreamedCourseXMLReader extends XMLReader {
 
     private void readParticipants() {
         Element nParticipants = (Element) doc.getElementsByTagName("Participants").item(0);
+        nParticipants.getChildNodes().getLength();
         for (int i = 0; i < nParticipants.getChildNodes().getLength(); i++) {
             int sourceID;
             Node yacht = nParticipants.getChildNodes().item(i);

visualiser/src/test/java/seng302/Mock/BoatsXMLTest.java

@@ -44,4 +44,5 @@ public class BoatsXMLTest {
         StreamedBoat boat = (StreamedBoat) boatXMLReader.getBoats().get(0);
         assertEquals(boat.getSourceID(), 101);
     }
+
 }