michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Created canvas and race controllers to display boats on canvas and modified marks and parsers to support them.

Browse Source 
#story[377] #pair[zyt10, ptg19]
This commit is contained in:
zyt10
2017-03-17 18:21:11 +13:00
parent 4bc49da10d
commit c08504293b
12 changed files with 148 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/models/mark/MarkTest.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class MarkTest {
public void setUp() throws Exception {
this.singleMark1 = new SingleMark("testMark_SM1", 12.23234, -34.342);
this.singleMark2 = new SingleMark("testMark_SM2", 12.23239, -34.352);
this.gateMark = new GateMark("testMark_GM", singleMark1, singleMark2);
this.gateMark = new GateMark("testMark_GM", singleMark1, singleMark2, singleMark1.getLatitude(), singleMark2.getLongitude());
}
@Test
src/test/java/seng302/models/parsers/CourseParserTest.java
+23 -27
View File
@@ -1,5 +1,6 @@
package seng302.models.parsers;
import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader;
import org.junit.Before;
import org.junit.Test;
import seng302.models.mark.*;
@@ -23,43 +24,38 @@ public class CourseParserTest {
@Test
public void getGates() throws Exception {
ArrayList<GateMark> gateMarks = cp.getGateMarks();
assertEquals(4, gateMarks.size());
ArrayList<Mark> course = cp.getCourse();
assertEquals("Start", gateMarks.get(0).getName());
assertEquals("Leeward Gate", gateMarks.get(1).getName());
assertEquals("Windward Gate", gateMarks.get(2).getName());
assertEquals("Finish", gateMarks.get(3).getName());
assertTrue(MarkType.GATE_MARK == course.get(0).getMarkType());
assertEquals("Start1", gateMarks.get(0).getSingleMark1().getName());
assertEquals("Start2", gateMarks.get(0).getSingleMark2().getName());
assertEquals(32.293834, gateMarks.get(0).getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.855195, gateMarks.get(0).getSingleMark2().getLongitude(), 0.00000001);
GateMark gateMark1 = (GateMark) course.get(0);
assertEquals(32.293834, gateMark1.getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.855195, gateMark1.getSingleMark2().getLongitude(), 0.00000001);
assertEquals("Finish1", gateMarks.get(3).getSingleMark1().getName());
assertEquals("Finish2", gateMarks.get(3).getSingleMark2().getName());
assertEquals(32.318303, gateMarks.get(3).getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.834974, gateMarks.get(3).getSingleMark2().getLongitude(), 0.00000001);
GateMark gateMark2 = (GateMark) course.get(5);
assertEquals("Finish1", gateMark2.getSingleMark1().getName());
assertEquals("Finish2", gateMark2.getSingleMark2().getName());
assertEquals(32.318303, gateMark2.getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.834974, gateMark2.getSingleMark2().getLongitude(), 0.00000001);
}
@Test
public void getMarks() throws Exception {
ArrayList<SingleMark> marks = cp.getSingleMarks();
assertEquals(1, marks.size());
assertEquals("Mid Mark", marks.get(0).getName());
ArrayList<Mark> course = cp.getCourse();
assertEquals("Mid Mark", course.get(1).getName());
}
@Test
public void getOrder() throws Exception {
ArrayList<String> order = cp.getOrder();
assertEquals(6, order.size());
assertEquals("Start", order.get(0));
assertEquals("Mid Mark", order.get(1));
assertEquals("Leeward Gate", order.get(2));
assertEquals("Windward Gate", order.get(3));
assertEquals("Leeward Gate", order.get(4));
assertEquals("Finish", order.get(5));
public void getOrder() {
ArrayList<Mark> course = cp.getCourse();
assertEquals(6, course.size());
assertEquals("Start", course.get(0).getName());
assertEquals("Mid Mark", course.get(1).getName());
assertEquals("Leeward Gate", course.get(2).getName());
assertEquals("Windward Gate", course.get(3).getName());
assertEquals("Leeward Gate", course.get(4).getName());
assertEquals("Finish", course.get(5).getName());
}
}