(jackrabbit-oak) branch issue/oak-10757 updated: OAK-10757: DocumentRdbFixture does not support the Feature Toggle FT_NOCOCLEANUP_OAK-10660

[baedke]

This is an automated email from the ASF dual-hosted git repository.

baedke pushed a commit to branch issue/oak-10757
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/issue/oak-10757 by this push:
     new 24be3ee8bf OAK-10757: DocumentRdbFixture does not support the Feature 
Toggle FT_NOCOCLEANUP_OAK-10660
24be3ee8bf is described below

commit 24be3ee8bf3f0afacd4627cb201e174d3a405847
Author: Manfred Baedke <manfred.bae...@gmail.com>
AuthorDate: Mon Apr 8 13:06:29 2024 +0200

    OAK-10757: DocumentRdbFixture does not support the Feature Toggle 
FT_NOCOCLEANUP_OAK-10660
    
    Fixed.
---
 .../org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java    | 12 ++++++------
 .../apache/jackrabbit/oak/fixture/DocumentRdbFixture.java    |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git 
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java 
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
index 4cf01ceaa0..dbd9f65f37 100644
--- 
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
+++ 
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java
@@ -118,9 +118,9 @@ public class OrderableNodesTest extends 
AbstractRepositoryTest {
 
     @Test
     public void orderableAddManyChildrenWithSave() throws Exception {
-        int childCount = 1000;
+        int childCount = 2000;
         StringBuilder prefix = new StringBuilder("");
-        for (int k = 0; k < 90; k++) {
+        for (int k = 0; k < 45; k++) {
             prefix.append("0123456789");
         }
         Session session = getAdminSession();
@@ -133,9 +133,9 @@ public class OrderableNodesTest extends 
AbstractRepositoryTest {
 
     @Test
     public void moveOrderableWithManyChildren() throws Exception {
-        int childCount = 1000;
+        int childCount = 2000;
         StringBuilder prefix = new StringBuilder("");
-        for (int k = 0; k < 90; k++) {
+        for (int k = 0; k < 45; k++) {
             prefix.append("0123456789");
         }
         Session session = getAdminSession();
@@ -154,9 +154,9 @@ public class OrderableNodesTest extends 
AbstractRepositoryTest {
 
     @Test
     public void copyOrderableWithManyChildren() throws Exception {
-        int childCount = 1000;
+        int childCount = 2000;
         StringBuilder prefix = new StringBuilder("");
-        for (int k = 0; k < 90; k++) {
+        for (int k = 0; k < 45; k++) {
             prefix.append("0123456789");
         }
         Session session = getAdminSession();
diff --git 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
index 6eefd5d20c..e3f00f4770 100644
--- 
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
+++ 
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
@@ -33,6 +33,8 @@ import 
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
 import 
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentNodeStoreBuilder;
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBOptions;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.toggle.Feature;
+import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
 
 public class DocumentRdbFixture extends NodeStoreFixture {
 
@@ -54,8 +56,11 @@ public class DocumentRdbFixture extends NodeStoreFixture {
         RDBOptions options = new 
RDBOptions().tablePrefix(prefix).dropTablesOnClose(true);
         this.jdbcUrl = pUrl.replace("{fname}", fname);
         DataSource ds = RDBDataSourceFactory.forJdbcUrl(jdbcUrl, pUser, 
pPasswd);
-
-        NodeStore result = new 
RDBDocumentNodeStoreBuilder().setPersistentCache("target/persistentCache,time")
+        //do not reuse the whiteboard
+        setWhiteboard(new DefaultWhiteboard());
+        RDBDocumentNodeStoreBuilder builder = new 
RDBDocumentNodeStoreBuilder();
+        
builder.setNoChildOrderCleanupFeature(Feature.newFeature("FT_NOCOCLEANUP_OAK-10660",
 getWhiteboard()));
+        NodeStore result = 
builder.setPersistentCache("target/persistentCache,time")
                 .setRDBConnection(ds, options).build();
         this.dataSources.put(result, ds);
         return result;