From 0848de194e999ead965eaadcf3c1d1d8e492fe72 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Thu, 15 Jan 2026 14:31:39 -0500 Subject: [PATCH] MLE-26460 Fixing test failures Some test failures on Jenkins due to a test plumbing issue. --- .../com/marklogic/client/test/AbstractClientTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/marklogic-client-api/src/test/java/com/marklogic/client/test/AbstractClientTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/AbstractClientTest.java index 0f9c5af8a..2b454103c 100644 --- a/marklogic-client-api/src/test/java/com/marklogic/client/test/AbstractClientTest.java +++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/AbstractClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. + * Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved. */ package com.marklogic.client.test; @@ -20,9 +20,14 @@ protected final DatabaseClient getDatabaseClient() { @Override protected final String getJavascriptForDeletingDocumentsBeforeTestRuns() { + // The "/acme/" directory was previously deleted by AbstractOpticUpdateTest. It still needs to be deleted + // since some tests end up copying URIs to that directory but retain the 'test-data' collection. return """ declareUpdate(); - cts.uris('', [], cts.notQuery(cts.collectionQuery(['test-data', 'temporal-collection']))) + cts.uris('', [], cts.orQuery([ + cts.notQuery(cts.collectionQuery(['test-data', 'temporal-collection'])), + cts.directoryQuery('/acme/', 'infinity') + ])) .toArray().forEach(item => xdmp.documentDelete(item)) """; }