bug5932: more compact code

This commit is contained in:
Lisa
2023-12-20 12:57:11 +01:00
parent 2c03427dfd
commit 86ec1a56de
@@ -81,12 +81,9 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
public class TestTackTypeSegmentsTest { public class TestTackTypeSegmentsTest {
public static DynamicBoat createBoat(String competitorName) { public static DynamicCompetitorWithBoat createCompetitorWithBoat(String competitorName) {
return new BoatImpl("id12345", competitorName + "'s boat", DynamicBoat boat = (DynamicBoat) new BoatImpl("id12345", competitorName + "'s boat",
new BoatClassImpl("505", /* typicallyStartsUpwind */ true), /* sailID */ null); new BoatClassImpl("505", /* typicallyStartsUpwind */ true), /* sailID */ null);
}
public static DynamicCompetitorWithBoat createCompetitorWithBoat(String competitorName, DynamicBoat boat) {
return new CompetitorWithBoatImpl(competitorName, competitorName, "KYC", Color.RED, null, null, return new CompetitorWithBoatImpl(competitorName, competitorName, "KYC", Color.RED, null, null,
new TeamImpl("STG", new TeamImpl("STG",
Collections.singleton(new PersonImpl(competitorName, new NationalityImpl("GER"), Collections.singleton(new PersonImpl(competitorName, new NationalityImpl("GER"),
@@ -97,19 +94,6 @@ public class TestTackTypeSegmentsTest {
boat); boat);
} }
public static DynamicCompetitorWithBoat createCompetitorWithBoat(String competitorName) {
DynamicBoat boat = (DynamicBoat) createBoat(competitorName);
return createCompetitorWithBoat(competitorName, boat);
}
public static Map<Competitor, Boat> createCompetitorAndBoatsMap(CompetitorWithBoat... competitorsWithBoats) {
Map<Competitor, Boat> result = new LinkedHashMap<>();
for (CompetitorWithBoat competitorWithBoat : competitorsWithBoats) {
result.put(competitorWithBoat, competitorWithBoat.getBoat());
}
return result;
}
public static DynamicTrackedRaceImpl createTestTrackedRace(String regattaName, String raceName, public static DynamicTrackedRaceImpl createTestTrackedRace(String regattaName, String raceName,
String boatClassName, Map<Competitor, Boat> competitorsAndBoats, TimePoint timePointForFixes, String boatClassName, Map<Competitor, Boat> competitorsAndBoats, TimePoint timePointForFixes,
boolean useMarkPassingCalculator, RaceLogAndTrackedRaceResolver raceLogResolver, boolean useMarkPassingCalculator, RaceLogAndTrackedRaceResolver raceLogResolver,
@@ -175,7 +159,10 @@ public class TestTackTypeSegmentsTest {
// RENNEN 1 // RENNEN 1
competitor1 = createCompetitorWithBoat("C1"); competitor1 = createCompetitorWithBoat("C1");
competitor2 = createCompetitorWithBoat("C2"); competitor2 = createCompetitorWithBoat("C2");
final Map<Competitor, Boat> competitorsAndBoats2 = createCompetitorAndBoatsMap(competitor1, competitor2); Map<Competitor, Boat> competitorsAndBoats2 = new LinkedHashMap<>();
competitorsAndBoats2.put(competitor1, competitor1.getBoat());
competitorsAndBoats2.put(competitor2, competitor2.getBoat());
trackedRace2 = createTestTrackedRace("TestRegatta", "TestRace", "F18", competitorsAndBoats2, trackedRace2 = createTestTrackedRace("TestRegatta", "TestRace", "F18", competitorsAndBoats2,
MillisecondsTimePoint.now(), /* useMarkPassingCalculator */ false, null, MillisecondsTimePoint.now(), /* useMarkPassingCalculator */ false, null,
OneDesignRankingMetric::new); OneDesignRankingMetric::new);
@@ -208,8 +195,7 @@ public class TestTackTypeSegmentsTest {
@Test @Test
public void testingMissingMarkPassing() { public void testingMissingMarkPassing() {
// missing + skipped
Leaderboard leaderboard = new FlexibleLeaderboardImpl("Test", Leaderboard leaderboard = new FlexibleLeaderboardImpl("Test",
new ThresholdBasedResultDiscardingRuleImpl(new int[0]), new LowPoint(), new ThresholdBasedResultDiscardingRuleImpl(new int[0]), new LowPoint(),
new CourseAreaImpl("Here", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null)); new CourseAreaImpl("Here", UUID.randomUUID(), /* centerPosition */ null, /* radius */ null));
@@ -232,7 +218,6 @@ public class TestTackTypeSegmentsTest {
assertTrue(sumDistance == null); assertTrue(sumDistance == null);
assertEquals(null, sumDistance); assertEquals(null, sumDistance);
} }
// missing + skipped
@Test @Test
public void testingFixExactOnMarkPassing() { public void testingFixExactOnMarkPassing() {