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

bug6070: first compilable version

Browse Source
This commit is contained in:
Axel Uhl
2024-11-19 14:34:17 +01:00
parent 4e77521123
commit bec98a9bb6
12 changed files with 75 additions and 214 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/AbstractTracTracLiveTest.java
+3 -13
View File
@@ -24,8 +24,6 @@ import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.TracTracConnectionConstants;
import com.sap.sailing.domain.tractracadapter.TracTracControlPoint;
import com.sap.sailing.domain.tractracadapter.impl.ControlPointAdapter;
import com.sap.sse.common.Duration;
import com.sap.sse.common.Util.Pair;
import com.tractrac.model.lib.api.ModelLocator;
@@ -164,22 +162,14 @@ public abstract class AbstractTracTracLiveTest extends StoredTrackBasedTest {
return race;
}
public static Iterable<Pair<TracTracControlPoint, PassingInstruction>> getTracTracControlPointsWithPassingInstructions(Iterable<IMapItem> controlPoints) {
List<Pair<TracTracControlPoint, PassingInstruction>> ttControlPoints = new ArrayList<>();
public static Iterable<Pair<IMapItem, PassingInstruction>> getTracTracControlPointsWithPassingInstructions(Iterable<IMapItem> controlPoints) {
List<Pair<IMapItem, PassingInstruction>> ttControlPoints = new ArrayList<>();
for (IMapItem cp : controlPoints) {
ttControlPoints.add(new Pair<TracTracControlPoint, PassingInstruction>(new ControlPointAdapter(cp), PassingInstruction.None));
ttControlPoints.add(new Pair<IMapItem, PassingInstruction>(cp, PassingInstruction.None));
}
return ttControlPoints;
}
public static Iterable<TracTracControlPoint> getTracTracControlPoints(Iterable<IMapItem> controlPoints) {
List<TracTracControlPoint> ttControlPoints = new ArrayList<>();
for (IMapItem cp : controlPoints) {
ttControlPoints.add(new ControlPointAdapter(cp));
}
return ttControlPoints;
}
public static URI getCourseDesignUpdateURI() throws URISyntaxException {
return new URI("http://" + TracTracConnectionConstants.HOST_NAME + "/update_course");
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
+4 -5
View File
@@ -56,7 +56,6 @@ import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.impl.ControlPointAdapter;
import com.sap.sailing.domain.tractracadapter.impl.DomainFactoryImpl;
import com.sap.sailing.domain.tractracadapter.impl.RaceCourseReceiver;
import com.sap.sse.common.Util;
@@ -255,7 +254,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest {
@Override
public void waypointRemoved(int zeroBasedIndex, Waypoint waypointThatGotRemoved) {
System.out.println("waypointRemoved " + zeroBasedIndex + " / " + waypointThatGotRemoved);
ControlPoint cp = domainFactory.getOrCreateControlPoint(new ControlPointAdapter(removedControlPoint));
ControlPoint cp = domainFactory.getOrCreateControlPoint(removedControlPoint);
result[0] = zeroBasedIndex == controlPoints.size() && waypointThatGotRemoved.getControlPoint() == cp;
}
});
@@ -279,7 +278,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest {
@Override
public void waypointRemoved(int zeroBasedIndex, Waypoint waypointThatGotRemoved) {
System.out.println("waypointRemoved " + zeroBasedIndex + " / " + waypointThatGotRemoved);
ControlPoint cp = domainFactory.getOrCreateControlPoint(new ControlPointAdapter(removedControlPoint));
ControlPoint cp = domainFactory.getOrCreateControlPoint(removedControlPoint);
result[0] = zeroBasedIndex == 1 && waypointThatGotRemoved.getControlPoint() == cp;
}
});
@@ -307,7 +306,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest {
@Override
public void waypointAdded(int zeroBasedIndex, Waypoint waypointThatGotAdded) {
System.out.println("waypointAdded " + zeroBasedIndex + " / " + waypointThatGotAdded);
ControlPoint cp = domainFactory.getOrCreateControlPoint(new ControlPointAdapter(cp1));
ControlPoint cp = domainFactory.getOrCreateControlPoint(cp1);
result[0] = zeroBasedIndex == controlPoints.size() - 1 && waypointThatGotAdded.getControlPoint() == cp;
}
@@ -345,7 +344,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest {
@Override
public void waypointAdded(int zeroBasedIndex, Waypoint waypointThatGotAdded) {
System.out.println("waypointAdded " + zeroBasedIndex + " / " + waypointThatGotAdded);
ControlPoint cp = domainFactory.getOrCreateControlPoint(new ControlPointAdapter(cp1));
ControlPoint cp = domainFactory.getOrCreateControlPoint(cp1);
result[0] = zeroBasedIndex == controlPoints.size() - 1 && waypointThatGotAdded.getControlPoint() == cp;
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
+2 -4
View File
@@ -30,7 +30,6 @@ import com.sap.sailing.domain.tractracadapter.DomainFactory;
import com.sap.sailing.domain.tractracadapter.LoadingQueueDoneCallBack;
import com.sap.sailing.domain.tractracadapter.Receiver;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
import com.sap.sailing.domain.tractracadapter.impl.ControlPointAdapter;
import com.tractrac.model.lib.api.data.IControlPassing;
import com.tractrac.model.lib.api.data.IControlPassings;
import com.tractrac.model.lib.api.event.IRace;
@@ -157,18 +156,17 @@ public class ReceiveMarkPassingDataTest extends AbstractTracTracLiveTest {
}
assertNotNull(firstData[0]);
assertTrue(firstData[0].getPassings().size() > 0);
IControlPassing entry = firstData[0].getPassings().iterator().next();
final IControlPassing entry = firstData[0].getPassings().iterator().next();
assertNotNull(entry);
// we expect to find the mark passings in order, so as we traverse the course for
// its waypoints and compare their control points to the control point received,
// the first waypoint is used
boolean found = false;
for (Waypoint waypoint : raceDefinition.getCourse().getWaypoints()) {
if (waypoint.getControlPoint() == DomainFactory.INSTANCE.getOrCreateControlPoint(new ControlPointAdapter(entry.getControl()))) {
if (waypoint.getControlPoint() == DomainFactory.INSTANCE.getOrCreateControlPoint(entry.getControl())) {
found = true;
}
}
assertTrue(found);
}
}