fixed more tests

This commit is contained in:
Axel Uhl committed 2020-01-17 17:58:16 +01:00
1 parent f88daa9f2e
commit c1a28a26ea
2 files changed
+11 -3

No files matched your search

@@ -2,6 +2,7 @@ package com.sap.sailing.selenium.api.helper;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,7 +43,7 @@ public class CourseTemplateDataFactory {
b1Role = markRoleApi.createMarkRole(ctx, "blue", "blue");
b4sRole = markRoleApi.createMarkRole(ctx, "red", "red");
b4pRole = markRoleApi.createMarkRole(ctx, "green", "green");
// default waypoint sequence
waypointSequence = Arrays.asList(
new WaypointTemplate("Start/End", PassingInstruction.Line, Arrays.asList(sbRole, peRole)),
new WaypointTemplate(null, PassingInstruction.Port, Arrays.asList(b1Role)),
@@ -56,7 +57,13 @@ public class CourseTemplateDataFactory {
}
public CourseTemplate constructCourseTemplate(Pair<Integer, Integer> optionalRepeatablePart, Integer defaultNumberOfLaps) {
return this.constructCourseTemplate(optionalRepeatablePart, defaultNumberOfLaps, Collections.emptyMap());
final Map<MarkRole, MarkTemplate> defaultAssociatedRoles = new HashMap<>();
defaultAssociatedRoles.put(sbRole, sb);
defaultAssociatedRoles.put(peRole, pe);
defaultAssociatedRoles.put(b1Role, b1);
defaultAssociatedRoles.put(b4sRole, b4s);
defaultAssociatedRoles.put(b4pRole, b4p);
return this.constructCourseTemplate(optionalRepeatablePart, defaultNumberOfLaps, defaultAssociatedRoles);
}
public CourseTemplate constructCourseTemplate(Pair<Integer, Integer> optionalRepeatablePart,
@@ -62,7 +62,8 @@ public class CourseTemplateApiTest extends AbstractSeleniumTest {
courseTemplateApi.createCourseTemplate(otherUserCtx, ctdf.constructCourseTemplate());
fail();
} catch (Exception e) {
assertTrue(e.getMessage().contains("Subject does not have permission [MARK_TEMPLATE:READ:"));
final String expected = "Subject does not have permission [MARK_ROLE:READ:";
assertTrue("Expected "+e.getMessage()+" to contain "+expected, e.getMessage().contains(expected));
}
}