From 288107a38616f25f02374463a5e091e9d3bba55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bro=C3=9F?= Date: Fri, 11 Dec 2015 14:51:33 +0100 Subject: [PATCH] Fix one test case and break another ;-) --- .../test/AbstractGPSFixStoreTest.java | 6 +++-- .../impl/CreateAndTrackWithRaceLogTest.java | 2 +- .../test/impl/TrackedRaceLoadsFixesTest.java | 25 ++++++++++--------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java index 7fec39314ed..8822a180daa 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java @@ -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) { diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java index 403e239ee22..7525270de13 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java @@ -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))); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java index 6aed04386ee..96f4e3cbd15 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java @@ -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. 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. 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));