From f9d3d16f4b5a12b3ec2be99178f956bdf882875a Mon Sep 17 00:00:00 2001 From: Steffen Schaefer Date: Thu, 19 Jul 2018 10:13:52 +0200 Subject: [PATCH] Bug 4661: JavaDoc and method naming improvements --- ...oardScoringAndRankingTestForLowPoints.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestForLowPoints.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestForLowPoints.java index a33572307d0..8bbc958e8b1 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestForLowPoints.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTestForLowPoints.java @@ -47,7 +47,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco () -> createLeaderboard(regatta, discardingThresholds), leaderboardName); } - private void executeRandomPreSeries(List yellow, List blue, TimePoint now) { + private void executePreSeries(List yellow, List blue, TimePoint now) { RaceColumn qColumn = series.get(0).getRaceColumnByName("Q"); TrackedRace qYellow = new MockedTrackedRaceWithStartTimeAndRanks(now, yellow); qColumn.setTrackedRace(qColumn.getFleetByName("Yellow"), qYellow); @@ -139,7 +139,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -195,7 +195,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -282,7 +282,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -368,7 +368,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -455,7 +455,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -516,8 +516,8 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco } /** - * Using normal lowpoints, having two wins should not matter, also the racecolum factor is expected to be 2 instead - * of 1. + * Using normal lowpoints, being the best in the preseries and having an additional win in the medals, should not + * make you the overall winner in case another finalist has a better score. */ @Test public void negativeTestFirstPreseriesWinsAgain() throws NoWindException { @@ -536,7 +536,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List> preSeriesScoreRankResult = createCompetitorResultForTimestamp(later, @@ -595,7 +595,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -673,7 +673,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -752,7 +752,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4); @@ -832,7 +832,7 @@ public class LeaderboardScoringAndRankingTestForLowPoints extends LeaderboardSco Leaderboard leaderboard = createLeaderboard(regatta, /* discarding thresholds */ new int[0]); TimePoint now = MillisecondsTimePoint.now(); TimePoint later = new MillisecondsTimePoint(now.asMillis() + 1000); - executeRandomPreSeries(yellow, blue, now); + executePreSeries(yellow, blue, now); List preSeriesRankResult = leaderboard.getCompetitorsFromBestToWorst(later); List medalCompetitorsBestToWorst = preSeriesRankResult.subList(0, 4);