svn commit: r1817782 - in /jackrabbit/oak/trunk: oak-parent/pom.xml oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java

[mreutegg]

Author: mreutegg
Date: Mon Dec 11 14:41:57 2017
New Revision: 1817782

URL: http://svn.apache.org/viewvc?rev=1817782&view=rev
Log:
OAK-7047: Enable DocumentNodeStoreServiceTest.preset()

Modified:
    jackrabbit/oak/trunk/oak-parent/pom.xml
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java

Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1817782&r1=1817781&r2=1817782&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Mon Dec 11 14:41:57 2017
@@ -581,7 +581,7 @@
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-        <version>2.2.4</version>
+        <version>2.3.6</version>
         <scope>test</scope>
       </dependency>
       <dependency>

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java?rev=1817782&r1=1817781&r2=1817782&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java
 Mon Dec 11 14:41:57 2017
@@ -34,7 +34,6 @@ import org.apache.sling.testing.mock.osg
 import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -201,7 +200,6 @@ public class DocumentNodeStoreServiceTes
         assertFalse(dns.getNodeCachePredicate().apply("/x"));
     }
 
-    @Ignore("SLING-7233")
     @Test
     public void preset() throws Exception {
         MockOsgi.setConfigForPid(context.bundleContext(),
@@ -214,6 +212,7 @@ public class DocumentNodeStoreServiceTes
 
         DocumentNodeStore store = context.getService(DocumentNodeStore.class);
         MongoDocumentStore mds = getMongoDocumentStore(store);
+        assertNotNull(mds);
         DB db = MongoDocumentStoreTestHelper.getDB(mds);
         assertTrue(db.getMongo().getMongoOptions().isSocketKeepAlive());
     }