You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:26:04 UTC
[sling-org-apache-sling-testing-sling-mock] 05/07: SLING-6077
sling-mock: ResourceResolverFactory is registered twice
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.1.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
commit df1f8db3483e1135368a5c30b6ba7bf8a8d42e13
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Sep 29 16:22:57 2016 +0000
SLING-6077 sling-mock: ResourceResolverFactory is registered twice
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1762809 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
.../mock/sling/ResourceResolverFactoryInitializer.java | 14 +++++++-------
.../mock/sling/context/AbstractSlingContextImplTest.java | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index e77714d..4d227bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.4.4</version>
+ <version>1.4.8</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.7.0</version>
+ <version>2.7.4</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java b/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
index eae5323..8b3d3d1 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
@@ -64,7 +64,7 @@ class ResourceResolverFactoryInitializer {
// register JCR node types found in classpath
registerJcrNodeTypes(slingRepository, nodeTypeMode);
- // initialize JCR resource provider factory
+ // initialize JCR resource provider
ensureJcrResourceProviderDependencies(bundleContext);
initializeJcrResourceProvider(bundleContext);
}
@@ -81,7 +81,7 @@ class ResourceResolverFactoryInitializer {
}
/**
- * Ensure dependencies for JcrResourceProviderFactory are present.
+ * Ensure dependencies for JcrResourceProvider are present.
* @param bundleContext Bundle context
*/
private static void ensureJcrResourceProviderDependencies(BundleContext bundleContext) {
@@ -92,15 +92,15 @@ class ResourceResolverFactoryInitializer {
}
/**
- * Initialize JCR resource provider factory.
+ * Initialize JCR resource provider.
* @param bundleContext Bundle context
*/
private static void initializeJcrResourceProvider(BundleContext bundleContext) {
Dictionary<String, Object> config = new Hashtable<String, Object>();
- JcrResourceProvider factory = new JcrResourceProvider();
- MockOsgi.injectServices(factory, bundleContext);
- MockOsgi.activate(factory, bundleContext, config);
- bundleContext.registerService(ResourceProvider.class, factory, config);
+ JcrResourceProvider provider = new JcrResourceProvider();
+ MockOsgi.injectServices(provider, bundleContext);
+ MockOsgi.activate(provider, bundleContext, config);
+ bundleContext.registerService(ResourceProvider.class, provider, config);
}
/**
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 b32dc1d..a921e10 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
@@ -143,8 +143,8 @@ public abstract class AbstractSlingContextImplTest {
@Test
public void testResourceResolverFactory() {
- ResourceResolverFactory factory = context.getService(ResourceResolverFactory.class);
- assertNotNull(factory);
+ ResourceResolverFactory[] factories = context.getServices(ResourceResolverFactory.class, null);
+ assertEquals(1, factories.length);
}
@Model(adaptables = SlingHttpServletRequest.class)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.