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

Merge branch 'master' into bug2822_boatcolors

Browse Source 
# Conflicts:
#	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
#	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
#	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
This commit is contained in:
Steffen Schäfer
2017-05-16 15:59:24 +02:00
parent fd8fee5d58 8cf9053d37
commit 67d310df4b
883 changed files with 76261 additions and 49380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogConnectivityParamsLoadAndStoreTest.java
Regular → Executable
+1 -1
View File
@@ -51,7 +51,7 @@ public class RaceLogConnectivityParamsLoadAndStoreTest extends AbstractConnectiv
final Iterable<? extends Series> series = Arrays.<Series>asList(theSeries);
final Regatta regatta = racingEventService.createRegatta("My Regatta", "12mR", true, MillisecondsTimePoint.now(), MillisecondsTimePoint.now().plus(Duration.ONE_DAY),
UUID.randomUUID(), series, /* persistent */ true, new LowPoint(), new CourseAreaImpl("Default", UUID.randomUUID()),
/* buoyZoneRadiusInHullLengths */ 2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ true,
/* buoyZoneRadiusInHullLengths */ 2.0, /* useStartTimeInference */ true, /* controlTrackingFromStartAndFinishTimes */ false,
OneDesignRankingMetric::new);
theSeries.addRaceColumn("R1", racingEventService);
theSeries.addRaceColumn("R2", racingEventService);
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/RaceLogMongoDBTest.java
+6 -5
View File
@@ -7,8 +7,6 @@ import java.net.UnknownHostException;
import java.util.Iterator;
import java.util.UUID;
import junit.framework.Assert;
import org.junit.Before;
import com.mongodb.MongoException;
@@ -41,6 +39,9 @@ import com.sap.sailing.domain.racelog.RaceLogStore;
import com.sap.sailing.domain.regattalog.RegattaLogStore;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.AbstractColor;
import junit.framework.Assert;
public abstract class RaceLogMongoDBTest extends AbstractMongoDBTest {
@@ -102,9 +103,9 @@ public abstract class RaceLogMongoDBTest extends AbstractMongoDBTest {
course.addWaypoint(0,
new WaypointImpl(new ControlPointWithTwoMarksImpl(UUID.randomUUID(), new MarkImpl(UUID.randomUUID(),
"Black", MarkType.BUOY, "black", "round", "circle"), new MarkImpl(UUID.randomUUID(), "Green",
MarkType.BUOY, "green", "round", "circle"), "Upper gate")));
course.addWaypoint(1, new WaypointImpl(new MarkImpl(UUID.randomUUID(), "White", MarkType.BUOY, "white",
"Black", MarkType.BUOY, AbstractColor.getCssColor("black"), "round", "circle"), new MarkImpl(UUID.randomUUID(), "Green",
MarkType.BUOY, AbstractColor.getCssColor("green"), "round", "circle"), "Upper gate")));
course.addWaypoint(1, new WaypointImpl(new MarkImpl(UUID.randomUUID(), "White", MarkType.BUOY, AbstractColor.getCssColor("white"),
"conical", "bold"), PassingInstruction.Port));
return course;
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestParseAndMigratePassingSideAndControlPointTwoMarks.java
+5 -4
View File
@@ -18,6 +18,7 @@ import com.sap.sailing.domain.common.MarkType;
import com.sap.sailing.domain.common.PassingInstruction;
import com.sap.sailing.domain.persistence.impl.DomainObjectFactoryImpl;
import com.sap.sailing.domain.persistence.impl.FieldNames;
import com.sap.sse.common.impl.AbstractColor;
import com.sap.sse.mongodb.MongoDBConfiguration;
public class TestParseAndMigratePassingSideAndControlPointTwoMarks {
@@ -37,18 +38,18 @@ public class TestParseAndMigratePassingSideAndControlPointTwoMarks {
DBObject cpValue = new BasicDBObject();
cpValue.put(FieldNames.GATE_NAME.name(), "Name");
cpValue.put(FieldNames.GATE_ID.name(), (Serializable) 0);
Mark mark1 = new MarkImpl(0, "Left", MarkType.BUOY, "blue", "square", "checkers");
Mark mark1 = new MarkImpl(0, "Left", MarkType.BUOY, AbstractColor.getCssColor("blue"), "square", "checkers");
DBObject dbMark1 = new BasicDBObject();
dbMark1.put(FieldNames.MARK_ID.name(), mark1.getId());
dbMark1.put(FieldNames.MARK_COLOR.name(), mark1.getColor());
dbMark1.put(FieldNames.MARK_COLOR.name(), mark1.getColor().getAsHtml());
dbMark1.put(FieldNames.MARK_NAME.name(), mark1.getName());
dbMark1.put(FieldNames.MARK_PATTERN.name(), mark1.getPattern());
dbMark1.put(FieldNames.MARK_SHAPE.name(), mark1.getShape());
dbMark1.put(FieldNames.MARK_TYPE.name(), mark1.getType().name());
Mark mark2 = new MarkImpl(0, "Right", MarkType.BUOY, "blue", "square", "checkers");
Mark mark2 = new MarkImpl(0, "Right", MarkType.BUOY, AbstractColor.getCssColor("blue"), "square", "checkers");
DBObject dbMark2 = new BasicDBObject();
dbMark2.put(FieldNames.MARK_ID.name(), mark2.getId());
dbMark2.put(FieldNames.MARK_COLOR.name(), mark2.getColor());
dbMark2.put(FieldNames.MARK_COLOR.name(), mark2.getColor().getAsHtml());
dbMark2.put(FieldNames.MARK_NAME.name(), mark2.getName());
dbMark2.put(FieldNames.MARK_PATTERN.name(), mark2.getPattern());
dbMark2.put(FieldNames.MARK_SHAPE.name(), mark2.getShape());