You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/09/30 17:53:50 UTC

svn commit: r1706059 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo: JournalIT.java ReadPreferenceIT.java

Author: reschke
Date: Wed Sep 30 15:53:49 2015
New Revision: 1706059

URL: http://svn.apache.org/viewvc?rev=1706059&view=rev
Log:
OAK-3449: improve robustness of integration tests

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java?rev=1706059&r1=1706058&r2=1706059&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/JournalIT.java Wed Sep 30 15:53:49 2015
@@ -52,9 +52,9 @@ public class JournalIT extends AbstractJ
         Assume.assumeNotNull(MongoUtils.getConnection());
     }
 
-    @Before
-    @After
-    public void dropCollections() throws Exception {
+    @Override
+    public void clear() {
+        super.clear();
         MongoConnection mongoConnection = MongoUtils.getConnection();
         MongoUtils.dropCollections(mongoConnection.getDB());
         mongoConnection.close();

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java?rev=1706059&r1=1706058&r2=1706059&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ReadPreferenceIT.java Wed Sep 30 15:53:49 2015
@@ -78,7 +78,9 @@ public class ReadPreferenceIT {
 
     @After
     public void clearDB() {
-        MongoUtils.dropCollections(mongoDS.getDBCollection(NODES).getDB());
+        if (mongoDS != null) {
+            MongoUtils.dropCollections(mongoDS.getDBCollection(NODES).getDB());
+        }
     }
 
     @Test