Worked on XML reader to read a given race.xml in the format for the AC35. Added the ability to read the course limit and race settings #Pair[jjg64, cbt24] #Story[782]

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

@@ -16,7 +16,7 @@ public class RegattaXMLTest {
     @Before
     public void findFile(){
         try {
-            regattaXMLReader = new RegattaXMLReader("mockXML/regattaXML/regattaTest.xml", false);
+            regattaXMLReader = new RegattaXMLReader("mockXML/regattaXML/regattaTest.xml");
         } catch (Exception e) {
             fail("Cannot find mockXML/regattaXML/regattaTest.xml in the resources folder");
         }
@@ -24,29 +24,19 @@ public class RegattaXMLTest {
 
     @Test
     public void makeRegattaTest() {
-        try {
-            regattaXMLReader = new RegattaXMLReader("mockXML/regattaXML/regattaTest.xml");
-            assertNotEquals(regattaXMLReader.getRegatta(), null);
-        } catch (Exception e) {
-            fail("Did not make a Regatta object");
-        }
+        assertNotEquals(regattaXMLReader.getRegatta(), null);
     }
 
     @Test
     public void correctValuesTest() {
-        try {
-            regattaXMLReader = new RegattaXMLReader("mockXML/regattaXML/regattaTest.xml");
-            Regatta regatta = regattaXMLReader.getRegatta();
-            assertEquals(regatta.getRegattaID(), 3);
-            assertEquals(regatta.getRegattaName(), "New Zealand Test");
-            assertEquals(regatta.getCourseName(), "North Head");
-            assertEquals(regatta.getCentralLatitude(), -36.82791529, 0.00000001);
-            assertEquals(regatta.getCentralLongitude(), 174.81218919, 0.00000001);
-            assertEquals(regatta.getCentralAltitude(), 0.00, 0.00000001);
-            assertEquals(regatta.getUtcOffset(), 12.0, 0.001);
-            assertEquals(regatta.getMagneticVariation(), 14.1, 0.001);
-        } catch (Exception e) {
-            fail("Did not have the correct values");
-        }
+        Regatta regatta = regattaXMLReader.getRegatta();
+        assertEquals(regatta.getRegattaID(), 3);
+        assertEquals(regatta.getRegattaName(), "New Zealand Test");
+        assertEquals(regatta.getCourseName(), "North Head");
+        assertEquals(regatta.getCentralLatitude(), -36.82791529, 0.00000001);
+        assertEquals(regatta.getCentralLongitude(), 174.81218919, 0.00000001);
+        assertEquals(regatta.getCentralAltitude(), 0.00, 0.00000001);
+        assertEquals(regatta.getUtcOffset(), 12.0, 0.001);
+        assertEquals(regatta.getMagneticVariation(), 14.1, 0.001);
     }
 }

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

@@ -1,8 +1,63 @@
 package seng302.Mock;
 
+import org.junit.Before;
+import org.junit.Test;
+import seng302.GPSCoordinate;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 /**
- * Created by jjg64 on 21/04/17.
+ * Tests only work on the current version of mockXML/raceXML/raceTest.xml
  */
 public class StreamedRaceTest {
+    StreamedCourseXMLReader streamedCourseXMLReader;
+    List<GPSCoordinate> boundary;
 
+    @Before
+    public void setup() {
+        try {
+            streamedCourseXMLReader = new StreamedCourseXMLReader("mockXML/raceXML/raceTest.xml", true);
+            boundary = streamedCourseXMLReader.getBoundary();
+        } catch (Exception e) {
+            e.printStackTrace();
+            //fail("Cannot find mockXML/raceXML/raceTest.xml in the resources folder");
+        }
+    }
+
+    @Test
+    public void testAllBoundaryPointsRead() {
+        assertEquals(boundary.size(), 10);
+    }
+
+    @Test
+    public void testBoundaryPointData() {
+        // First point
+        assertEquals(boundary.get(0).getLatitude(), -36.8325, 1e-6);
+        assertEquals(boundary.get(0).getLongitude(), 174.8325, 1e-6);
+
+        // Last point
+        assertEquals(boundary.get(boundary.size() - 1).getLatitude(), -36.83417, 1e-6);
+        assertEquals(boundary.get(boundary.size() - 1).getLongitude(), 174.84767, 1e-6);
+    }
+
+    @Test
+    public void testMapEdges() {
+        double maxLatitude = streamedCourseXMLReader.getMapBottomRight().getLatitude() - streamedCourseXMLReader.getPadding();
+        double maxLongitude = streamedCourseXMLReader.getMapBottomRight().getLongitude() - streamedCourseXMLReader.getPadding();
+        double minLatitude = streamedCourseXMLReader.getMapTopLeft().getLatitude() - streamedCourseXMLReader.getPadding();
+        double minLongitude = streamedCourseXMLReader.getMapTopLeft().getLongitude() - streamedCourseXMLReader.getPadding();
+
+        assertEquals(maxLatitude, -36.81033, 1e-6);
+        assertEquals(maxLongitude, 174.88217, 1e-6);
+        assertEquals(minLatitude, -36.83417, 1e-6);
+        assertEquals(minLongitude, 174.81983, 1e-6);
+    }
+
+    @Test
+    public void testRaceSettings() {
+
+    }
 }