relaxed further test verdicts; fixed WindTrackImpl.remove regarding equals and compactify

Change-Id: Iba121c395fb35963df0c6f0a699f4d27f818b723
This commit is contained in:
Axel Uhl committed 2017-03-07 20:42:03 +01:00
1 parent 80d6b83d95
commit 735b9a8042
4 files changed
+12 -8

No files matched your search

@@ -1,7 +1,6 @@
package com.sap.sailing.server.replication.test;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -57,6 +56,7 @@ import com.sap.sailing.domain.persistence.PersistenceFactory;
import com.sap.sailing.domain.persistence.media.MediaDBFactory;
import com.sap.sailing.domain.racelog.tracking.EmptySensorFixStore;
import com.sap.sailing.domain.ranking.OneDesignRankingMetric;
import com.sap.sailing.domain.test.PositionAssert;
import com.sap.sailing.domain.test.TrackBasedTest;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.TrackedRace;
@@ -158,7 +158,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl
WindTrack masterRCWindFixes = masterTrackedRace.getOrCreateWindTrack(new WindSourceImpl(WindSourceType.RACECOMMITTEE));
masterRCWindFixes.lockForRead();
try {
assertEquals(masterWindFix, masterRCWindFixes.getRawFixes().iterator().next());
PositionAssert.assertWindEquals(masterWindFix, masterRCWindFixes.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01);
} finally {
masterRCWindFixes.unlockAfterRead();
}
@@ -233,7 +233,7 @@ public class InitialLoadReplicationObjectIdentityTest extends AbstractServerRepl
try {
Iterator<Wind> replicaRCWindFixesIter = replicaRCWindFixes.getRawFixes().iterator();
replicaRCWindFixesIter.next();
assertEquals(replicaWindFix, replicaRCWindFixesIter.next());
PositionAssert.assertWindEquals(replicaWindFix, replicaRCWindFixesIter.next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.02);
} finally {
replicaRCWindFixes.unlockAfterRead();
}
@@ -44,6 +44,7 @@ import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl;
import com.sap.sailing.domain.persistence.MongoWindStore;
import com.sap.sailing.domain.persistence.MongoWindStoreFactory;
import com.sap.sailing.domain.persistence.PersistenceFactory;
import com.sap.sailing.domain.test.PositionAssert;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.DynamicTrackedRegatta;
import com.sap.sailing.domain.tracking.GPSFixTrack;
@@ -130,7 +131,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio
competitorTrack.lockForRead();
try {
assertEquals(1, Util.size(competitorTrack.getRawFixes()));
assertEquals(fix, competitorTrack.getRawFixes().iterator().next());
PositionAssert.assertGPSFixEquals(fix, competitorTrack.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01);
assertNotSame(fix, competitorTrack.getRawFixes().iterator().next());
} finally {
competitorTrack.unlockAfterRead();
@@ -151,7 +152,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio
replicaMarkTrack.lockForRead();
try {
assertEquals(1, Util.size(replicaMarkTrack.getRawFixes()));
assertEquals(replicaMarkTrack.getRawFixes().iterator().next(), fix);
PositionAssert.assertGPSFixEquals(replicaMarkTrack.getRawFixes().iterator().next(), fix, /* pos deg delta */ 0.0000001);
assertNotSame(fix, replicaMarkTrack.getRawFixes().iterator().next());
} finally {
replicaMarkTrack.unlockAfterRead();
@@ -174,7 +175,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio
try {
assertEquals(1, Util.size(replicaWindTrack.getRawFixes()));
Wind replicaWind = replicaWindTrack.getRawFixes().iterator().next();
assertEquals(wind, replicaWind);
PositionAssert.assertWindEquals(wind, replicaWind, /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.02, /* knot speed delta */ 0.02);
assertNotSame(wind, replicaWind);
} finally {
replicaWindTrack.unlockAfterRead();
@@ -37,6 +37,8 @@ import com.sap.sailing.domain.common.tracking.GPSFixMoving;
import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl;
import com.sap.sailing.domain.persistence.MongoWindStoreFactory;
import com.sap.sailing.domain.persistence.PersistenceFactory;
import com.sap.sailing.domain.racelog.tracking.GPSFixStore;
import com.sap.sailing.domain.test.PositionAssert;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.DynamicTrackedRegatta;
import com.sap.sailing.domain.tracking.GPSFixTrack;
@@ -157,7 +159,7 @@ public class TrackedRaceWithGPSFixStoreContentsReplicationTest extends AbstractS
competitorTrack.lockForRead();
try {
assertEquals(1, Util.size(competitorTrack.getRawFixes()));
assertEquals(fix, competitorTrack.getRawFixes().iterator().next());
PositionAssert.assertGPSFixEquals(fix, competitorTrack.getRawFixes().iterator().next(), /* pos deg delta */ 0.0000001, /* bearing deg delta */ 0.01, /* knot speed delta */ 0.01);
assertNotSame(fix, competitorTrack.getRawFixes().iterator().next());
} finally {
competitorTrack.unlockAfterRead();