refactoring of the MongoDBService to be configurable (TEST, PROD, etc.)

apply the new service to all tests
This commit is contained in:
fmittag
2011-11-25 13:59:41 +01:00
parent 6dee8ea2e0
commit e1c2918e27
29 changed files with 259 additions and 139 deletions
@@ -9,7 +9,7 @@ import org.junit.Before;
import com.mongodb.DB;
import com.mongodb.Mongo;
import com.mongodb.MongoException;
import com.sap.sailing.mongodb.Activator;
import com.sap.sailing.mongodb.MongoDBConfiguration;
public abstract class AbstractMongoDBTest implements MongoDBTest {
protected Mongo mongo;
@@ -17,7 +17,7 @@ public abstract class AbstractMongoDBTest implements MongoDBTest {
protected Mongo newMongo() throws UnknownHostException, MongoException {
return new Mongo(System.getProperty("mongo.host", "127.0.0.1"),
Activator.getDefaultInstance().getDefaultPort());
MongoDBConfiguration.getDefaultConfiguration().getPort());
}
@Before
@@ -5,7 +5,7 @@ import com.mongodb.DBObject;
import com.sap.sailing.domain.base.impl.DegreeBearingImpl;
import com.sap.sailing.domain.persistence.impl.FieldNames;
import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl;
import com.sap.sailing.mongodb.Activator;
import com.sap.sailing.mongodb.MongoDBService;
/**
* Reverses the wind directions of <em>all</em> wind records stored in the MongoDB that is obtained using
@@ -16,7 +16,7 @@ import com.sap.sailing.mongodb.Activator;
*/
public class ConvertWindData extends AbstractMongoDBTest {
public static void main(String[] args) {
MongoObjectFactoryImpl mof = new MongoObjectFactoryImpl(Activator.getDefaultInstance().getDB());
MongoObjectFactoryImpl mof = new MongoObjectFactoryImpl(MongoDBService.INSTANCE.getDB());
DBCollection windTracksCollection = mof.getWindTrackCollection();
for (DBObject dbo : windTracksCollection.find()) {
windTracksCollection.remove(dbo);
@@ -35,7 +35,7 @@ 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.Activator;
import com.sap.sailing.mongodb.MongoDBConfiguration;
import com.sap.sailing.server.RacingEventServiceImpl;
public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLiveTest implements MongoDBTest {
@@ -49,7 +49,7 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive
private Mongo newMongo() throws UnknownHostException, MongoException {
return new Mongo(System.getProperty("mongo.host", "127.0.0.1"),
Activator.getDefaultInstance().getDefaultPort());
MongoDBConfiguration.getDefaultConfiguration().getPort());
}
@Before