This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-2.2.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit c6c2ff24ca5da790bab4c046196277a49ef27f57 Author: Stefan Seifert <[email protected]> AuthorDate: Mon May 8 14:47:50 2017 +0000 SLING-6841 Sling Mocks should inject ResourceResolverFactory by default git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1794387 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/testing/mock/sling/context/SlingContextImpl.java | 6 ++++++ .../testing/mock/sling/context/AbstractSlingContextImplTest.java | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java index 0b47560..4eb5607 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java @@ -118,6 +118,12 @@ public class SlingContextImpl extends OsgiContextImpl { MockOsgi.setConfigForPid(bundleContext(), RESOURCERESOLVERFACTORYACTIVATOR_PID, this.resourceResolverFactoryActivatorProps); } + // automatically register resource resolver factory when ResourceResolverType != NONE, + // so the ResourceResolverFactory is available as OSGi service immediately + if (resourceResolverType != ResourceResolverType.NONE) { + resourceResolverFactory(); + } + registerDefaultServices(); } diff --git a/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java b/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java index 6299dfb..4c2d13b 100644 --- a/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java +++ b/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java @@ -48,6 +48,9 @@ public abstract class AbstractSlingContextImplTest { @Before public void setUp() throws Exception { + // make sure ResourceResolverFactory is available immediately and not lazily + assertEquals(1, context.getServices(ResourceResolverFactory.class, null).length); + context.addModelsForPackage("org.apache.sling.testing.mock.sling.context.models"); ContentLoader contentLoader = this.context.load(); @@ -138,10 +141,4 @@ public abstract class AbstractSlingContextImplTest { assertTrue(newRunModes.contains("mode2")); } - @Test - public void testResourceResolverFactory() { - ResourceResolverFactory[] factories = context.getServices(ResourceResolverFactory.class, null); - assertEquals(1, factories.length); - } - } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
