You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by he...@apache.org on 2024/07/25 08:07:42 UTC
(sling-org-apache-sling-resourcemerger) 01/01: SLING-12391 Failing test for negation hiding local resources as well
This is an automated email from the ASF dual-hosted git repository.
henrykuijpers pushed a commit to branch SLING-12391-resource-merger-with-negation-hides-local-resources-as-well
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 1d7e2ed0d41b69b06741a6c12384fc3a0928ca48
Author: KUIJPERS, Henry <He...@acolad.com>
AuthorDate: Thu Jul 25 10:04:03 2024 +0200
SLING-12391 Failing test for negation hiding local resources as well
---
.../impl/CommonMergedResourceProviderTest.java | 24 ++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
index bf4266e..0bc1735 100644
--- a/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
+++ b/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
@@ -513,4 +513,28 @@ public class CommonMergedResourceProviderTest {
)
);
}
+
+ @Test
+ public void x() throws PersistenceException {
+ MockHelper.create(this.resolver)
+ // Set up the base structure, including a tab that is not desired in the overlaid situation
+ .resource("/apps/base/test")
+ .resource("/apps/base/test/tabs")
+ .resource("/apps/base/test/tabs/basic")
+ .resource("/apps/base/test/tabs/advanced")
+ .resource("/apps/overlay/test")
+ .resource("/apps/overlay/test/tabs")
+ .p(MergedResourceConstants.PN_HIDE_CHILDREN, new String[]{"!advanced", "*"})
+ .resource("/apps/overlay/test/tabs/expert")
+ .commit();
+
+ // Ensure that the undesired tab is not found
+ final Resource tabsResource = this.provider.getResource(ctx, "/merged/test/tabs", ResourceContext.EMPTY_CONTEXT, null);
+ Assert.assertNotNull(tabsResource);
+ final IteratorIterable<Resource> tabs = new IteratorIterable<Resource>(this.provider.listChildren(ctx, tabsResource), true);
+ Assert.assertThat(tabs, Matchers.contains(
+ ResourceMatchers.name("advanced"),
+ ResourceMatchers.name("expert")
+ ));
+ }
}