Reformatted and refactored the fileparser to get xml from resource folder

#fix #refactor #story[377] #pair[xyi25, zyt10]
This commit is contained in:
Haoming Yin
2017-03-24 12:55:11 +13:00
parent e8b1720fee
commit 304f30ece6
12 changed files with 148 additions and 103 deletions
-9
View File
@@ -1,9 +0,0 @@
{
"time-scale": "abc",
"race-name": 123,
"teams-with-wrong-name": [
"team1",
"team2",
"team3"
]
}
@@ -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
@@ -19,7 +19,7 @@ public class CourseParserTest {
@Before
public void initializeParser() throws Exception {
cp = new CourseParser("doc/examples/course.xml");
cp = new CourseParser("/course.xml");
}
@Test
@@ -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);
}
}
-31
View File
@@ -1,31 +0,0 @@
{
"race-name": "AC35",
"time-scale": 1,
"race-size": 2,
"teams": [
{
"team-name": "Oracle Team USA",
"velocity": 20.9
},
{
"team-name": "Artemis Racing",
"velocity": 18.3
},
{
"team-name": "Emirates Team New Zealand",
"velocity": 21.5
},
{
"team-name": "Groupama Team France",
"velocity": 19.9
},
{
"team-name": "Land Rover BAR",
"velocity": 17.6
},
{
"team-name": "SoftBank Team Japan",
"velocity": 16.6
}
]
}