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

Merged the refactored mark related class with course parser.

Browse Source 
#fix #refactor #story[9] #story[10] #story[11]
This commit is contained in:
Haoming Yin
2017-03-17 15:56:37 +13:00
parent 23b163e6c1
commit 8fd06c84ac
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/models/parsers/CourseParserTest.java
+11 -12
View File
@@ -2,8 +2,7 @@ package seng302.models.parsers;
import org.junit.Before;
import org.junit.Test;
import seng302.models.GateMark;
import seng302.models.Mark;
import seng302.models.mark.*;
import java.util.ArrayList;
@@ -24,7 +23,7 @@ public class CourseParserTest {
@Test
public void getGates() throws Exception {
ArrayList<GateMark> gateMarks = cp.getGates();
ArrayList<GateMark> gateMarks = cp.getGateMarks();
assertEquals(4, gateMarks.size());
assertEquals("Start", gateMarks.get(0).getName());
@@ -32,20 +31,20 @@ public class CourseParserTest {
assertEquals("Windward Gate", gateMarks.get(2).getName());
assertEquals("Finish", gateMarks.get(3).getName());
assertEquals("Start1", gateMarks.get(0).getMark1().getName());
assertEquals("Start2", gateMarks.get(0).getMark2().getName());
assertEquals(32.293834, gateMarks.get(0).getMark2().getLatitude(), 0.00000001);
assertEquals(-64.855195, gateMarks.get(0).getMark2().getLongitude(), 0.00000001);
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);
assertEquals("Finish1", gateMarks.get(3).getMark1().getName());
assertEquals("Finish2", gateMarks.get(3).getMark2().getName());
assertEquals(32.318303, gateMarks.get(3).getMark2().getLatitude(), 0.00000001);
assertEquals(-64.834974, gateMarks.get(3).getMark2().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);
}
@Test
public void getMarks() throws Exception {
ArrayList<Mark> marks = cp.getMarks();
ArrayList<SingleMark> marks = cp.getSingleMarks();
assertEquals(1, marks.size());
assertEquals("Mid Mark", marks.get(0).getName());
}