From f628f356fbb6e6895a8e32e14f569359802b1697 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 29 Jul 2011 17:27:45 +0200 Subject: [PATCH] consistently use test database for wind track tests --- TODO | 1 + .../test/TestStoringAndRetrievingWindTracks.java | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index 8b6d6f240d4..de8c6e4c399 100755 --- a/TODO +++ b/TODO @@ -38,6 +38,7 @@ Axel * each leaderboard has its own URL * wind display * edit mode for disqualifications / net / total point adjustments + o implement a Mongo collection for leaderboard assembly and result overrides * store net / total points separately in Mongo, making them overridable in editable copy of leaderboard * consider a per-user preferences page where leaderboard columns can be personalized at runtime * mark position entry capability, supporting "lost mark tracker" use case diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java index a4466b59d12..26c1b4b5769 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracks.java @@ -32,8 +32,8 @@ import com.sap.sailing.domain.tracking.impl.WindImpl; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.Receiver; import com.sap.sailing.domain.tractracadapter.ReceiverType; -import com.sap.sailing.mongodb.MongoObjectFactory; import com.sap.sailing.mongodb.impl.DomainObjectFactoryImpl; +import com.sap.sailing.mongodb.impl.MongoObjectFactoryImpl; import com.sap.sailing.mongodb.impl.MongoWindStoreFactoryImpl; public class TestStoringAndRetrievingWindTracks extends AbstractTracTracLiveTest implements MongoDBTest { @@ -72,7 +72,9 @@ public class TestStoringAndRetrievingWindTracks extends AbstractTracTracLiveTest EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageSpeed */ 30000, 10000, getEvent(), this); WindSource windSource = WindSource.WEB; - MongoObjectFactory.INSTANCE.addWindTrackDumper(trackedEvent, trackedRace, windSource); + Mongo myFirstMongo = newMongo(); + DB firstDatabase = myFirstMongo.getDB(WIND_TEST_DB); + new MongoObjectFactoryImpl(firstDatabase).addWindTrackDumper(trackedEvent, trackedRace, windSource); WindTrack windTrack = trackedRace.getWindTrack(windSource); Position pos = new DegreePosition(54, 9); for (double bearingDeg = 123.4; bearingDeg<140; bearingDeg += 1.1) { @@ -81,9 +83,9 @@ public class TestStoringAndRetrievingWindTracks extends AbstractTracTracLiveTest } Thread.sleep(1000); // give MongoDB some time to make written data available to other connections - Mongo myMongo = newMongo(); - DB database = myMongo.getDB(WIND_TEST_DB); - WindTrack result = new DomainObjectFactoryImpl(database).loadWindTrack(domainEvent, race, windSource, /* millisecondsOverWhichToAverage */ + Mongo mySecondMongo = newMongo(); + DB secondDatabase = mySecondMongo.getDB(WIND_TEST_DB); + WindTrack result = new DomainObjectFactoryImpl(secondDatabase).loadWindTrack(domainEvent, race, windSource, /* millisecondsOverWhichToAverage */ 30000); double myBearingDeg = 123.4; for (Wind wind : result.getRawFixes()) {