OAK-10757: DocumentRdbFixture does not support the Feature Toggle FT_… (#1407)
* OAK-10757: DocumentRdbFixture does not support the Feature Toggle FT_NOCOCLEANUP_OAK-10660
Fixed.
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 4cf01ce..72cb3a8 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,10 @@
@Test
public void orderableAddManyChildrenWithSave() throws Exception {
- int childCount = 1000;
+ int childCount = 2000;
StringBuilder prefix = new StringBuilder("");
- for (int k = 0; k < 90; k++) {
+ //keep name length below 512, since that is the maximum supported by RDBDocumentStore
+ for (int k = 0; k < 45; k++) {
prefix.append("0123456789");
}
Session session = getAdminSession();
@@ -133,9 +134,10 @@
@Test
public void moveOrderableWithManyChildren() throws Exception {
- int childCount = 1000;
+ int childCount = 2000;
StringBuilder prefix = new StringBuilder("");
- for (int k = 0; k < 90; k++) {
+ //keep name length below 512, since that is the maximum supported by RDBDocumentStore
+ for (int k = 0; k < 45; k++) {
prefix.append("0123456789");
}
Session session = getAdminSession();
@@ -154,9 +156,10 @@
@Test
public void copyOrderableWithManyChildren() throws Exception {
- int childCount = 1000;
+ int childCount = 2000;
StringBuilder prefix = new StringBuilder("");
- for (int k = 0; k < 90; k++) {
+ //keep name length below 512, since that is the maximum supported by RDBDocumentStore
+ 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 6eefd5d..e3f00f4 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.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 @@
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;
