eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

bug5165: uncompileable interims commit with major progress of replacing MarkRole for MarkTemplate in the ControlPointTemplate

Browse Source
This commit is contained in:
Axel Uhl
2019-12-19 16:04:02 +01:00
parent 5ccf7405d0
commit eca8485780
42 changed files with 609 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/coursetemplate/test/TestLapConfiguration.java
+8 -8
View File
@@ -46,6 +46,7 @@ public class TestLapConfiguration {
startFinish = new MarkRolePairImpl("Start/Finish", "Start/Finish", startBoat, pin);
gate = new MarkRolePairImpl("Leeward Gate", "Leeward Gate", gateLeft, gateRight);
courseTemplate = new CourseTemplateImpl(UUID.randomUUID(), "L",
shortName,
/* marks */ Arrays.asList(startBoat, pin, top, gateLeft, gateRight),
/* waypoints */ Arrays.asList(new WaypointTemplateImpl(startFinish, PassingInstruction.Line),
new WaypointTemplateImpl(top, PassingInstruction.Port),
@@ -54,9 +55,8 @@ public class TestLapConfiguration {
new WaypointTemplateImpl(startFinish, PassingInstruction.Line)),
/* associatedRoles */ Collections.emptyMap(),
defaultMarkTemplatesForRoles,
/* optionaImageURL */ null,
new RepeatablePartImpl(/* zeroBasedIndexOfRepeatablePartStart */ 1,
/* zeroBasedIndexOfRepeatablePartEnd */ 3), /* Default Number of Laps */ 1);
/* optionaImageURL */ null, new RepeatablePartImpl(/* zeroBasedIndexOfRepeatablePartStart */ 1,
/* zeroBasedIndexOfRepeatablePartEnd */ 3), /* Default Number of Laps */ 1);
}
@Test
@@ -97,10 +97,10 @@ public class TestLapConfiguration {
startFinish = new MarkRolePairImpl("Start/Finish","Start/Finish", startBoat, pin);
try {
courseTemplate = new CourseTemplateImpl("Test",
shortName,
/* marks */ Arrays.asList(startBoat),
/* waypoints */ Arrays.asList(new WaypointTemplateImpl(startFinish, PassingInstruction.Line)),
/* associatedRoles */ Collections.emptyMap(),
defaultMarkTemplatesForRoles, /* optionaImageURL */ null);
/* associatedRoles */ Collections.emptyMap(), defaultMarkTemplatesForRoles, /* optionaImageURL */ null);
fail("Expected an IllegalArgumentException due to missing mark <pin> but it wasn't thrown");
} catch (IllegalArgumentException e) {
// expected
@@ -112,10 +112,10 @@ public class TestLapConfiguration {
startBoat = new MarkTemplateImpl("Start Boat", "SB", /* color */ null, /* shape */ null, /* pattern */ null, MarkType.STARTBOAT);
pin = new MarkTemplateImpl("Pin End", "Pin", /* color */ null, /* shape */ null, /* pattern */ null, MarkType.BUOY);
startFinish = new MarkRolePairImpl("Start/Finish", "Start/Finish", startBoat, pin);
courseTemplate = new CourseTemplateImpl("Test", /* marks */ Arrays.asList(startBoat, pin),
courseTemplate = new CourseTemplateImpl("Test", shortName,
/* marks */ Arrays.asList(startBoat, pin),
/* waypoints */ Arrays.asList(new WaypointTemplateImpl(startFinish, PassingInstruction.Line)),
/* associatedRoles */ Collections.emptyMap(),
defaultMarkTemplatesForRoles, /* optionaImageURL */ null);
/* associatedRoles */ Collections.emptyMap(), defaultMarkTemplatesForRoles, /* optionaImageURL */ null);
try {
courseTemplate.getWaypointTemplates(0);
} catch (IllegalArgumentException e) {