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-1.6.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit 47f0035c5885311d9ea79598c00d319dafcbdb60 Author: Stefan Seifert <[email protected]> AuthorDate: Sat Oct 3 00:36:11 2015 +0000 SLING-5088 avoid registering ResourceResolverFactory twice git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1706513 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/testing/mock/sling/MockSling.java | 3 +++ .../apache/sling/testing/mock/sling/context/SlingContextImpl.java | 3 --- .../testing/mock/sling/context/AbstractSlingContextImplTest.java | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java b/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java index 5e76000..843f9e8 100644 --- a/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java +++ b/src/main/java/org/apache/sling/testing/mock/sling/MockSling.java @@ -87,6 +87,9 @@ public final class MockSling { SlingRepository repository = adapter.newSlingRepository(); factory = ResourceResolverFactoryInitializer.setUp(repository, bundleContext, type.getNodeTypeMode()); } + else { + bundleContext.registerService(ResourceResolverFactory.class.getName(), factory, null); + } return factory; } 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 bc6f808..c1be12f 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 @@ -112,9 +112,6 @@ public class SlingContextImpl extends OsgiContextImpl { */ protected void registerDefaultServices() { - // resource resolver factory - registerService(ResourceResolverFactory.class, this.resourceResolverFactory); - // adapter factories registerInjectActivateService(new ModelAdapterFactory()); 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 391cce6..b32dc1d 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 @@ -147,14 +147,6 @@ public abstract class AbstractSlingContextImplTest { assertNotNull(factory); } - @Test - public void testWithoutResourceResolverType() { - SlingContextImpl contextTest = new SlingContextImpl(); - contextTest.setUp(); - ResourceResolverFactory factory = contextTest.getService(ResourceResolverFactory.class); - assertNotNull(factory); - } - @Model(adaptables = SlingHttpServletRequest.class) public interface RequestAttributeModel { @Inject -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
