eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-13 22:15:26 +00:00
Code Activity

bug5165: fixed tests

Browse Source
This commit is contained in:
Axel Uhl committed 2020-01-18 00:09:09 +01:00
1 parent 34f2503c56
commit 3196241f03
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java
+1 -1
View File
@@ -268,7 +268,7 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
public void testReconstructionOfLapsForCourseBasedOnTemplate() {
final CourseTemplateDataFactory ctdf = new CourseTemplateDataFactory(sharedServerCtx);
final CourseTemplate createdCourseTemplate = courseTemplateApi.createCourseTemplate(sharedServerCtx,
ctdf.constructCourseTemplate(new Pair<>(1, 3), null, Collections.emptyMap()));
ctdf.constructCourseTemplate(new Pair<>(1, 3), null));
final String regattaName = "test";
eventApi.createEvent(ctx, regattaName, "", CompetitorRegistrationType.CLOSED, "");
final RaceColumn race = regattaApi.addRaceColumn(ctx, regattaName, /* prefix */ null, 1)[0];
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/CourseAndMarkConfigurationFactoryImpl.java
+2 -2
View File
@@ -341,7 +341,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi
}
}
allMarkTemplatesInNewCourseTemplate.add(effectiveMarkTemplate);
MarkRole effectiveMarkRole = courseConfiguration.getAssociatedRoles().get(markConfiguration);
MarkRole effectiveMarkRole = courseConfigurationAfterInventory.getAssociatedRoles().get(markConfiguration);
if (effectiveMarkRole == null) {
// no existing MarkRole specified for the mark configuration; we now need to look for a MarkRoleCreationRequest annotation:
final MarkRoleCreationRequest optionalMarkRoleCreationRequest = markConfiguration.getAnnotationInfo().getOptionalMarkRoleCreationRequest();
@@ -1144,7 +1144,7 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi
private M mapMarkConfiguration(MarkConfiguration<P> markConfiguration) {
final M mark = getOrCreateMarkReplacement(markConfiguration);
if (mark == null) {
throw new IllegalStateException("Non declared mark found in waypoint sequence");
throw new IllegalStateException("Non declared mark "+markConfiguration.getName()+" found in waypoint sequence");
}
// If an explicit role mapping isn't given -> default to the mark's name
allAssociatedRoles.computeIfAbsent(mark, m -> existingRoleMapping.get(markConfiguration));