svn commit: r1738584 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java

[mreutegg]

Author: mreutegg
Date: Mon Apr 11 13:37:10 2016
New Revision: 1738584

URL: http://svn.apache.org/viewvc?rev=1738584&view=rev
Log:
OAK-3858: Review slow running tests

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=1738584&r1=1738583&r2=1738584&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
 Mon Apr 11 13:37:10 2016
@@ -34,7 +34,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
-import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 
 import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_NS;
@@ -46,7 +45,7 @@ public abstract class DocumentStoreFixtu
     private static final Logger LOG = 
LoggerFactory.getLogger(DocumentStoreFixture.class);
 
     public static final DocumentStoreFixture MEMORY = new MemoryFixture();
-    public static final DocumentStoreFixture MONGO = new 
MongoFixture("mongodb://localhost:27017/oak");
+    public static final DocumentStoreFixture MONGO = new MongoFixture();
 
     public static final DocumentStoreFixture RDB_DB2 = new 
RDBFixture("RDB-DB2", System.getProperty("rdb-db2-jdbc-url",
             "jdbc:db2://localhost:50000/OAK"), 
System.getProperty("rdb-db2-jdbc-user", "oak"), System.getProperty(
@@ -199,18 +198,9 @@ public abstract class DocumentStoreFixtu
     }
 
     public static class MongoFixture extends DocumentStoreFixture {
-        public static final String DEFAULT_URI = 
"mongodb://localhost:27017/oak-test";
-        private String uri;
+        private String uri = MongoUtils.URL;
         private List<MongoConnection> connections = Lists.newArrayList();
 
-        public MongoFixture() {
-            this(DEFAULT_URI);
-        }
-
-        public MongoFixture(String dbUri) {
-            this.uri = dbUri;
-        }
-
         @Override
         public String getName() {
             return "MongoDB";
@@ -231,17 +221,7 @@ public abstract class DocumentStoreFixtu
 
         @Override
         public boolean isAvailable() {
-            try {
-                MongoConnection connection = new MongoConnection(uri);
-                try {
-                    connection.getDB().command(new BasicDBObject("ping", 1));
-                } finally {
-                    connection.close();
-                }
-                return true;
-            } catch (Exception e) {
-                return false;
-            }
+            return MongoUtils.isAvailable();
         }
 
         @Override