From 12ea750c396edb0b200673cb977aaef15c2d58c7 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 10 Oct 2022 11:19:39 +0200 Subject: [PATCH] fixed test set-up for TestFarthestAheadWithSkippedMarkPassing --- .../TestFarthestAheadWithSkippedMarkPassing.java | 15 ++++++++++----- .../com.sap.sailing.gwt.ui/GWT Sailing SDM.launch | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java index 8c69d95c3cd..34e24374b4d 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestFarthestAheadWithSkippedMarkPassing.java @@ -29,6 +29,7 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl; import com.sap.sailing.domain.base.impl.CourseImpl; +import com.sap.sailing.domain.base.impl.DynamicCompetitorWithBoat; import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; @@ -83,10 +84,14 @@ public class TestFarthestAheadWithSkippedMarkPassing { private Waypoint windward; private Waypoint finish; - private void setUp(TimeOnTimeFactorMapping timeOnTimeFactors, Function timeOnDistanceFactors) { - CompetitorWithBoat fastCompetitor = TrackBasedTest.createCompetitorWithBoat("FastBoat"); + private void setUp(TimeOnTimeFactorMapping timeOnTimeFactors, Function timeOnDistanceAllowances) { + DynamicCompetitorWithBoat fastCompetitor = (DynamicCompetitorWithBoat) TrackBasedTest.createCompetitorWithBoat("FastBoat"); + fastCompetitor.setTimeOnTimeFactor(timeOnTimeFactors.apply(fastCompetitor)); + fastCompetitor.setTimeOnDistanceAllowancePerNauticalMile(timeOnDistanceAllowances.apply(fastCompetitor)); c1 = fastCompetitor; - CompetitorWithBoat slowCompetitor = TrackBasedTest.createCompetitorWithBoat("SlowBoat"); + DynamicCompetitorWithBoat slowCompetitor = (DynamicCompetitorWithBoat) TrackBasedTest.createCompetitorWithBoat("SlowBoat"); + slowCompetitor.setTimeOnTimeFactor(timeOnTimeFactors.apply(slowCompetitor)); + slowCompetitor.setTimeOnDistanceAllowancePerNauticalMile(timeOnDistanceAllowances.apply(slowCompetitor)); c2 = slowCompetitor; trackedRace = createTrackedRace(TrackBasedTest.createCompetitorAndBoatsMap(fastCompetitor, slowCompetitor)); rankingMetric = trackedRace.getRankingMetric(); @@ -141,7 +146,7 @@ public class TestFarthestAheadWithSkippedMarkPassing { */ @Test public void testWithOneMarkPassingOnly() { - setUp(c -> c==c1 ? 2.0 : 1.0, c -> 0.0); + setUp(c -> c==c1 ? 2.0 : 1.0, c -> Duration.NULL); final TimePoint startOfRace = MillisecondsTimePoint.now(); final TimePoint middleOfFirstLeg = startOfRace.plus(Duration.ONE_HOUR.times(3)); trackedRace.updateMarkPassings( @@ -174,7 +179,7 @@ public class TestFarthestAheadWithSkippedMarkPassing { */ @Test public void testWithTwoMarkPassingsForC1AndSkippedStartForC2() { - setUp(c -> c==c1 ? 2.0 : 1.0, c -> 0.0); + setUp(c -> c==c1 ? 2.0 : 1.0, c -> Duration.NULL); final TimePoint startOfRace = MillisecondsTimePoint.now(); final TimePoint endOfFirstLeg = startOfRace.plus(Duration.ONE_HOUR.times(3)); final TimePoint middleOfSecondLeg = endOfFirstLeg.plus(Duration.ONE_MINUTE.times(10)); diff --git a/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch b/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch index 146ce836dee..0bfb17c966e 100755 --- a/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch +++ b/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch @@ -120,7 +120,7 @@ - +