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 'update-parser' into 'master'

Browse Source 
Update parser



See merge request !7
This commit is contained in:
Haoming Yin
2017-03-06 21:51:02 +13:00
parent fd2b473a7e 85b8047229
commit 0e562a38e2
3 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/seng302/FileParserTest.java
+10 -11
View File
@@ -27,13 +27,12 @@ public class FileParserTest {
public void readValidFile() throws Exception{
FileParser fileParser = new FileParser("src/test/java/seng302/valid.json");
assertEquals(fileParser.getRaceName(), "IDK");
assertEquals("AC35", fileParser.getRaceName());
ArrayList<String> teams = new ArrayList<>();
teams.add("team1");
teams.add("team2");
teams.add("team3");
assertTrue(teams.equals(fileParser.getTeams()));
assertEquals("Oracle Team USA", fileParser.getTeams().get(0).get("team-name"));
assertEquals(20.9, fileParser.getTeams().get(0).get("velocity"));
assertEquals(2, fileParser.getRaceSize());
assertEquals(6, fileParser.getTotalNumberOfTeams());
}
/*
@@ -41,13 +40,13 @@ public class FileParserTest {
variable name.
*/
@Test
public void readInvaldFile() throws Exception {
public void readInvalidFile() throws Exception {
FileParser fileParser = new FileParser("src/test/java/seng302/invalid.json");
assertEquals(fileParser.getRaceName(), null);
assertEquals(fileParser.getTeams(), null);
assertEquals(fileParser.getTimeScale(), -1);
assertEquals(fileParser.getTeams(), null);
assertEquals(null, fileParser.getRaceName());
assertEquals(null, fileParser.getTeams());
assertEquals(-1, fileParser.getTimeScale());
assertEquals(null,fileParser.getTeams());
}
}
src/test/java/seng302/valid.json
+12 -4
View File
@@ -1,5 +1,13 @@
{
"time-scale": 100,
"race-name": "IDK",
"teams":["team1","team2","team3"]
}
"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}
]
}