This is an automated email from the ASF dual-hosted git repository.
baedke pushed a commit to branch issue/oak-10756
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/issue/oak-10756 by this push:
new b96b617092 OAK-10756:
OrderableNodesTest.childOrderCleanupFeatureToggleTest fails with
-Dnsfixtures=DOCUMENT_NS
b96b617092 is described below
commit b96b617092926de81c88d9840059a3cee0dd66a6
Author: Manfred Baedke <manfred.bae...@gmail.com>
AuthorDate: Sun Apr 7 18:53:39 2024 +0200
OAK-10756: OrderableNodesTest.childOrderCleanupFeatureToggleTest fails with
-Dnsfixtures=DOCUMENT_NS
Fixed test classes to not reuse an existing whiteboard with a newly created
NodeStore.
---
.../test/java/org/apache/jackrabbit/oak/jcr/OrderableNodesTest.java | 6 ++++--
.../org/apache/jackrabbit/oak/fixture/DocumentMemoryFixture.java | 3 +++
.../org/apache/jackrabbit/oak/fixture/DocumentMongoFixture.java | 3 +++
.../java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java | 6 +++++-
4 files changed, 15 insertions(+), 3 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 2e9c17ec89..4cf01ceaa0 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
@@ -175,9 +175,11 @@ public class OrderableNodesTest extends
AbstractRepositoryTest {
@Test
public void childOrderCleanupFeatureToggleTest() throws
RepositoryException {
- Tracker<FeatureToggle> track =
fixture.getWhiteboard().track(FeatureToggle.class);
- NodeStore nodeStore = createNodeStore(fixture);
+ //init repository
+ getAdminSession();
+ NodeStore nodeStore = getNodeStore();
assertNotNull(nodeStore);
+ Tracker<FeatureToggle> track =
fixture.getWhiteboard().track(FeatureToggle.class);
if (nodeStore instanceof DocumentNodeStore) {
DocumentNodeStore documentNodeStore = (DocumentNodeStore)
nodeStore;
assertTrue(documentNodeStore.isChildOrderCleanupEnabled());
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMemoryFixture.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMemoryFixture.java
index 1b534b13b9..2d0fac5d25 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMemoryFixture.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMemoryFixture.java
@@ -23,12 +23,15 @@ import
org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
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 DocumentMemoryFixture extends NodeStoreFixture {
@Override
public NodeStore createNodeStore() {
DocumentMK.Builder builder = new DocumentMK.Builder();
+ //do not reuse the whiteboard
+ setWhiteboard(new DefaultWhiteboard());
builder.setNoChildOrderCleanupFeature(Feature.newFeature("FT_NOCOCLEANUP_OAK-10660",
getWhiteboard()));
return builder.getNodeStore();
}
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMongoFixture.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMongoFixture.java
index 1f66cc4113..e87f76ffb0 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMongoFixture.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentMongoFixture.java
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.toggle.Feature;
+import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
import org.junit.AssumptionViolatedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,6 +71,8 @@ public class DocumentMongoFixture extends NodeStoreFixture {
}
builder.setPersistentCache("target/persistentCache,time");
builder.setMongoDB(createClient(), getDBName(suffix));
+ //do not reuse the whiteboard
+ setWhiteboard(new DefaultWhiteboard());
builder.setNoChildOrderCleanupFeature(Feature.newFeature("FT_NOCOCLEANUP_OAK-10660",
getWhiteboard()));
DocumentNodeStore ns = builder.getNodeStore();
suffixes.put(ns, suffix);
diff --git
a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java
b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java
index edc2784520..73852b263f 100644
---
a/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java
+++
b/oak-store-spi/src/test/java/org/apache/jackrabbit/oak/fixture/NodeStoreFixture.java
@@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
*/
public abstract class NodeStoreFixture {
- private final Whiteboard whiteboard = new DefaultWhiteboard();
+ private Whiteboard whiteboard = new DefaultWhiteboard();
/**
* Creates a new empty {@link NodeStore} instance. An implementation must
@@ -60,4 +60,8 @@ public abstract class NodeStoreFixture {
return whiteboard;
}
+ public void setWhiteboard(Whiteboard whiteboard) {
+ this.whiteboard = whiteboard;
+ }
+
}
\ No newline at end of file
