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

Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13

Browse Source
This commit is contained in:
Michael Rausch
2017-03-24 20:45:49 +13:00
parent 213303d674 304f30ece6
commit 550ab59231
19 changed files with 269 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/models/parsers/ConfigParserTest.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class ConfigParserTest {
@Before
public void initializeParser() throws Exception {
cp = new ConfigParser("doc/examples/config.xml");
cp = new ConfigParser("/config.xml");
}
@Test
src/test/java/seng302/models/parsers/CourseParserTest.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class CourseParserTest {
@Before
public void initializeParser() throws Exception {
cp = new CourseParser("doc/examples/course.xml");
cp = new CourseParser("/course.xml");
}
@Test
src/test/java/seng302/models/parsers/TeamsParserTest.java
+3 -3
View File
@@ -16,7 +16,7 @@ public class TeamsParserTest {
private TeamsParser tp;
@Before
public void readFile() {
tp = new TeamsParser("doc/examples/teams.xml");
tp = new TeamsParser("/teams.xml");
}
@Test
@@ -26,10 +26,10 @@ public class TeamsParserTest {
assertEquals(6, boats.size(), 1e-10);
assertEquals("Oracle Team USA", boats.get(0).getTeamName());
assertEquals(10, boats.get(0).getVelocity(), 1e-10);
assertEquals(30.9, boats.get(0).getVelocity(), 1e-10);
assertEquals("Groupama Team France", boats.get(5).getTeamName());
assertEquals(10, boats.get(5).getVelocity(), 1e-10);
assertEquals(45.6, boats.get(5).getVelocity(), 1e-10);
}
}