eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-14 16:20:57 +00:00
Code Activity

further refactoring (AbstractLog): pass and involved competitors -> RaceLog, generalize RevokeEvent

Browse Source
This commit is contained in:
Fredrik Teschke committed 2014-11-17 14:42:44 +01:00
1 parent 82c788b66b
commit d53e21ff0d
160 files changed
+1105 -930
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java
+2 -2
View File
@@ -8,7 +8,7 @@ import java.util.List;
import org.junit.Before;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventAuthor;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.CourseArea;
@@ -36,7 +36,7 @@ public abstract class AbstractTestStoringAndRetrievingRaceLogInRegatta extends R
protected MongoObjectFactory mongoObjectFactory = null;
protected DomainObjectFactory domainObjectFactory = null;
protected Regatta regatta = null;
protected RaceLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
protected AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
public AbstractTestStoringAndRetrievingRaceLogInRegatta() throws UnknownHostException, MongoException {
super();
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java
+2 -2
View File
@@ -12,8 +12,8 @@ import org.junit.Before;
import org.junit.Test;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent;
@@ -46,7 +46,7 @@ public class StoreAndLoadDeviceIdentifierTest extends AbstractMongoDBTest {
protected static final String group = "group";
protected static final String column = "column";
protected static final String fleet = "fleet";
protected final RaceLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
protected final AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
protected RaceLogIdentifier logIdentifier;
protected MongoObjectFactoryImpl mongoFactory;
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java
+7 -7
View File
@@ -18,15 +18,15 @@ import org.junit.Test;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory;
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.RevokeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent;
import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent;
@@ -67,7 +67,7 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
protected Serializable expectedId = UUID.randomUUID();
protected List<Competitor> expectedInvolvedBoats = Collections.emptyList();
protected int expectedPassId = 42;
private RaceLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
public StoreAndLoadRaceLogEventsTest() throws UnknownHostException, MongoException {
super();
@@ -98,8 +98,8 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
assertNull(expectedEvent.getAuthor());
assertNotNull(actualEvent.getAuthor());
assertEquals(RaceLogEventAuthor.PRIORITY_COMPATIBILITY, actualEvent.getAuthor().getPriority());
assertEquals(RaceLogEventAuthor.NAME_COMPATIBILITY, actualEvent.getAuthor().getName());
assertEquals(AbstractLogEventAuthor.PRIORITY_COMPATIBILITY, actualEvent.getAuthor().getPriority());
assertEquals(AbstractLogEventAuthor.NAME_COMPATIBILITY, actualEvent.getAuthor().getName());
}
@Test
@@ -233,12 +233,12 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
String revokedEventType = "type";
String revokedEventShortInfo = "short info";
String reason = "reason";
RevokeEvent expectedEvent = eventFactory.createRevokeEvent(
RaceLogRevokeEvent expectedEvent = eventFactory.createRevokeEvent(
expectedEventTime, author, expectedEventTime, expectedId, expectedPassId, revokedEventId,
revokedEventType, revokedEventShortInfo, reason);
DBObject dbObject = mongoFactory.storeRaceLogEntry(logIdentifier, expectedEvent);
RevokeEvent actualEvent = loadEvent(dbObject);
RaceLogRevokeEvent actualEvent = loadEvent(dbObject);
assertBaseFields(expectedEvent, actualEvent);
assertEquals(revokedEventId, actualEvent.getRevokedEventId());
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java
+2 -2
View File
@@ -10,8 +10,8 @@ import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
@@ -57,7 +57,7 @@ public class StoreGPSFixTrackTest extends AbstractMongoDBTest {
@Test
public void testStoreAndLoadFixes() throws TransformationException, NoCorrespondingServiceRegisteredException {
TypeBasedServiceFinderFactory factory = new MockSmartphoneImeiServiceFinderFactory();
RaceLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
Competitor comp = DomainFactory.INSTANCE.getOrCreateCompetitor("comp", "comp", null, null, null);
Mark mark = DomainFactory.INSTANCE.getOrCreateMark("mark");
MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService(), factory);
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java
+2 -2
View File
@@ -12,7 +12,7 @@ import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventAuthor;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
@@ -25,7 +25,7 @@ import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl;
public class TestStoringAndRetrievingRaceLogEventData extends AbstractMongoDBTest {
private static final String RACELOG_TEST_COLLECTION = "racelog_test_collection";
private RaceLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
public TestStoringAndRetrievingRaceLogEventData() throws UnknownHostException, MongoException {
super();
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
+3 -3
View File
@@ -19,12 +19,12 @@ import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
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.RaceLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningListChangedEvent;
@@ -71,7 +71,7 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD
String leaderboardName = "TestLeaderboard";
final int[] discardIndexResultsStartingWithHowManyRaces = new int[] { 5, 8 };
FlexibleLeaderboardImpl leaderboard = null;
private RaceLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
public TestStoringAndRetrievingRaceLogInLeaderboards() throws UnknownHostException, MongoException {
super();
@@ -168,7 +168,7 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD
reloadedRenamedRaceLog.lockForRead();
try {
assertEquals(1, Util.size(reloadedRenamedRaceLog.getRawFixes()));
assertEquals(0, RaceLogEventComparator.INSTANCE.compare(expectedEvent, reloadedRenamedRaceLog.getRawFixes().iterator().next()));
assertEquals(0, new RaceLogEventComparator().compare(expectedEvent, reloadedRenamedRaceLog.getRawFixes().iterator().next()));
} finally {
reloadedRenamedRaceLog.unlockAfterRead();
}