eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-28 00:16:46 +00:00
Code Activity

use mongo.port property also in mongodb.test bundle

Browse Source
This commit is contained in:
Axel Uhl
2011-06-12 13:19:21 +02:00
parent 368fbfe2eb
commit def8296c1d
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -11,4 +11,5 @@ Require-Bundle: org.junit4;bundle-version="4.8.1",
com.sap.sailing.mongodb,
com.sap.sailing.domain.test,
com.tractrac.clientmodule,
com.sap.sailing.domain.tractracadapter
com.sap.sailing.domain.tractracadapter,
org.eclipse.osgi
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java
+8 -3
View File
@@ -23,15 +23,20 @@ import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sailing.mongodb.DomainObjectFactory;
import com.sap.sailing.mongodb.MongoObjectFactory;
import com.sap.sailing.mongodb.impl.MongoWindStoreFactoryImpl;
public class TestStoringAndRetrievingWindData implements MongoDBTest {
private static final String WIND_TEST_COLLECTION = "wind_test_collection";
private Mongo mongo;
private DB db;
private Mongo newMongo() throws UnknownHostException, MongoException {
return new Mongo("127.0.0.1", ((MongoWindStoreFactoryImpl) MongoWindStoreFactoryImpl.getDefaultInstance()).getDefaultPort());
}
@Before
public void dropTestDB() throws UnknownHostException, MongoException {
mongo = new Mongo();
mongo = newMongo();
assertNotNull(mongo);
mongo.dropDatabase(WIND_TEST_DB);
db = mongo.getDB(WIND_TEST_DB);
@@ -61,7 +66,7 @@ public class TestStoringAndRetrievingWindData implements MongoDBTest {
{
Thread.sleep(1000); // wait until MongoDB has recorded the change and made it visible
Mongo mongo = new Mongo();
Mongo mongo = newMongo();
assertNotNull(mongo);
DB db = mongo.getDB(WIND_TEST_DB);
assertNotNull(db);
@@ -86,7 +91,7 @@ public class TestStoringAndRetrievingWindData implements MongoDBTest {
{
Thread.sleep(1000); // wait until MongoDB has recorded the change and made it visible
Mongo mongo = new Mongo();
Mongo mongo = newMongo();
assertNotNull(mongo);
DB db = mongo.getDB(WIND_TEST_DB);
assertNotNull(db);
java/com.sap.sailing.mongodb/META-INF/MANIFEST.MF
+2 -1
View File
@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.domain,
org.eclipse.osgi
Export-Package: com.sap.sailing.mongodb
Export-Package: com.sap.sailing.mongodb,
com.sap.sailing.mongodb.impl;x-friends:="com.sap.sailing.mongodb.test"
Bundle-ActivationPolicy: lazy
Bundle-Activator: com.sap.sailing.mongodb.impl.MongoWindStoreFactoryImpl
java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/impl/MongoWindStoreFactoryImpl.java
+5 -1
View File
@@ -18,7 +18,7 @@ public class MongoWindStoreFactoryImpl implements MongoWindStoreFactory, BundleA
private static MongoWindStoreFactory defaultInstance;
private String defaultHostName;
private Integer defaultPort;
private int defaultPort;
private String defaultDatabaseName;
@Override
@@ -65,6 +65,10 @@ public class MongoWindStoreFactoryImpl implements MongoWindStoreFactory, BundleA
return defaultInstance;
}
public Integer getDefaultPort() {
return defaultPort;
}
@Override
public void stop(BundleContext context) throws Exception {
}
java/com.sap.sailing.mongodb/src/com/sap/sailing/mongodb/impl/MongoWindStoreImpl.java
+2 -3
View File
@@ -29,13 +29,12 @@ public class MongoWindStoreImpl implements MongoWindStore {
public MongoWindStoreImpl(int port, String dbName, MongoObjectFactory mongoObjectFactory)
throws UnknownHostException, MongoException {
this("localhost", port, dbName, mongoObjectFactory);
this("127.0.0.1", port, dbName, mongoObjectFactory);
}
public MongoWindStoreImpl(String hostname, int port, String dbName, MongoObjectFactory mongoObjectFactory)
throws UnknownHostException, MongoException {
// mongo = new Mongo(hostname, port); // TODO clarify why this doesn't work with "localhost"/27017
mongo = new Mongo();
mongo = new Mongo(hostname, port);
db = mongo.getDB(dbName);
this.mongoObjectFactory = mongoObjectFactory;
}