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

bug5217: minor cosmetic changes

Browse Source
This commit is contained in:
I550803
2022-08-08 13:35:23 +02:00
parent 118371a299
commit 5c52e960d9
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassinghash/MarkPassingHashJsonSerializationTest.java
+7 -11
View File
@@ -25,18 +25,15 @@ import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.SpeedWithBearing;
import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl;
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl;
import com.sap.sailing.domain.common.tracking.impl.GPSFixMovingImpl;
import com.sap.sailing.domain.markpassinghash.TrackedRaceHashFingerprint;
import com.sap.sailing.domain.markpassinghash.TrackedRaceHashForMaskPassingCalculationFactory;
import com.sap.sailing.domain.test.OnlineTracTracBasedTest;
import com.sap.sailing.domain.tracking.GPSFixTrack;
import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.impl.DegreeBearingImpl;
import com.sap.sse.common.impl.MillisecondsTimePoint;
public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTest {
@@ -67,7 +64,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
trackedRace2 = getTrackedRace();
}
//@Test
// @Test
public void testJsonSerialization() {
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
@@ -77,7 +74,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
assertTrue("Original and de-serialized copy are equal", output1.matches(trackedRace1));
}
//@Test
// @Test
public void testJsonSerializationWithChangesInMarkFixes() {
DynamicTrackedRaceImpl testRace = trackedRace2;
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
@@ -106,7 +103,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2);
}
//@Test
// @Test
public void testWaypointChangePassingInstruction() {
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
@@ -124,7 +121,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2);
}
//@Test
// @Test
public void testControlPointChange() {
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
@@ -142,7 +139,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
JSONObject json2 = fingerprint2.toJson();
assertNotEquals("Json1 and Json2 are equal: " + json1 + " json2: " + json2, json1, json2);
}
@Test
public void testCompetitorFixChange() {
DynamicTrackedRaceImpl testRace = trackedRace2;
@@ -154,16 +151,15 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
secureRace.getTrack(firstCompetitor).lockForRead();
GPSFixMoving firstFix;
try {
firstFix = testRace.getTrack(firstCompetitor).getRawFixes().iterator().next();
firstFix = testRace.getTrack(firstCompetitor).getRawFixes().iterator().next();
} finally {
secureRace.getTrack(firstCompetitor).unlockAfterRead();
}
//Not null pointer safe !!!
SpeedWithBearing speed = firstFix.getSpeed();
Position pos = firstFix.getPosition();
TimePoint tp = firstFix.getTimePoint();
DegreePosition degPos = new DegreePosition(pos.getLatDeg() + 0.05, pos.getLngDeg() + 0.05);
GPSFixMoving gpsM = new GPSFixMovingImpl(degPos,tp,speed);
GPSFixMoving gpsM = new GPSFixMovingImpl(degPos, tp, speed);
testRace.getTrack(firstCompetitor).add(gpsM, true);
TrackedRaceHashFingerprint fingerprint2 = factory.createFingerprint(testRace);
assertFalse(fingerprint1.matches(testRace));