This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.3.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git
commit 0dd8cf5a9feb596ad55db1c2b961135567fe4b56 Author: Konrad Windszus <[email protected]> AuthorDate: Fri Jun 16 13:55:02 2017 +0000 remove redundant test method git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1798928 13f79535-47bb-0310-9956-ffa450edef68 --- .../impl/CommonMergedResourceProviderTest.java | 18 ------------------ 1 file changed, 18 deletions(-) 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 0d20d74..c213d99 100644 --- a/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java +++ b/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java @@ -299,24 +299,6 @@ public class CommonMergedResourceProviderTest { Assert.assertThat(iterable, Matchers.contains(ResourceMatchers.name("child1"),ResourceMatchers.name("child4"), ResourceMatchers.name("child2"), ResourceMatchers.name("child3"))); - - } - - @Test - public void testOrderOfPartiallyOverwrittenChildren() throws PersistenceException { - // create new child nodes below base and overlay - MockHelper.create(this.resolver) - .resource("/apps/base/child1") - .resource("/apps/base/child2") - .resource("/apps/base/child3") - .resource("/apps/overlay/child2") - .commit(); - - Resource mergedResource = this.provider.getResource(ctx, "/merged", ResourceContext.EMPTY_CONTEXT, null); - // convert the iterator returned by list children into an iterable (to be able to perform some tests) - IteratorIterable<Resource> iterable = new IteratorIterable<Resource>(provider.listChildren(ctx, mergedResource), true); - - Assert.assertThat(iterable, Matchers.contains(ResourceMatchers.name("child1"),ResourceMatchers.name("child2"), ResourceMatchers.name("child3"))); } @Test -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
