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

fixed bugs from last commit and updated some tests #story[426]

Browse Source
This commit is contained in:
Peter
2017-03-23 22:24:42 +13:00
parent 7bc5c8f8a4
commit 590ef557d3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/CanvasController.java
+5 -5
View File
@@ -148,11 +148,11 @@ public class CanvasController {
gc.clearRect(0, 0, 19200, 10800);
drawCourse();
drawBoats();
gc.clearRect(0, 0, canvas.getWidth(),canvas.getHeight());
gc.setFill(Color.SKYBLUE);
gc.fillRect(0,0,canvas.getWidth(),canvas.getHeight());
drawCourse();
drawBoats();
gc.clearRect(0, 0, canvas.getWidth(),canvas.getHeight());
gc.setFill(Color.SKYBLUE);
gc.fillRect(0,0,canvas.getWidth(),canvas.getHeight());
drawCourse();
drawBoats();
// If race has started, draw the boats and play the timeline
if (race.getRaceTime() > 1){
src/test/java/seng302/models/parsers/CourseParserTest.java
+4 -4
View File
@@ -29,15 +29,15 @@ public class CourseParserTest {
assertTrue(MarkType.GATE_MARK == course.get(0).getMarkType());
GateMark gateMark1 = (GateMark) course.get(0);
assertEquals(32.293834, gateMark1.getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.855195, gateMark1.getSingleMark2().getLongitude(), 0.00000001);
assertEquals(32.293771, gateMark1.getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.855242, gateMark1.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);
assertEquals(32.317257, gateMark2.getSingleMark2().getLatitude(), 0.00000001);
assertEquals(-64.83626, gateMark2.getSingleMark2().getLongitude(), 0.00000001);
}
@Test
src/test/java/seng302/models/parsers/TeamsParserTest.java
+2 -2
View File
@@ -26,10 +26,10 @@ public class TeamsParserTest {
assertEquals(6, boats.size(), 1e-10);
assertEquals("Oracle Team USA", boats.get(0).getTeamName());
assertEquals(23.4, boats.get(0).getVelocity(), 1e-10);
assertEquals(10, boats.get(0).getVelocity(), 1e-10);
assertEquals("Groupama Team France", boats.get(5).getTeamName());
assertEquals(28.8, boats.get(5).getVelocity(), 1e-10);
assertEquals(10, boats.get(5).getVelocity(), 1e-10);
}
}