fixed swiss timing tests

This commit is contained in:
Axel Uhl
2011-11-11 18:14:09 +01:00
parent b33335251a
commit 4d6b68fcd9
14 changed files with 154 additions and 33 deletions
@@ -22,7 +22,7 @@ public interface SwissTimingAdapterPersistence extends RaceSpecificMessageLoader
*
* @return messages in ascending sequence number order; always a valid but perhaps empty list
*/
List<SailMasterMessage> loadMessages(int firstSequenceNumber);
List<SailMasterMessage> loadCommandMessages(int firstSequenceNumber);
/**
* Loads all command messages (not race specific) received and stored to the DB.
@@ -91,13 +91,13 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
}
@Override
public List<SailMasterMessage> loadMessages(int firstSequenceNumber) {
DBCollection rawMessages = database.getCollection(CollectionNames.RAW_MESSAGES.name());
public List<SailMasterMessage> loadCommandMessages(int firstSequenceNumber) {
DBCollection commandMessages = database.getCollection(CollectionNames.COMMAND_MESSAGES.name());
BasicDBObject query = new BasicDBObject();
if (firstSequenceNumber != -1) {
query.append(FieldNames.MESSAGE_SEQUENCE_NUMBER.name(), new BasicDBObject("$gte", firstSequenceNumber));
}
DBCursor results = rawMessages.find(query);
DBCursor results = commandMessages.find(query);
List<SailMasterMessage> result = new ArrayList<SailMasterMessage>();
for (DBObject o : results) {
result.add(swissTimingFactory.createMessage((String) o.get(FieldNames.MESSAGE_CONTENT.name()),
@@ -141,6 +141,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
}
@Override
public Race getRace(String raceID) {
DBCollection races = database.getCollection(CollectionNames.RACES_MASTERDATA.name());
@@ -158,6 +159,7 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
return null;
}
@Override
public Iterable<Race> getRaces() {
DBCollection races = database.getCollection(CollectionNames.RACES_MASTERDATA.name());