svn commit: r1707194 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeekerTest.java

[mr...@apache.org]

Author: mreutegg
Date: Wed Oct  7 07:40:37 2015
New Revision: 1707194

URL: http://svn.apache.org/viewvc?rev=1707194&view=rev
Log:
OAK-3405: Avoid instanceof check in LastRevRecoveryAgent

Use unambiguous assumeTrue() and perform null checks in after()

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

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeekerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeekerTest.java?rev=1707194&r1=1707193&r2=1707194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeekerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeekerTest.java Wed Oct  7 07:40:37 2015
@@ -27,7 +27,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeTrue;
 
 public class MongoMissingLastRevSeekerTest {
 
@@ -39,7 +39,7 @@ public class MongoMissingLastRevSeekerTe
     @Before
     public void before() throws Exception {
         c = MongoUtils.getConnection();
-        assumeNotNull(c);
+        assumeTrue(c != null);
         dbName = c.getDB().getName();
         builder = new DocumentMK.Builder().setMongoDB(c.getDB());
         ns = builder.getNodeStore();
@@ -47,8 +47,12 @@ public class MongoMissingLastRevSeekerTe
 
     @After
     public void after() throws Exception {
-        ns.dispose();
-        c.close();
+        if (ns != null) {
+            ns.dispose();
+        }
+        if (c != null) {
+            c.close();
+        }
         MongoUtils.dropDatabase(dbName);
     }