From ec35266763f47fd7fcf9839b17b3803aaabddf7e Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 17 Jan 2020 15:00:52 +0100 Subject: [PATCH] compilable test cases --- .../api/helper/CourseTemplateDataFactory.java | 21 +++++++++++++------ .../api/test/CourseConfigurationTest.java | 16 +++++++------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/helper/CourseTemplateDataFactory.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/helper/CourseTemplateDataFactory.java index 2aa50c20b8e..c1047bade50 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/helper/CourseTemplateDataFactory.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/helper/CourseTemplateDataFactory.java @@ -10,6 +10,7 @@ import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.coursetemplate.CourseTemplate; import com.sap.sailing.selenium.api.coursetemplate.MarkRole; +import com.sap.sailing.selenium.api.coursetemplate.MarkRoleApi; import com.sap.sailing.selenium.api.coursetemplate.MarkTemplate; import com.sap.sailing.selenium.api.coursetemplate.MarkTemplateApi; import com.sap.sailing.selenium.api.coursetemplate.WaypointTemplate; @@ -22,24 +23,32 @@ public class CourseTemplateDataFactory { public final MarkTemplate b4s; public final MarkTemplate b4p; public final MarkTemplate spare; + public final MarkRole sbRole, peRole, b1Role, b4sRole, b4pRole; public final List waypointSequence; public CourseTemplateDataFactory(ApiContext ctx) { + // mark templates final MarkTemplateApi markTemplateApi = new MarkTemplateApi(); - sb = markTemplateApi.createMarkTemplate(ctx, "Startboat", "sb", null, null, null, MarkType.STARTBOAT.name()); pe = markTemplateApi.createMarkTemplate(ctx, "Pinend", "pe", "#000000", null, null, MarkType.BUOY.name()); b1 = markTemplateApi.createMarkTemplate(ctx, "blue", "blue", "#0000FF", null, null, MarkType.BUOY.name()); b4s = markTemplateApi.createMarkTemplate(ctx, "red", "red", "#FF0000", null, null, MarkType.BUOY.name()); b4p = markTemplateApi.createMarkTemplate(ctx, "green", "green", "#00FF00", null, null, MarkType.BUOY.name()); spare = markTemplateApi.createMarkTemplate(ctx, "spare", "spare", "#00FFFF", null, null, MarkType.BUOY.name()); + // mark roles + final MarkRoleApi markRoleApi = new MarkRoleApi(); + sbRole = markRoleApi.createMarkRole(ctx, "Startboat", "sb"); + peRole = markRoleApi.createMarkRole(ctx, "Pinend", "pe"); + b1Role = markRoleApi.createMarkRole(ctx, "blue", "blue"); + b4sRole = markRoleApi.createMarkRole(ctx, "red", "red"); + b4pRole = markRoleApi.createMarkRole(ctx, "green", "green"); waypointSequence = Arrays.asList( - new WaypointTemplate("Start/End", PassingInstruction.Line, Arrays.asList(sb, pe)), - new WaypointTemplate(null, PassingInstruction.Port, Arrays.asList(b1)), - new WaypointTemplate(null, PassingInstruction.Gate, Arrays.asList(b4p, b4s)), - new WaypointTemplate(null, PassingInstruction.Port, Arrays.asList(b1)), - new WaypointTemplate("Start/End", PassingInstruction.Line, Arrays.asList(sb, pe))); + new WaypointTemplate("Start/End", PassingInstruction.Line, Arrays.asList(sbRole, peRole)), + new WaypointTemplate(null, PassingInstruction.Port, Arrays.asList(b1Role)), + new WaypointTemplate(null, PassingInstruction.Gate, Arrays.asList(b4pRole, b4sRole)), + new WaypointTemplate(null, PassingInstruction.Port, Arrays.asList(b1Role)), + new WaypointTemplate("Start/End", PassingInstruction.Line, Arrays.asList(sbRole, peRole))); } public CourseTemplate constructCourseTemplate() { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java index ddac161e86b..952cfd90943 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java @@ -601,18 +601,20 @@ public class CourseConfigurationTest extends AbstractSeleniumTest { @Test public void testCreateCourseConfigurationFromTemplate() { - final List markRoles = new ArrayList<>(); - MarkRole mr1 = markRoleApi.createMarkRole(sharedServerCtx, "mark role 1", "mr1", "#FFFFFF", "Cylinder", + final List markRolesInWpt1 = new ArrayList<>(); + final List markTemplates = new ArrayList<>(); + MarkRole mr1 = markRoleApi.createMarkRole(sharedServerCtx, "mark role 1", "mr1"); + markRolesInWpt1.add(mr1); + MarkTemplate mt1 = markTemplateApi.createMarkTemplate(sharedServerCtx, "mark role 1", "mr1", "#FFFFFF", "Cylinder", "Checkered", MarkType.BUOY.name()); - MarkRole mr1 = markRoleApi.createMarkRole(sharedServerCtx, "mark role 1", "mr1", "#FFFFFF", "Cylinder", - "Checkered", MarkType.BUOY.name()); - markRoles.add(mr1); + markTemplates.add(mt1); final Map roleMapping = new HashMap<>(); + roleMapping.put(mr1, mt1); final List waypointTemplates = new ArrayList<>(); - WaypointTemplate wpt1 = new WaypointTemplate("wpt1", PassingInstruction.FixedBearing, markRoles); + WaypointTemplate wpt1 = new WaypointTemplate("wpt1", PassingInstruction.FixedBearing, markRolesInWpt1); waypointTemplates.add(wpt1); final List tags = new ArrayList<>(); - CourseTemplate courseTemplate = new CourseTemplate("test", "t", markRoles, roleMapping, waypointTemplates, null, + CourseTemplate courseTemplate = new CourseTemplate("test", "t", markTemplates, roleMapping, waypointTemplates, null, tags, null, null); CourseTemplate srcCourseTemplate = courseTemplateApi.createCourseTemplate(sharedServerCtx, courseTemplate); CourseConfiguration courseConfiguration = courseConfigurationApi.createCourseConfigurationFromCourseTemplate(