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 remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes

Browse Source 
# Conflicts:
#	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
This commit is contained in:
Frank Mittag
2018-02-27 15:17:45 +01:00
parent d2b3fc62c0 95e8e14d39
commit 162392a435
172 changed files with 4063 additions and 853 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/StoreAndLoadRaceLogEventsTest.java
-16
View File
@@ -20,14 +20,12 @@ import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogPassChangeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFlagEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogPassChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogRaceStatusEventImpl;
@@ -122,20 +120,6 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
assertEquals(isDisplayed, actualEvent.isDisplayed());
}
@Test
public void testStoreAndLoadCourseAreaChangedEvent() {
Serializable courseAreaId = UUID.randomUUID();
RaceLogCourseAreaChangedEvent expectedEvent = new RaceLogCourseAreaChangeEventImpl(MillisecondsTimePoint.now(),
expectedEventTime, author, expectedId, expectedPassId, courseAreaId);
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
RaceLogCourseAreaChangedEvent actualEvent = loadEvent(dbObject);
assertBaseFields(expectedEvent, actualEvent);
assertEquals(courseAreaId, actualEvent.getCourseAreaId());
}
@Test
public void testStoreAndLoadPassChangeEvent() {
RaceLogPassChangeEvent expectedEvent = new RaceLogPassChangeEventImpl(MillisecondsTimePoint.now(),
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
-23
View File
@@ -24,7 +24,6 @@ import com.sap.sailing.domain.abstractlog.race.CompetitorResult;
import com.sap.sailing.domain.abstractlog.race.CompetitorResult.MergeState;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogDependentStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
@@ -42,7 +41,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.SimpleRaceLogIdentifier;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultImpl;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogDependentStartTimeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventComparator;
@@ -430,27 +428,6 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD
}
}
@Test
public void testStoreAndRetrieveSimpleLeaderboardWithRaceLogCourseAreaChangeEvent() {
final UUID uuid = UUID.randomUUID();
RaceLogCourseAreaChangedEvent event = new RaceLogCourseAreaChangeEventImpl(now, author, 0, uuid);
addAndStoreRaceLogEvent(leaderboard, raceColumnName, event);
RaceLog loadedRaceLog = retrieveRaceLog();
loadedRaceLog.lockForRead();
try {
RaceLogEvent loadedEvent = loadedRaceLog.getFirstRawFix();
RaceLogCourseAreaChangedEvent courseAreaEvent = (RaceLogCourseAreaChangedEvent) loadedEvent;
assertEquals(event.getCreatedAt(), courseAreaEvent.getCreatedAt());
assertEquals(event.getLogicalTimePoint(), courseAreaEvent.getLogicalTimePoint());
assertEquals(event.getPassId(), courseAreaEvent.getPassId());
assertEquals(event.getId(), courseAreaEvent.getId());
assertEquals(event.getCourseAreaId(), courseAreaEvent.getCourseAreaId());
assertEquals(1, Util.size(loadedRaceLog.getFixes()));
} finally {
loadedRaceLog.unlockAfterRead();
}
}
@Test
public void testStoreAndRetrieveSimpleLeaderboardWithRaceLogRaceStatusEvent() {
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInRegatta.java
-25
View File
@@ -17,7 +17,6 @@ import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.race.CompetitorResult.MergeState;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmedEvent;
@@ -33,7 +32,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultImpl;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseAreaChangeEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogCourseDesignChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningConfirmedEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFinishPositioningListChangedEventImpl;
@@ -298,29 +296,6 @@ public class TestStoringAndRetrievingRaceLogInRegatta extends AbstractTestStorin
MongoObjectFactoryImpl factoryImpl = (MongoObjectFactoryImpl) mongoObjectFactory;
factoryImpl.getRaceLogCollection().insert(raceLogResult);
}
@Test
public void testStoreAndRetrieveRegattaWithRaceLogCourseAreaChangeEvent() {
final UUID uuid = UUID.randomUUID();
RaceLogCourseAreaChangedEvent event = new RaceLogCourseAreaChangeEventImpl(now, author, 0, uuid);
addAndStoreRaceLogEvent(regatta, raceColumnName, event);
RaceLog loadedRaceLog = retrieveRaceLog();
loadedRaceLog.lockForRead();
try {
RaceLogEvent loadedEvent = loadedRaceLog.getFirstRawFix();
RaceLogCourseAreaChangedEvent courseAreaEvent = (RaceLogCourseAreaChangedEvent) loadedEvent;
assertEquals(event.getLogicalTimePoint(), courseAreaEvent.getLogicalTimePoint());
assertEquals(event.getPassId(), courseAreaEvent.getPassId());
assertEquals(event.getId(), courseAreaEvent.getId());
assertEquals(event.getCourseAreaId(), courseAreaEvent.getCourseAreaId());
assertEquals(1, Util.size(loadedRaceLog.getFixes()));
} finally {
loadedRaceLog.unlockAfterRead();
}
}
@Test
public void testStoreAndRetrieveRegattaWithRaceLogRaceStatusEvent() {