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

[reschke]

Author: reschke
Date: Tue Jan 14 15:17:48 2014
New Revision: 1558072

URL: http://svn.apache.org/r1558072
Log:
OAK-1321: re-enable MONGO_JDBC fixture, make sure fresh NodeStores are returned 
from fixture

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=1558072&r1=1558071&r2=1558072&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
 Tue Jan 14 15:17:48 2014
@@ -61,7 +61,7 @@ public abstract class AbstractRepository
                 {NodeStoreFixture.MONGO_MK},
                 {NodeStoreFixture.MONGO_NS},
                 {NodeStoreFixture.SEGMENT_MK},
-                // {NodeStoreFixture.MONGO_JDBC},
+                {NodeStoreFixture.MONGO_JDBC},
         };
         return Arrays.asList(fixtures);
     }

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=1558072&r1=1558071&r2=1558072&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
 Tue Jan 14 15:17:48 2014
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.jcr;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.UUID;
 
 import org.apache.jackrabbit.mk.core.MicroKernelImpl;
 import org.apache.jackrabbit.oak.plugins.mongomk.MongoMK;
@@ -116,14 +117,15 @@ public abstract class NodeStoreFixture {
     public static final NodeStoreFixture MONGO_JDBC = new NodeStoreFixture() {
         @Override
         public NodeStore createNodeStore() {
-            return new MongoMK.Builder().setMongoJDBC("jdbc:h2:mem:oaknodes", 
"sa", "").getNodeStore();
+            String id = UUID.randomUUID().toString();
+            return new MongoMK.Builder().setMongoJDBC("jdbc:h2:mem:" + id, 
"sa", "").getNodeStore();
         }
 
         @Override
         public NodeStore createNodeStore(int clusterNodeId) {
             try {
                 return new MongoMK.Builder()
-                                .setMongoJDBC("jdbc:h2:mem:oaknodes", "sa", 
"").getNodeStore();
+                                .setMongoJDBC("jdbc:h2:mem:oaknodes-" + 
clusterNodeId, "sa", "").getNodeStore();
             } catch (Exception e) {
                 return null;
             }