You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/10/28 18:13:20 UTC
svn commit: r1711069 - in
/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl:
MergedResourceProviderTest.java OverridingResourceProviderTest.java
Author: cziegeler
Date: Wed Oct 28 17:13:19 2015
New Revision: 1711069
URL: http://svn.apache.org/viewvc?rev=1711069&view=rev
Log:
SLING-5204 : Implement provider lifecycle methods
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
Modified: sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java?rev=1711069&r1=1711068&r2=1711069&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/MergedResourceProviderTest.java Wed Oct 28 17:13:19 2015
@@ -88,7 +88,7 @@ public class MergedResourceProviderTest
.commit();
this.provider = new CRUDMergingResourceProvider("/merged", new MergingResourcePicker(), false);
- this.ctx = new BasicResolveContext(resolver, null);
+ this.ctx = new BasicResolveContext(resolver, null, "/");
}
@Test public void testHideChildren() {
Modified: sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java?rev=1711069&r1=1711068&r2=1711069&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/test/java/org/apache/sling/resourcemerger/impl/OverridingResourceProviderTest.java Wed Oct 28 17:13:19 2015
@@ -101,7 +101,7 @@ public class OverridingResourceProviderT
.commit();
this.provider = new MergingResourceProvider("/override", new OverridingResourcePicker(), false, true);
- this.ctx = new BasicResolveContext(resolver, null);
+ this.ctx = new BasicResolveContext(resolver, null, "/");
}
@Test