svn commit: r1650324 - in /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr: AbstractRepositoryTest.java NodeStoreFixture.java

[re...@apache.org]

Author: reschke
Date: Thu Jan  8 16:27:02 2015
New Revision: 1650324

URL: http://svn.apache.org/r1650324
Log:
OAK-2379 - switch DOCUMENT_RDB back to file persistence (rather than in-memory)

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1650324&r1=1650323&r2=1650324&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Thu Jan  8 16:27:02 2015
@@ -16,9 +16,6 @@
  */
 package org.apache.jackrabbit.oak.jcr;
 
-import static org.apache.jackrabbit.oak.commons.CIHelper.buildBotTrunkLinux;
-import static org.junit.Assume.assumeTrue;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Set;
@@ -91,8 +88,6 @@ public abstract class AbstractRepository
 
     @Before
     public void checkAssumptions() {
-        // FIXME OAK-2379. Don't run the tests for now on the Linux BuildBot for DOCUMENT_RDB
-        assumeTrue(!buildBotTrunkLinux() || fixture != NodeStoreFixture.DOCUMENT_RDB);
     }
 
     @After

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java?rev=1650324&r1=1650323&r2=1650324&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java Thu Jan  8 16:27:02 2015
@@ -19,12 +19,14 @@
 package org.apache.jackrabbit.oak.jcr;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
 import java.util.UUID;
 
 import javax.sql.DataSource;
 
 import com.mongodb.DB;
+
 import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
@@ -74,18 +76,19 @@ public abstract class NodeStoreFixture {
     public static final NodeStoreFixture DOCUMENT_RDB = new NodeStoreFixture() {
 
         private DataSource ds;
+        String folder = (new File("target")).isDirectory() ? "target/" : "";
 
         @Override
         public NodeStore createNodeStore() {
             String id = UUID.randomUUID().toString();
-            this.ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:mem:" + id, "sa", "");
+            this.ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:file:" + folder + id, "sa", "");
             return new DocumentMK.Builder().setRDBConnection(this.ds).getNodeStore();
         }
 
         @Override
         public NodeStore createNodeStore(int clusterNodeId) {
             try {
-                this.ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:mem:oaknodes-" + clusterNodeId, "sa", "");
+                this.ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:file:" + folder + "oaknodes-" + clusterNodeId, "sa", "");
                 return new DocumentMK.Builder().setRDBConnection(this.ds).getNodeStore();
             } catch (Exception e) {
                 return null;