Bug 5085: Removed redundant ControlPointTemplateImpl by using

MarkPairTemplateImpl
This commit is contained in:
Steffen Schaefer
2019-08-22 16:42:05 +02:00
parent 26c09fb0ff
commit 187a9f127a
3 changed files with 25 additions and 50 deletions
@@ -19,8 +19,8 @@ import com.sap.sailing.domain.coursetemplate.ControlPointTemplate;
import com.sap.sailing.domain.coursetemplate.CourseTemplate;
import com.sap.sailing.domain.coursetemplate.MarkTemplate;
import com.sap.sailing.domain.coursetemplate.WaypointTemplate;
import com.sap.sailing.domain.coursetemplate.impl.ControlPointTemplateImpl;
import com.sap.sailing.domain.coursetemplate.impl.CourseTemplateImpl;
import com.sap.sailing.domain.coursetemplate.impl.MarkPairTemplateImpl;
import com.sap.sailing.domain.coursetemplate.impl.MarkTemplateImpl;
import com.sap.sailing.domain.coursetemplate.impl.RepeatablePartImpl;
import com.sap.sailing.domain.coursetemplate.impl.WaypointTemplateImpl;
@@ -43,8 +43,8 @@ public class TestLapConfiguration {
top = new MarkTemplateImpl("Windward Mark", "1", /* color */ null, /* shape */ null, /* pattern */ null, MarkType.BUOY);
gateLeft = new MarkTemplateImpl("Leeward Gate Port", "4p", /* color */ null, /* shape */ null, /* pattern */ null, MarkType.BUOY);
gateRight = new MarkTemplateImpl("Leeward Gate Starboard", "4s", /* color */ null, /* shape */ null, /* pattern */ null, MarkType.BUOY);
startFinish = new ControlPointTemplateImpl("Start/Finish", Arrays.asList(startBoat, pin));
gate = new ControlPointTemplateImpl("Leeward Gate", Arrays.asList(gateLeft, gateRight));
startFinish = new MarkPairTemplateImpl("Start/Finish", startBoat, pin);
gate = new MarkPairTemplateImpl("Leeward Gate", gateLeft, gateRight);
courseTemplate = new CourseTemplateImpl(UUID.randomUUID(), "L",
/* marks */ Arrays.asList(startBoat, pin, top, gateLeft, gateRight),
/* waypoints */ Arrays.asList(new WaypointTemplateImpl(startFinish, PassingInstruction.Line),
@@ -93,7 +93,7 @@ public class TestLapConfiguration {
public void testExceptionInCaseMarkIsMissing() {
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 ControlPointTemplateImpl("Start/Finish", Arrays.asList(startBoat, pin));
startFinish = new MarkPairTemplateImpl("Start/Finish", startBoat, pin);
try {
courseTemplate = new CourseTemplateImpl("Test",
/* marks */ Arrays.asList(startBoat),
@@ -110,7 +110,7 @@ public class TestLapConfiguration {
public void testZeroLapsOkIfNoRepeatablePart() {
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 ControlPointTemplateImpl("Start/Finish", Arrays.asList(startBoat, pin));
startFinish = new MarkPairTemplateImpl("Start/Finish", startBoat, pin);
courseTemplate = new CourseTemplateImpl("Test", /* marks */ Arrays.asList(startBoat, pin),
/* waypoints */ Arrays.asList(new WaypointTemplateImpl(startFinish, PassingInstruction.Line)),
/* associatedRoles */ Collections.emptyMap(),