eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-16 17:21:00 +00:00
Code Activity

Fix one test case and break another ;-)

Browse Source
This commit is contained in:
Jan Broß committed 2015-12-11 14:51:33 +01:00
1 parent 619a18c9ef
commit 288107a386
3 files changed
+18 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
+4 -2
View File
@@ -13,6 +13,7 @@ import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;
import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogDeviceCompetitorMappingEventImpl;
import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogDeviceMarkMappingEventImpl;
import com.sap.sailing.domain.abstractlog.regatta.impl.RegattaLogImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.Mark;
@@ -57,6 +58,7 @@ public class AbstractGPSFixStoreTest {
public void setServiceAndRaceLog() {
service = new RacingEventServiceImpl(null, null, serviceFinderFactory);
raceLog = new RaceLogImpl("racelog");
regattaLog = new RegattaLogImpl("regattalog");
store = new MongoGPSFixStoreImpl(service.getMongoObjectFactory(), service.getDomainObjectFactory(),
serviceFinderFactory);
}
@@ -68,13 +70,13 @@ public class AbstractGPSFixStoreTest {
mongoOF.getGPSFixMetadataCollection().drop();
}
protected void map(RaceLog raceLog, Competitor comp, DeviceIdentifier device, long from, long to) {
protected void map(RegattaLog regattaLog, Competitor comp, DeviceIdentifier device, long from, long to) {
regattaLog.add(new RegattaLogDeviceCompetitorMappingEventImpl(MillisecondsTimePoint.now(), MillisecondsTimePoint.now(), author, 0,
comp, device, new MillisecondsTimePoint(from), new MillisecondsTimePoint(to)));
}
protected void map(Competitor comp, DeviceIdentifier device, long from, long to) {
map(raceLog, comp, device, from, to);
map(regattaLog, comp, device, from, to);
}
protected void map(Mark mark, DeviceIdentifier device, long from, long to) {
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class CreateAndTrackWithRaceLogTest {
TrackedRace race = column.getTrackedRace(fleet);
assertNotNull(race);
race.waitForLoadingFromGPSFixStoreToFinishRunning(raceLog);
race.waitForLoadingFromGPSFixStoreToFinishRunning(regattaLog);
addFixes1(race, comp1, dev1);
regattaLog.add(new RegattaLogDeviceCompetitorMappingEventImpl(t(), t(), author, 0, comp1, dev1, t(11), t(20)));
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
+13 -12
View File
@@ -11,9 +11,9 @@ import java.util.Collections;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;
import com.sap.sailing.domain.abstractlog.regatta.impl.RegattaLogImpl;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.Course;
@@ -81,7 +81,7 @@ public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest {
trackedRace.attachRaceLog(raceLog);
trackedRace.attachRegattaLog(regattaLog);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(raceLog);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(regattaLog);
testNumberOfRawFixes(trackedRace.getTrack(comp), 1);
testNumberOfRawFixes(trackedRace.getOrCreateTrack(mark), 1);
@@ -129,9 +129,10 @@ public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest {
DynamicTrackedRaceImpl trackedRace = new DynamicTrackedRaceImpl(regatta, race,
Collections.<Sideline> emptyList(), EmptyWindStore.INSTANCE, store, 0, 0, 0, /*useMarkPassingCalculator*/ false,
OneDesignRankingMetric::new, mock(RaceLogResolver.class));
trackedRace.attachRaceLog(raceLog);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(raceLog);
trackedRace.attachRegattaLog(regattaLog);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(regattaLog);
testNumberOfRawFixes(trackedRace.getTrack(comp), 10002);
testNumberOfRawFixes(trackedRace.getTrack(comp2), 1);
@@ -154,16 +155,16 @@ public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest {
}
@Test
public void attachTwoRaceLogsAndSeeIfLoadingIsSerializedNicely() throws TransformationException,
public void attachTwoRegattaLogsAndSeeIfLoadingIsSerializedNicely() throws TransformationException,
NoCorrespondingServiceRegisteredException, InterruptedException {
Course course = new CourseImpl("course", Collections.<Waypoint> emptyList());
RaceDefinition race = new RaceDefinitionImpl("race", course, boatClass,
Arrays.asList(new Competitor[] { comp }));
RaceLog raceLog2 = new RaceLogImpl("raceLog 2");
RegattaLog regattaLog2 = new RegattaLogImpl("raceLog 2");
final int numFixes = 10000;
map(comp, device, 0, numFixes / 2);
map(raceLog2, comp, device, numFixes / 2 + 1, numFixes);
map(regattaLog2, comp, device, numFixes / 2 + 1, numFixes);
for (int i = 0; i < numFixes; i++) {
store.storeFix(device, createFix(i, 10, 20, 30, 40));
@@ -190,11 +191,11 @@ public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest {
}
});
trackedRace.attachRaceLog(raceLog);
trackedRace.attachRaceLog(raceLog2);
trackedRace.attachRegattaLog(regattaLog);
trackedRace.attachRegattaLog(regattaLog2);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(raceLog);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(raceLog2);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(regattaLog);
trackedRace.waitForLoadingFromGPSFixStoreToFinishRunning(regattaLog2);
assertThat("switch at most once between the two race logs while loading",
numberOfSwitchesBetweenLoadingRaceLogs, lessThanOrEqualTo(1));