Author: sseifert Date: Tue Sep 6 20:24:55 2016 New Revision: 1759502 URL: http://svn.apache.org/viewvc?rev=1759502&view=rev Log: SLING-6039 adapt integration test to latest ResourceBuilder API This closes #166
Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java?rev=1759502&r1=1759501&r2=1759502&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/AdaptToConfigClassIT.java Tue Sep 6 20:24:55 2016 @@ -27,6 +27,7 @@ import org.apache.sling.contextaware.con import org.apache.sling.contextaware.config.it.example.SimpleConfig; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; +import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -44,7 +45,7 @@ public class AdaptToConfigClassIT { @Before public void setUp() throws Exception { resourceResolver = teleporter.getService(ResourceResolverFactory.class).getAdministrativeResourceResolver(null); - resourceBuilder = teleporter.getService(ResourceBuilder.class).forResolver(resourceResolver); + resourceBuilder = teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver); } @After Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java?rev=1759502&r1=1759501&r2=1759502&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverConfigClassIT.java Tue Sep 6 20:24:55 2016 @@ -27,6 +27,7 @@ import org.apache.sling.contextaware.con import org.apache.sling.contextaware.config.it.example.SimpleConfig; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; +import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -44,7 +45,7 @@ public class ConfigurationResolverConfig @Before public void setUp() throws Exception { resourceResolver = teleporter.getService(ResourceResolverFactory.class).getAdministrativeResourceResolver(null); - resourceBuilder = teleporter.getService(ResourceBuilder.class).forResolver(resourceResolver); + resourceBuilder = teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver); } @After Modified: sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java?rev=1759502&r1=1759501&r2=1759502&view=diff ============================================================================== --- sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java (original) +++ sling/trunk/contrib/extensions/contextaware-config/integration-tests/src/test/java/org/apache/sling/contextaware/config/it/ConfigurationResolverValueMapIT.java Tue Sep 6 20:24:55 2016 @@ -27,6 +27,7 @@ import org.apache.sling.api.resource.Val import org.apache.sling.contextaware.config.ConfigurationResolver; import org.apache.sling.junit.rules.TeleporterRule; import org.apache.sling.resourcebuilder.api.ResourceBuilder; +import org.apache.sling.resourcebuilder.api.ResourceBuilderFactory; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -44,7 +45,7 @@ public class ConfigurationResolverValueM @Before public void setUp() throws Exception { resourceResolver = teleporter.getService(ResourceResolverFactory.class).getAdministrativeResourceResolver(null); - resourceBuilder = teleporter.getService(ResourceBuilder.class).forResolver(resourceResolver); + resourceBuilder = teleporter.getService(ResourceBuilderFactory.class).forResolver(resourceResolver); } @After