Author: kwin
Date: Fri Jun 16 13:55:02 2017
New Revision: 1798928
URL: http://svn.apache.org/viewvc?rev=1798928&view=rev
Log:
remove redundant test method
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java?rev=1798928&r1=1798927&r2=1798928&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/CommonMergedResourceProviderTest.java
Fri Jun 16 13:55:02 2017
@@ -299,24 +299,6 @@ public class CommonMergedResourceProvide
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
