This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 0989a7ceb4b0b31e99b633bb59412c5ff3df56e1 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Jan 13 15:42:06 2015 +0000 Add a new test case git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1651385 13f79535-47bb-0310-9956-ffa450edef68 --- .../impl/MergedResourceProviderTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java index 9980c41..73b24cb 100644 --- a/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java +++ b/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java @@ -76,6 +76,9 @@ public class MergedResourceProviderTest { .resource(".4").p("a", "1").p("b", "2").p("c", "3") .resource(".Y") .resource(".Z") + .resource("/libs/a/Y/a") + .resource("/libs/a/Y/b") + .resource("/libs/a/Y/c") .commit(); this.provider = new CRUDMergingResourceProvider("/merged", new MergingResourcePicker()); @@ -120,6 +123,21 @@ public class MergedResourceProviderTest { assertTrue(names.contains("X")); } + @Test public void testListSubChildren() { + final Resource rsrcY = this.provider.getResource(this.resolver, "/merged/a/Y"); + assertNotNull(rsrcY); + final Iterator<Resource> i = this.provider.listChildren(rsrcY); + assertNotNull(i); + final List<String> names = new ArrayList<String>(); + while ( i.hasNext() ) { + names.add(i.next().getName()); + } + assertEquals(3, names.size()); + assertTrue(names.contains("a")); + assertTrue(names.contains("b")); + assertTrue(names.contains("c")); + } + @Test public void testProperties() { final Resource rsrcA1 = this.provider.getResource(this.resolver, "/merged/a/1"); final ValueMap vm = rsrcA1.adaptTo(ValueMap.class); -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.