From 9ad514909febb195ca0146ef2d97507dc49bfbc3 Mon Sep 17 00:00:00 2001 From: Frank Mittag Date: Thu, 11 Jan 2018 15:48:41 +0100 Subject: [PATCH] Further test cleanup --- .../impl/CandidateFinderImplWhiteBoxTest.java | 9 +++---- ...stFarthestAheadWithSkippedMarkPassing.java | 14 +++++----- ...mpleTimeOnTimeRankingWithOneUpwindLeg.java | 14 +++++----- .../domain/test/CompetitorListenerTest.java | 2 +- ...eInvalidationAfterLoadingFinishedTest.java | 9 +++---- .../sailing/domain/test/LineAnalysisTest.java | 16 ++++++------ .../sailing/domain/test/ReachingLegTest.java | 17 +++++------- .../sailing/domain/test/TrackBasedTest.java | 17 ++++++------ ...rtTimeUpdateForDependentStartTimeTest.java | 4 +-- .../test/TrackedRaceStatusUpdateTest.java | 6 ++--- .../domain/test/UpdateMarkPassingTest.java | 6 ++--- ...WindEstimationOnConstructedTracksTest.java | 17 +++++------- .../impl/BravoFixTrackSerializationTest.java | 6 ++--- ...tialLoadReplicationObjectIdentityTest.java | 6 ++--- .../test/RegattaLogReplicationTest.java | 6 ++--- .../server/test/SearchServiceTest.java | 26 +++++++++---------- 16 files changed, 83 insertions(+), 92 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java index 44cf5936b03..02808ebf6f5 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/markpassingcalculation/impl/CandidateFinderImplWhiteBoxTest.java @@ -20,7 +20,7 @@ import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateImpl; import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.ReadonlyRacingProcedureFactory; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.configuration.impl.EmptyRegattaConfiguration; import com.sap.sailing.domain.common.Position; @@ -56,16 +56,15 @@ public class CandidateFinderImplWhiteBoxTest { } private CandidateFinderWithPublicGetProbabilityOfStartBasedOnOtherCompetitorsStartLineDistances finder; - private Competitor competitor; + private CompetitorWithBoat competitor; private DynamicTrackedRace trackedRace; private TimePoint now; @Before public void setUp() { now = MillisecondsTimePoint.now(); - CompetitorAndBoat competitorAndBoat = TrackBasedTest.createCompetitorAndBoat("Competitor"); - competitor = competitorAndBoat.getCompetitor(); - Map competitorAndBoats = TrackBasedTest.createCompetitorAndBoatsMap(competitorAndBoat); + competitor = TrackBasedTest.createCompetitorWithBoat("Competitor"); + Map competitorAndBoats = TrackBasedTest.createCompetitorAndBoatsMap(competitor); trackedRace = TrackBasedTest.createTestTrackedRace("Test Regatta", "Test Race", "505", competitorAndBoats, now, /* useMarkPassingCalculator */ true); finder = new CandidateFinderWithPublicGetProbabilityOfStartBasedOnOtherCompetitorsStartLineDistances(trackedRace); } 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 a5abbadfc8f..feaf8d260b5 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 @@ -17,7 +17,7 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.DomainFactory; @@ -76,17 +76,17 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class TestFarthestAheadWithSkippedMarkPassing { private RankingMetric rankingMetric; private DynamicTrackedRace trackedRace; - private Competitor c1, c2; + private CompetitorWithBoat c1, c2; private Waypoint start; private Waypoint windward; private Waypoint finish; private void setUp(TimeOnTimeFactorMapping timeOnTimeFactors, Function timeOnDistanceFactors) { - CompetitorAndBoat fastCompetitorAndBoat = TrackBasedTest.createCompetitorAndBoat("FastBoat"); - c1 = fastCompetitorAndBoat.getCompetitor(); - CompetitorAndBoat slowCompetitorAndBoat = TrackBasedTest.createCompetitorAndBoat("SlowBoat"); - c2 = slowCompetitorAndBoat.getCompetitor(); - trackedRace = createTrackedRace(TrackBasedTest.createCompetitorAndBoatsMap(fastCompetitorAndBoat, slowCompetitorAndBoat)); + CompetitorWithBoat fastCompetitor = TrackBasedTest.createCompetitorWithBoat("FastBoat"); + c1 = fastCompetitor; + CompetitorWithBoat slowCompetitor = TrackBasedTest.createCompetitorWithBoat("SlowBoat"); + c2 = slowCompetitor; + trackedRace = createTrackedRace(TrackBasedTest.createCompetitorAndBoatsMap(fastCompetitor, slowCompetitor)); rankingMetric = trackedRace.getRankingMetric(); assertEquals(120, trackedRace.getCourseLength().getNauticalMiles(), 0.02); assertSame(RankingMetrics.ONE_DESIGN, trackedRace.getTrackedRegatta().getRegatta().getRankingMetricType()); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java index be5ba21a7f1..702ef040606 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/ranking/TestSimpleTimeOnTimeRankingWithOneUpwindLeg.java @@ -17,7 +17,7 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.DomainFactory; @@ -61,14 +61,14 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class TestSimpleTimeOnTimeRankingWithOneUpwindLeg { private RankingMetric tot; private DynamicTrackedRace trackedRace; - private Competitor c1, c2; + private CompetitorWithBoat c1, c2; private void setUp(TimeOnTimeFactorMapping timeOnTimeFactors, Function timeOnDistanceFactors) { - CompetitorAndBoat fastCompetitorAndBoat = TrackBasedTest.createCompetitorAndBoat("FastBoat"); - c1 = fastCompetitorAndBoat.getCompetitor(); - CompetitorAndBoat slowCompetitorAndBoat = TrackBasedTest.createCompetitorAndBoat("SlowBoat"); - c2 = slowCompetitorAndBoat.getCompetitor(); - trackedRace = createTrackedRace(TrackBasedTest.createCompetitorAndBoatsMap(fastCompetitorAndBoat, slowCompetitorAndBoat), timeOnTimeFactors, timeOnDistanceFactors); + CompetitorWithBoat fastCompetitor = TrackBasedTest.createCompetitorWithBoat("FastBoat"); + c1 = fastCompetitor; + CompetitorWithBoat slowCompetitor = TrackBasedTest.createCompetitorWithBoat("SlowBoat"); + c2 = slowCompetitor; + trackedRace = createTrackedRace(TrackBasedTest.createCompetitorAndBoatsMap(fastCompetitor, slowCompetitor), timeOnTimeFactors, timeOnDistanceFactors); tot = trackedRace.getRankingMetric(); assertEquals(60, trackedRace.getCourseLength().getNauticalMiles(), 0.01); assertSame(RankingMetrics.TIME_ON_TIME_AND_DISTANCE, trackedRace.getTrackedRegatta().getRegatta().getRankingMetricType()); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java index e695da53a67..867102db523 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CompetitorListenerTest.java @@ -67,7 +67,7 @@ public class CompetitorListenerTest extends AbstractSerializationTest { @Before public void setUp() { baseDomainFactory = new DomainFactoryImpl((srlid)->null); - competitor = (DynamicCompetitor) TrackBasedTest.createCompetitorAndBoat("Hasso").getCompetitor(); + competitor = (DynamicCompetitor) TrackBasedTest.createCompetitorWithBoat("Hasso"); nationalityChanged = false; whatChangedNationality = null; oldNationality = null; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java index f3062e58a76..64121bc1458 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/DistanceCacheInvalidationAfterLoadingFinishedTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; @@ -35,14 +35,13 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; * */ public class DistanceCacheInvalidationAfterLoadingFinishedTest extends TrackBasedTest { - private Competitor competitor; + private CompetitorWithBoat competitor; private DynamicTrackedRace trackedRace; @Before public void setUp() { - CompetitorAndBoat competitorAndBoat = createCompetitorAndBoat("Test Competitor"); - Map competitorsAndBoats = TrackBasedTest.createCompetitorAndBoatsMap(competitorAndBoat); - competitor = competitorAndBoat.getCompetitor(); + competitor = createCompetitorWithBoat("Test Competitor"); + Map competitorsAndBoats = TrackBasedTest.createCompetitorAndBoatsMap(competitor); trackedRace = createTestTrackedRace("Test Regatta", "Test Race", "505", competitorsAndBoats, MillisecondsTimePoint.now(), /* useMarkPassingCalculator */ false); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java index 11d18cd2544..329ca0264bb 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Distance; @@ -26,13 +26,13 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class LineAnalysisTest extends TrackBasedTest { private TimePoint now; private DynamicTrackedRace trackedRace; - private CompetitorAndBoat competitorWithBoat; + private CompetitorWithBoat competitor; @Before public void setUp() { - competitorWithBoat = createCompetitorAndBoat("Test"); + competitor = createCompetitorWithBoat("Test"); now = MillisecondsTimePoint.now(); - trackedRace = createTestTrackedRace("Test Regatta", "Test Race", "505", createCompetitorAndBoatsMap(competitorWithBoat), now, /* useMarkPassingCalculator */ false); + trackedRace = createTestTrackedRace("Test Regatta", "Test Race", "505", createCompetitorAndBoatsMap(competitor), now, /* useMarkPassingCalculator */ false); } @Test @@ -70,8 +70,8 @@ public class LineAnalysisTest extends TrackBasedTest { final Position lineMiddle = leftPos.translateGreatCircle(lineBearingFromLeftToRight, leftPos.getDistance(rightPos).scale(0.5)); final Distance distanceBehindLine = new MeterDistance(10); final Position behindMiddleOfLine = lineMiddle.translateGreatCircle(awayFromCourseSideOrthogonalToLine, distanceBehindLine); - trackedRace.getTrack(competitorWithBoat.getCompetitor()).add(new GPSFixMovingImpl(behindMiddleOfLine, now, new KnotSpeedWithBearingImpl(5, new DegreeBearingImpl(45)))); - assertEquals(distanceBehindLine.getMeters(), trackedRace.getDistanceToStartLine(competitorWithBoat.getCompetitor(), now).getMeters(), 0.01); + trackedRace.getTrack(competitor).add(new GPSFixMovingImpl(behindMiddleOfLine, now, new KnotSpeedWithBearingImpl(5, new DegreeBearingImpl(45)))); + assertEquals(distanceBehindLine.getMeters(), trackedRace.getDistanceToStartLine(competitor, now).getMeters(), 0.01); } @Test @@ -85,9 +85,9 @@ public class LineAnalysisTest extends TrackBasedTest { final Position outsideOfLine = rightPos.translateGreatCircle(lineBearingFromLeftToRight, new MeterDistance(30)); // 30m right of start boat final Distance distanceBehindLine = new MeterDistance(10); final Position behindOutsideOfLine = outsideOfLine.translateGreatCircle(awayFromCourseSideOrthogonalToLine, distanceBehindLine); - trackedRace.getTrack(competitorWithBoat.getCompetitor()).add(new GPSFixMovingImpl(behindOutsideOfLine, now, new KnotSpeedWithBearingImpl(5, new DegreeBearingImpl(45)))); + trackedRace.getTrack(competitor).add(new GPSFixMovingImpl(behindOutsideOfLine, now, new KnotSpeedWithBearingImpl(5, new DegreeBearingImpl(45)))); // the distance is that of the hypotenuse formed by the two cathesuses of 10m and 30m length, respectively: - assertEquals(Math.sqrt(10.*10.+30.*30.), trackedRace.getDistanceToStartLine(competitorWithBoat.getCompetitor(), now).getMeters(), 0.01); + assertEquals(Math.sqrt(10.*10.+30.*30.), trackedRace.getDistanceToStartLine(competitor, now).getMeters(), 0.01); } private Mark getMark(String name) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java index 0696c2dfd09..5cc3d1551d2 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java @@ -18,7 +18,7 @@ import org.junit.Test; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.DomainFactory; @@ -75,15 +75,12 @@ public class ReachingLegTest extends TrackBasedTest { @Before public void setUp() { competitorsAndBoats = new LinkedHashMap<>(); - CompetitorAndBoat hungerWithBoat = createCompetitorAndBoat("Wolfgang Hunger"); - hunger = hungerWithBoat.getCompetitor(); - competitorsAndBoats.put(hungerWithBoat.getCompetitor(), hungerWithBoat.getBoat()); - CompetitorAndBoat plattnerWithBoat = createCompetitorAndBoat("Dr. Hasso Plattner"); - plattner = plattnerWithBoat.getCompetitor(); - competitorsAndBoats.put(plattnerWithBoat.getCompetitor(), plattnerWithBoat.getBoat()); - CompetitorAndBoat schomaekerWithBoat = createCompetitorAndBoat("Meike Schom�ker"); - schomaeker = schomaekerWithBoat.getCompetitor(); - competitorsAndBoats.put(schomaekerWithBoat.getCompetitor(), schomaekerWithBoat.getBoat()); + CompetitorWithBoat hunger = createCompetitorWithBoat("Wolfgang Hunger"); + competitorsAndBoats.put(hunger, hunger.getBoat()); + CompetitorWithBoat plattner = createCompetitorWithBoat("Dr. Hasso Plattner"); + competitorsAndBoats.put(plattner, plattner.getBoat()); + CompetitorWithBoat schomaeker = createCompetitorWithBoat("Meike Schom�ker"); + competitorsAndBoats.put(schomaeker, schomaeker.getBoat()); start = new MillisecondsTimePoint(new GregorianCalendar(2011, 05, 23).getTime()); setTrackedRace(createTrackedRace("Kieler Woche", "505 Race 2", "505", competitorsAndBoats, start)); List hungersMarkPassings = createMarkPassings(hunger, start); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java index 0601e8b343f..5733057968d 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java @@ -16,7 +16,7 @@ import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.CourseArea; @@ -31,11 +31,12 @@ import com.sap.sailing.domain.base.Sideline; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; -import com.sap.sailing.domain.base.impl.CompetitorAndBoatImpl; import com.sap.sailing.domain.base.impl.CompetitorImpl; +import com.sap.sailing.domain.base.impl.CompetitorWithBoatImpl; import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl; import com.sap.sailing.domain.base.impl.CourseAreaImpl; import com.sap.sailing.domain.base.impl.CourseImpl; +import com.sap.sailing.domain.base.impl.DynamicBoat; import com.sap.sailing.domain.base.impl.FleetImpl; import com.sap.sailing.domain.base.impl.MarkImpl; import com.sap.sailing.domain.base.impl.NationalityImpl; @@ -88,23 +89,23 @@ public abstract class TrackBasedTest { } @SafeVarargs - public static Map createCompetitorAndBoatsMap(CompetitorAndBoat... competitorsAndBoats) { + public static Map createCompetitorAndBoatsMap(CompetitorWithBoat... competitorsWithBoats) { Map result = new LinkedHashMap<>(); - for (CompetitorAndBoat competitorAndBoat: competitorsAndBoats) { - result.put(competitorAndBoat.getCompetitor(), competitorAndBoat.getBoat()); + for (CompetitorWithBoat competitorWithBoat: competitorsWithBoats) { + result.put(competitorWithBoat, competitorWithBoat.getBoat()); } return result; } - public static CompetitorAndBoat createCompetitorAndBoat(String competitorName) { + public static CompetitorWithBoat createCompetitorWithBoat(String competitorName) { Competitor c = new CompetitorImpl(UUID.randomUUID(), competitorName, "HP", Color.RED, null, null, new TeamImpl("STG", Collections.singleton( new PersonImpl(competitorName, new NationalityImpl("GER"), /* dateOfBirth */null, "This is famous " + competitorName)), new PersonImpl("Rigo van Maas", new NationalityImpl("NED"), /* dateOfBirth */null, "This is Rigo, the coach")), /* timeOnTimeFactor */ null, /* timeOnDistanceAllowancePerNauticalMile */ null, null); - Boat b = new BoatImpl(c.getId(), competitorName + "'s boat", boatClass, null, null); - return new CompetitorAndBoatImpl(c, b); + DynamicBoat b = new BoatImpl(c.getId(), competitorName + "'s boat", boatClass, null, null); + return new CompetitorWithBoatImpl(c, b); } /** diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java index 609896e7163..4de312c268a 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStartTimeUpdateForDependentStartTimeTest.java @@ -18,7 +18,7 @@ import com.sap.sailing.domain.abstractlog.race.impl.RaceLogDependentStartTimeEve import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogStartTimeEventImpl; import com.sap.sailing.domain.abstractlog.race.impl.SimpleRaceLogIdentifierImpl; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.tracking.StartTimeChangedListener; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sse.common.Duration; @@ -28,7 +28,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class TrackedRaceStartTimeUpdateForDependentStartTimeTest extends TrackBasedTest { @Test public void testStartTimeUpdateForRaceWithDependentStartTime() { - final CompetitorAndBoat hasso = createCompetitorAndBoat("Hasso"); + final CompetitorWithBoat hasso = createCompetitorWithBoat("Hasso"); final RaceLog r1RaceLog = new RaceLogImpl("r1RaceLog"); final RaceLog r2RaceLog = new RaceLogImpl("r2RaceLog"); final RaceLogResolver raceLogResolver = new RaceLogResolver() { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java index 53a6a739a15..64b4b411bb0 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackedRaceStatusUpdateTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertSame; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.common.TrackedRaceStatusEnum; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.TrackingDataLoader; @@ -19,12 +19,12 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; * */ public class TrackedRaceStatusUpdateTest extends TrackBasedTest { - private CompetitorAndBoat competitor; + private CompetitorWithBoat competitor; private DynamicTrackedRace trackedRace; @Before public void setUp() { - competitor = createCompetitorAndBoat("Test Competitor"); + competitor = createCompetitorWithBoat("Test Competitor"); trackedRace = createTestTrackedRace("Test Regatta", "Test Race", "505", createCompetitorAndBoatsMap(competitor), MillisecondsTimePoint.now(), /* useMarkPassingCalculator */ false); } diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java index 3cd7570fc9e..a9a968c5b42 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UpdateMarkPassingTest.java @@ -11,8 +11,7 @@ import java.util.HashSet; import org.junit.Test; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; -import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Series; @@ -41,8 +40,7 @@ public class UpdateMarkPassingTest { when(race.getName()).thenReturn("Test Race"); Course c = new CourseImpl("Test Course", Collections.singleton(waypoint)); when(race.getCourse()).thenReturn(c); - CompetitorAndBoat competitorAndBoat = TrackBasedTest.createCompetitorAndBoat("Test Competitor"); - Competitor competitor = competitorAndBoat.getCompetitor(); + CompetitorWithBoat competitor = TrackBasedTest.createCompetitorWithBoat("Test Competitor"); when(race.getBoatClass()).thenReturn(new BoatClassImpl("49er", /* typicallyStartsUpwind */ true)); when(race.getCompetitors()).thenReturn(Collections.singleton(competitor)); DynamicTrackedRaceImpl trackedRace = new DynamicTrackedRaceImpl( diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java index 5fe71414213..fae597619ba 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; @@ -49,26 +49,23 @@ import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; public class WindEstimationOnConstructedTracksTest extends StoredTrackBasedTest { - private List competitors; - private List competitorsWithBoats; + private List competitors; private static final String[] competitorNames = new String[] { "Wolfgang Hunger", "Dr. Hasso Plattner", "Robert Stanjek", "Simon Grotelueschen" }; @Before public void setUp() { - competitorsWithBoats = new ArrayList<>(); competitors = new ArrayList<>(); for (String name : competitorNames) { - CompetitorAndBoat competitorAndBoat = createCompetitorAndBoat(name); - competitorsWithBoats.add(competitorAndBoat); - competitors.add(competitorAndBoat.getCompetitor()); + CompetitorWithBoat competitor = createCompetitorWithBoat(name); + competitors.add(competitor); } } private void initRace(int numberOfCompetitorsToUse, int[] numberOfMarksPassed, TimePoint timePointForFixes) { - List subList = competitorsWithBoats.subList(0, numberOfCompetitorsToUse); + List subList = competitors.subList(0, numberOfCompetitorsToUse); Map competitorsAndBoats = new HashMap<>(); - for (CompetitorAndBoat competitorAndBoat: subList) { - competitorsAndBoats.put(competitorAndBoat.getCompetitor(), competitorAndBoat.getBoat()); + for (CompetitorWithBoat competitor: subList) { + competitorsAndBoats.put(competitor, competitor.getBoat()); } setTrackedRace(createTestTrackedRace("Kieler Woche", "505 Race 2", "505", competitorsAndBoats, timePointForFixes, /* useMarkPassingCalculator */ false)); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java index 55730e3d0fd..062d795244e 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java @@ -15,7 +15,7 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.common.sensordata.BravoSensorDataMetadata; import com.sap.sailing.domain.common.tracking.impl.BravoFixImpl; import com.sap.sailing.domain.common.tracking.impl.DoubleVectorFixImpl; @@ -31,8 +31,8 @@ public class BravoFixTrackSerializationTest { @Before public void setUp() { - CompetitorAndBoat competitorAndBoat = TrackBasedTest.createCompetitorAndBoat("SAP Extreme Sailing Team"); - track = new BravoFixTrackImpl(competitorAndBoat.getCompetitor(), BravoFixTrack.TRACK_NAME, false); + CompetitorWithBoat competitor = TrackBasedTest.createCompetitorWithBoat("SAP Extreme Sailing Team"); + track = new BravoFixTrackImpl(competitor, BravoFixTrack.TRACK_NAME, false); } @Test diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java index f31878495b6..d80cbf182fd 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/InitialLoadReplicationObjectIdentityTest.java @@ -29,7 +29,7 @@ import com.sap.sailing.domain.abstractlog.race.impl.RaceLogWindFixEventImpl; import com.sap.sailing.domain.base.Boat; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceColumn; @@ -256,10 +256,10 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl Regatta regatta = master.apply(addEventOperation); final String raceName1 = "Test Race 1"; final String raceName2 = "Test Race 2"; - CompetitorAndBoat competitorAndBoat = TrackBasedTest.createCompetitorAndBoat("The Same Competitor"); + CompetitorWithBoat competitor = TrackBasedTest.createCompetitorWithBoat("The Same Competitor"); final CourseImpl masterCourse = new CourseImpl("Test Course", new ArrayList()); final Map competitors = new HashMap<>(); - competitors.put(competitorAndBoat.getCompetitor(), competitorAndBoat.getBoat()); + competitors.put(competitor, competitor.getBoat()); RaceDefinition race1 = new RaceDefinitionImpl(raceName1, masterCourse, boatClass, competitors); AddRaceDefinition addRaceOperation1 = new AddRaceDefinition(new RegattaName(regatta.getName()), race1); master.apply(addRaceOperation1); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java index 517d9d584e6..4fa03bd6b85 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaLogReplicationTest.java @@ -11,7 +11,7 @@ import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent; import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEventVisitor; import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogRegisterCompetitorEventImpl; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.leaderboard.FlexibleLeaderboard; @@ -33,8 +33,8 @@ public class RegattaLogReplicationTest extends @Before public void createEvent() throws Exception { - final CompetitorAndBoat competitorAndBoat = TrackBasedTest.createCompetitorAndBoat("Test Competitor"); - regattaLogEvent = new RegattaLogRegisterCompetitorEventImpl(t(0), t(0), author, 0, competitorAndBoat.getCompetitor()); + final CompetitorWithBoat competitor = TrackBasedTest.createCompetitorWithBoat("Test Competitor"); + regattaLogEvent = new RegattaLogRegisterCompetitorEventImpl(t(0), t(0), author, 0, competitor); // anotherRegattaLogEvent = new RegattaLogRegisterCompetitorEventImpl(t(1), author, t(1), 1, null); } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java index 5b268c1ecac..e0dad0c2846 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/SearchServiceTest.java @@ -20,7 +20,7 @@ import java.util.UUID; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.base.CompetitorAndBoat; +import com.sap.sailing.domain.base.CompetitorWithBoat; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.LeaderboardGroupBase; @@ -85,12 +85,12 @@ public class SearchServiceTest { private Venue flensburg; private Event pfingstbusch; private Regatta pfingstbusch29er; - private CompetitorAndBoat hassoPlattner; - private CompetitorAndBoat alexanderRies; - private CompetitorAndBoat antonKoch; - private CompetitorAndBoat tobiasSchadewaldt; - private CompetitorAndBoat philippBuhl; - private CompetitorAndBoat dennisGehrlein; + private CompetitorWithBoat hassoPlattner; + private CompetitorWithBoat alexanderRies; + private CompetitorWithBoat antonKoch; + private CompetitorWithBoat tobiasSchadewaldt; + private CompetitorWithBoat philippBuhl; + private CompetitorWithBoat dennisGehrlein; private Regatta pfingstbusch470; private Regatta aalRegatta; private DynamicTrackedRace pfingstbusch29erTrackedR1; @@ -182,12 +182,12 @@ public class SearchServiceTest { /* displayGroupsInReverseOrder */ false, Collections.singletonList(RegattaImpl.getDefaultName("Aalregatta", "ORC")), new int[0], /* overallLeaderboardScoringSchemeType */ null)); server.apply(new AddLeaderboardGroupToEvent(aalEvent.getId(), aalLeaderboardGroup.getId())); - hassoPlattner = AbstractTracTracLiveTest.createCompetitorAndBoat("Hasso Plattner"); - alexanderRies = AbstractTracTracLiveTest.createCompetitorAndBoat("Alexander Ries"); - antonKoch = AbstractTracTracLiveTest.createCompetitorAndBoat("Anton Koch"); - tobiasSchadewaldt = AbstractTracTracLiveTest.createCompetitorAndBoat("Tobias Schadewaldt"); - philippBuhl = AbstractTracTracLiveTest.createCompetitorAndBoat("Philipp Buhl"); - dennisGehrlein = AbstractTracTracLiveTest.createCompetitorAndBoat("Dennis Gehrlein"); + hassoPlattner = AbstractTracTracLiveTest.createCompetitorWithBoat("Hasso Plattner"); + alexanderRies = AbstractTracTracLiveTest.createCompetitorWithBoat("Alexander Ries"); + antonKoch = AbstractTracTracLiveTest.createCompetitorWithBoat("Anton Koch"); + tobiasSchadewaldt = AbstractTracTracLiveTest.createCompetitorWithBoat("Tobias Schadewaldt"); + philippBuhl = AbstractTracTracLiveTest.createCompetitorWithBoat("Philipp Buhl"); + dennisGehrlein = AbstractTracTracLiveTest.createCompetitorWithBoat("Dennis Gehrlein"); final RaceDefinitionImpl pfingstbusch29erR1 = new RaceDefinitionImpl("R1", new CourseImpl("up/down", Collections.emptyList()), pfingstbusch29er.getBoatClass(), AbstractTracTracLiveTest.createCompetitorAndBoatsMap(alexanderRies, tobiasSchadewaldt)); final RaceDefinitionImpl pfingstbusch29erR2 = new RaceDefinitionImpl("R2", new CourseImpl("up/down", Collections.emptyList()), pfingstbusch29er.getBoatClass(),