Author: mreutegg
Date: Fri Oct 21 09:28:45 2016
New Revision: 1765972
URL: http://svn.apache.org/viewvc?rev=1765972&view=rev
Log:
OAK-4973: Speed up tests with MongoFixture
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1765972&r1=1765971&r2=1765972&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
Fri Oct 21 09:28:45 2016
@@ -198,7 +198,6 @@ public abstract class DocumentStoreFixtu
}
public static class MongoFixture extends DocumentStoreFixture {
- private String uri = MongoUtils.URL;
private List<MongoConnection> connections = Lists.newArrayList();
@Override
@@ -209,7 +208,7 @@ public abstract class DocumentStoreFixtu
@Override
public DocumentStore createDocumentStore(int clusterId) {
try {
- MongoConnection connection = new MongoConnection(uri);
+ MongoConnection connection = MongoUtils.getConnection();
connections.add(connection);
DB db = connection.getDB();
return new MongoDocumentStore(db, new
DocumentMK.Builder().setClusterId(clusterId));
@@ -226,12 +225,7 @@ public abstract class DocumentStoreFixtu
@Override
public void dispose() {
try {
- MongoConnection connection = new MongoConnection(uri);
- try {
- connection.getDB().dropDatabase();
- } finally {
- connection.close();
- }
+ MongoUtils.dropCollections(MongoUtils.DB);
} catch (Exception ignore) {
}
for (MongoConnection c : connections) {
