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 th...@apache.org on 2014/04/09 10:32:54 UTC

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

Author: thomasm
Date: Wed Apr  9 08:32:54 2014
New Revision: 1585904

URL: http://svn.apache.org/r1585904
Log:
OAK-1690 OrderableNodesTest fails with Document_JDBC (disable MVCC, enable the test)

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

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=1585904&r1=1585903&r2=1585904&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 Wed Apr  9 08:32:54 2014
@@ -83,7 +83,7 @@ public abstract class NodeStoreFixture {
         @Override
         public NodeStore createNodeStore() {
             String id = UUID.randomUUID().toString();
-            DataSource ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:mem:" + id + ";MVCC=true", "sa", "");
+            DataSource ds = RDBDataSourceFactory.forJdbcUrl("jdbc:h2:mem:" + id, "sa", "");
             return new DocumentMK.Builder().setRDBConnection(ds).getNodeStore();
         }
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java?rev=1585904&r1=1585903&r2=1585904&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java Wed Apr  9 08:32:54 2014
@@ -35,8 +35,6 @@ public class OrderableNodesTest extends 
 
     public OrderableNodesTest(NodeStoreFixture fixture) {
         super(fixture);
-        // OAK-1690
-        assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC);
     }
 
     @Test