eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-07 03:22:23 +00:00
Code Activity

bug3465: fixed regatta ID initialization

Browse Source
This commit is contained in:
Axel Uhl committed 2020-05-09 00:40:12 +02:00
1 parent 5405db9f6e
commit edf73e9d57
4 files changed
+6 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java
+1 -1
View File
@@ -345,7 +345,7 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
boolean persistent, ScoringScheme scoringScheme, Serializable courseAreaId, Double buoyZoneRadiusInHullLengths,
boolean useStartTimeInference, boolean controlTrackingFromStartAndFinishTimes, boolean autoRestartTrackingUponCompetitorSetChange, RankingMetricConstructor rankingMetricConstructor) {
return createRegatta(regattaName, boatClassName, canBoatsOfCompetitorsChangePerRace, competitorRegistrationType,
registrationLinkSecret, startDate, endDate, courseAreaId, series, persistent, scoringScheme,
registrationLinkSecret, startDate, endDate, id, series, persistent, scoringScheme,
courseAreaId==null?Collections.emptySet():Collections.singleton(courseAreaId), buoyZoneRadiusInHullLengths, useStartTimeInference,
controlTrackingFromStartAndFinishTimes, autoRestartTrackingUponCompetitorSetChange,
rankingMetricConstructor);
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
+4 -6
View File
@@ -53,14 +53,12 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
/* course area ID */ (Serializable) null,
/* buoyZoneRadiusInHullLengths */2.0, /* useStartTimeInference */ true,
/* controlTrackingFromStartAndFinishTimes */ false, /* autoRestartTrackingUponCompetitorSetChange */ false, OneDesignRankingMetric::new);
Thread.sleep(1000);
Regatta replicatedRegatta = replica.getRegatta(new RegattaName(masterRegatta.getName()));
assertNotNull(replicatedRegatta);
assertTrue(replicatedRegatta.isPersistent());
assertTrue(Util.isEmpty((replicatedRegatta.getSeries())));
assertNull(replicatedRegatta.getCourseAreas());
assertTrue(Util.isEmpty(replicatedRegatta.getCourseAreas()));
assertTrue(regattaId.equals(replicatedRegatta.getId()));
assertNull(replicatedRegatta.getRegattaConfiguration());
}
@@ -126,7 +124,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
Thread.sleep(1000);
replicatedRegatta = replica.getRegatta(new RegattaName(masterRegatta.getName()));
assertNotNull(replicatedRegatta);
assertNull(replicatedRegatta.getCourseAreas());
assertTrue(Util.isEmpty(replicatedRegatta.getCourseAreas()));
// Test for 'alpha'
currentCourseAreaId = alphaCourseAreaId;
master.apply(new UpdateSpecificRegatta(masterRegatta.getRegattaIdentifier(), /*startDate*/ null, /*endDate*/ null,
@@ -155,7 +153,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
Thread.sleep(1000);
replicatedRegatta = replica.getRegatta(new RegattaName(masterRegatta.getName()));
assertNotNull(replicatedRegatta);
assertNull(replicatedRegatta.getCourseAreas());
assertTrue(Util.isEmpty(replicatedRegatta.getCourseAreas()));
}
public void testUpdateSpecificRegattaReplicationForProcedureAndCourseDesignerAndConfig() throws InterruptedException {
@@ -247,7 +245,7 @@ public class RegattaReplicationTest extends AbstractServerReplicationTest {
assertEquals("Medal", replicatedMedal.getName());
assertEquals(1, Util.size(replicatedMedal.getFleets()));
assertNotNull(replicatedMedal.getFleetByName("Medal"));
assertNull(replicatedRegatta.getCourseAreas());
assertTrue(Util.isEmpty(replicatedRegatta.getCourseAreas()));
}
@Test
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
+1 -1
View File
@@ -1955,7 +1955,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
/* registrationLinkSecret */ regatta.getRegistrationLinkSecret(), regatta.getStartDate(),
regatta.getEndDate(), regatta.getId(),
getSeriesWithoutRaceColumnsConstructionParametersAsMap(regatta), regatta.isPersistent(),
regatta.getScoringScheme(), Util.map(regatta.getCourseAreas(), CourseArea::getId), regatta.getBuoyZoneRadiusInHullLengths(),
regatta.getScoringScheme(), Util.mapToArrayList(regatta.getCourseAreas(), CourseArea::getId), regatta.getBuoyZoneRadiusInHullLengths(),
regatta.useStartTimeInference(), regatta.isControlTrackingFromStartAndFinishTimes(),
regatta.isAutoRestartTrackingUponCompetitorSetChange(), regatta.getRankingMetricType()));
RegattaIdentifier regattaIdentifier = regatta.getRegattaIdentifier();
java/com.sap.sse.replication.testsupport/src/com/sap/sse/replication/testsupport/AbstractServerReplicationTestSetUp.java
-1
View File
@@ -105,7 +105,6 @@ public abstract class AbstractServerReplicationTestSetUp<ReplicableInterface ext
private void setUpSecurity() {
SecurityManager securityManager = Mockito.mock(org.apache.shiro.mgt.SecurityManager.class);
Subject fakeSubject = Mockito.mock(Subject.class);
SecurityUtils.setSecurityManager(securityManager);
Mockito.doReturn(fakeSubject).when(securityManager).createSubject(Mockito.any());
Mockito.doReturn(true).when(fakeSubject).isAuthenticated();