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 ch...@apache.org on 2014/06/03 14:15:33 UTC

svn commit: r1599503 - /jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy

Author: chetanm
Date: Tue Jun  3 12:15:32 2014
New Revision: 1599503

URL: http://svn.apache.org/r1599503
Log:
OAK-1708 - extend DocumentNodeStoreService to support RDBPersistence

Fixing issue when Mongo is not there as pointed by Julian

Modified:
    jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy

Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy?rev=1599503&r1=1599502&r2=1599503&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/DocumentNodeStoreConfigTest.groovy Tue Jun  3 12:15:32 2014
@@ -33,7 +33,7 @@ import javax.sql.DataSource
 import java.sql.Connection
 import java.sql.ResultSet
 
-import static org.junit.Assume.assumeNotNull
+import static org.junit.Assume.assumeTrue
 
 class DocumentNodeStoreConfigTest extends AbstractRepositoryFactoryTest {
     private PojoServiceRegistry registry
@@ -126,7 +126,7 @@ class DocumentNodeStoreConfigTest extend
 
     @Test
     public void testMongoDocumentStore_CustomBlobStore() throws Exception {
-        assumeNotNull(mongoConn)
+        mongoCheck()
 
         registry = repositoryFactory.initializeServiceRegistry(config)
         createConfig([
@@ -148,7 +148,7 @@ class DocumentNodeStoreConfigTest extend
 
     @Test
     public void testMongoDocumentStore() throws Exception {
-        assumeNotNull(mongoConn)
+        mongoCheck()
 
         registry = repositoryFactory.initializeServiceRegistry(config)
         createConfig([
@@ -176,6 +176,12 @@ class DocumentNodeStoreConfigTest extend
         }
     }
 
+    private mongoCheck() {
+        //Somehow in Groovy assumeNotNull cause issue as Groovy probably
+        //does away with null array causing a NPE
+        assumeTrue(mongoConn != null)
+    }
+
     private Collection<String> getCollectionNames() {
         return mongoConn.DB.getCollectionNames().collect { it.toUpperCase() }
     }