merge master into bug 5147

This commit is contained in:
Finn Huelsbusch
2022-10-03 09:53:35 +02:00
parent 9d1ad623e7
commit 1f1b3b8fef
106 changed files with 1308 additions and 456 deletions
@@ -81,7 +81,7 @@ import com.sap.sse.security.SecurityService;
/**
* See also bug 5219 (https://bugzilla.sapsailing.com/bugzilla/show_bug.cgi?id=5219).
*
*
* @author Axel Uhl (D043530)
*
*/
@@ -139,7 +139,7 @@ public class AutomaticRetrackUponCompetitorSetChangeTest {
final String seriesName = "Default";
service.apply(new UpdateSeries(regattaIdentifier, seriesName, seriesName, /* isMedal */ false, /* isFleetsCanRunInParallel */ false,
/* resultDiscardingThresholds */ null, /* startsWithZeroScore */ false, /* firstColumnIsNonDiscardableCarryForward */ false,
/* hasSplitFleetContiguousScoring */ false, /* hasCrossFleetMergedRanking */ false, /* maximumNumberOfDiscards */ null,
/* hasSplitFleetContiguousScoring */ false, /* hasCrossFleetMergedRanking */ false, /* maximumNumberOfDiscards */ null, /* oneAlwaysStaysOne */ false,
Arrays.asList(new FleetDTO(RED_FLEET_NAME, 0, Color.RED), new FleetDTO(GREEN_FLEET_NAME, 0, Color.GREEN), new FleetDTO(BLUE_FLEET_NAME, 0, Color.BLUE))));
service.apply(new CreateRegattaLeaderboard(regattaIdentifier, /* leaderboardDisplayName */ null, new int[0]));
service.apply(new AddColumnToSeries(regattaIdentifier, seriesName, FIRST_RACE_COLUMN_NAME));
@@ -194,7 +194,7 @@ public class AutomaticRetrackUponCompetitorSetChangeTest {
assertNotSame(race, newRace);
racesHandle = newHandle; // ensure that tearDown tears down the correct tracker
}
@Test
public void testStartRaceLogTrackingAndAddCompetitor() throws NotDenotedForRaceLogTrackingException, Exception {
final RaceLog raceLog = service.getRaceLog(regattaIdentifier.getRegattaName(), FIRST_RACE_COLUMN_NAME, RED_FLEET_NAME);
@@ -167,7 +167,7 @@ public class SearchServiceTest {
seriesCreationParams.put("Default",
new SeriesCreationParametersDTO(Collections.singletonList(new FleetDTO("Default", /* order */-1, Color.RED)),
/* medal */false, /* fleetsCanRunInParallel */ true, /* startsWithZero */false, /* firstColumnIsNonDiscardableCarryForward */false,
/* discardingThresholds */null, /* hasSplitFleetContiguousScoring */false, /* hasCrossFleetMergedRanking */ false, /* maximumNumberOfDiscards */ null));
/* discardingThresholds */null, /* hasSplitFleetContiguousScoring */false, /* hasCrossFleetMergedRanking */ false, /* maximumNumberOfDiscards */ null, /* oneAlwaysStaysOne */ false));
pfingstbusch29er = server.apply(new AddSpecificRegatta(RegattaImpl.getDefaultName("Pfingstbusch", "29er"),
"29er", /* canBoatsOfCompetitorsChangePerRace */ true, CompetitorRegistrationType.CLOSED,
/* registrationLinkSecret */ UUID.randomUUID().toString(), /* startDate */ null, /* endDate */ null,