mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-25 06:58:39 +00:00
bug5217: compilable ; fixed warnings
This commit is contained in:
+7
-8
@@ -7,7 +7,6 @@ import java.net.MalformedURLException;
|
|||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import org.json.simple.JSONObject;
|
import org.json.simple.JSONObject;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
@@ -25,7 +24,7 @@ import com.sap.sailing.domain.common.Position;
|
|||||||
import com.sap.sailing.domain.common.impl.DegreePosition;
|
import com.sap.sailing.domain.common.impl.DegreePosition;
|
||||||
import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl;
|
import com.sap.sailing.domain.common.tracking.impl.GPSFixImpl;
|
||||||
import com.sap.sailing.domain.markpassinghash.TrackedRaceHashFingerprint;
|
import com.sap.sailing.domain.markpassinghash.TrackedRaceHashFingerprint;
|
||||||
import com.sap.sailing.domain.markpassinghash.impl.TrackedRaceHashForMarkPassingCalculationFactoryImpl;
|
import com.sap.sailing.domain.markpassinghash.TrackedRaceHashForMaskPassingCalculationFactory;
|
||||||
import com.sap.sailing.domain.test.OnlineTracTracBasedTest;
|
import com.sap.sailing.domain.test.OnlineTracTracBasedTest;
|
||||||
import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl;
|
import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl;
|
||||||
import com.sap.sailing.domain.tractracadapter.ReceiverType;
|
import com.sap.sailing.domain.tractracadapter.ReceiverType;
|
||||||
@@ -62,7 +61,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void JsonSerialization() {
|
public void JsonSerialization() {
|
||||||
TrackedRaceHashForMarkPassingCalculationFactoryImpl factory = new TrackedRaceHashForMarkPassingCalculationFactoryImpl();
|
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
|
||||||
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
||||||
TrackedRaceHashFingerprint fingerprint2 = factory.createFingerprint(trackedRace2);
|
TrackedRaceHashFingerprint fingerprint2 = factory.createFingerprint(trackedRace2);
|
||||||
JSONObject json1 = fingerprint1.toJson();
|
JSONObject json1 = fingerprint1.toJson();
|
||||||
@@ -72,7 +71,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void JsonDeserialization() {
|
public void JsonDeserialization() {
|
||||||
TrackedRaceHashForMarkPassingCalculationFactoryImpl factory = new TrackedRaceHashForMarkPassingCalculationFactoryImpl();
|
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
|
||||||
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
||||||
TrackedRaceHashFingerprint fingerprint2 = factory.createFingerprint(trackedRace2);
|
TrackedRaceHashFingerprint fingerprint2 = factory.createFingerprint(trackedRace2);
|
||||||
JSONObject json1 = fingerprint1.toJson();
|
JSONObject json1 = fingerprint1.toJson();
|
||||||
@@ -86,7 +85,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
|
|||||||
@Test
|
@Test
|
||||||
public void JsonSerializationWithChangesInRace() {
|
public void JsonSerializationWithChangesInRace() {
|
||||||
DynamicTrackedRaceImpl testRace = trackedRace2;
|
DynamicTrackedRaceImpl testRace = trackedRace2;
|
||||||
TrackedRaceHashForMarkPassingCalculationFactoryImpl factory = new TrackedRaceHashForMarkPassingCalculationFactoryImpl();
|
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
|
||||||
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
||||||
// Change of the race should result in a different hash
|
// Change of the race should result in a different hash
|
||||||
TimePoint epoch = new MillisecondsTimePoint(0l);
|
TimePoint epoch = new MillisecondsTimePoint(0l);
|
||||||
@@ -111,7 +110,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
|
|||||||
@Test
|
@Test
|
||||||
public void JsonDeserializationWithChangesInRace() {
|
public void JsonDeserializationWithChangesInRace() {
|
||||||
DynamicTrackedRaceImpl testRace = trackedRace2;
|
DynamicTrackedRaceImpl testRace = trackedRace2;
|
||||||
TrackedRaceHashForMarkPassingCalculationFactoryImpl factory = new TrackedRaceHashForMarkPassingCalculationFactoryImpl();
|
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
|
||||||
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
TrackedRaceHashFingerprint fingerprint1 = factory.createFingerprint(trackedRace1);
|
||||||
// Change of the race should result in a different hash
|
// Change of the race should result in a different hash
|
||||||
TimePoint epoch = new MillisecondsTimePoint(0l);
|
TimePoint epoch = new MillisecondsTimePoint(0l);
|
||||||
@@ -138,7 +137,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
|
|||||||
@Test
|
@Test
|
||||||
public void WaypointChangePassingInstructionTest() {
|
public void WaypointChangePassingInstructionTest() {
|
||||||
DynamicTrackedRaceImpl testRace = trackedRace2;
|
DynamicTrackedRaceImpl testRace = trackedRace2;
|
||||||
TrackedRaceHashForMarkPassingCalculationFactoryImpl factory = new TrackedRaceHashForMarkPassingCalculationFactoryImpl();
|
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
|
||||||
Waypoint wp = testRace.getRace().getCourse().getFirstWaypoint();
|
Waypoint wp = testRace.getRace().getCourse().getFirstWaypoint();
|
||||||
ControlPoint cP = wp.getControlPoint();
|
ControlPoint cP = wp.getControlPoint();
|
||||||
WaypointImpl wpNew = new WaypointImpl(cP, PassingInstruction.Gate);
|
WaypointImpl wpNew = new WaypointImpl(cP, PassingInstruction.Gate);
|
||||||
@@ -154,7 +153,7 @@ public class MarkPassingHashJsonSerializationTest extends OnlineTracTracBasedTes
|
|||||||
@Test
|
@Test
|
||||||
public void ControlPointChangeTest() {
|
public void ControlPointChangeTest() {
|
||||||
DynamicTrackedRaceImpl testRace = trackedRace2;
|
DynamicTrackedRaceImpl testRace = trackedRace2;
|
||||||
TrackedRaceHashForMarkPassingCalculationFactoryImpl factory = new TrackedRaceHashForMarkPassingCalculationFactoryImpl();
|
TrackedRaceHashForMaskPassingCalculationFactory factory = TrackedRaceHashForMaskPassingCalculationFactory.INSTANCE;
|
||||||
Mark gate1 = new MarkImpl("Gate1");
|
Mark gate1 = new MarkImpl("Gate1");
|
||||||
Mark gate2 = new MarkImpl("Gate2");
|
Mark gate2 = new MarkImpl("Gate2");
|
||||||
ControlPointWithTwoMarks cp = new ControlPointWithTwoMarksImpl(gate1, gate2, "cp", "");
|
ControlPointWithTwoMarks cp = new ControlPointWithTwoMarksImpl(gate1, gate2, "cp", "");
|
||||||
|
|||||||
Reference in New Issue
Block a user