Author: ieb
Date: Mon Feb 11 00:05:24 2013
New Revision: 1444632
URL: http://svn.apache.org/r1444632
Log:
SLING-2725 mock based coverage for the activator and very basic resource
resolver usage. coverage now at 57%, more to come.
Added:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
(with props)
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java?rev=1444632&r1=1444631&r2=1444632&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
Mon Feb 11 00:05:24 2013
@@ -157,7 +157,7 @@ public class ResourceResolverFactoryActi
/** Event admin. */
@Reference
- private EventAdmin eventAdmin;
+ EventAdmin eventAdmin;
/** ComponentContext */
private volatile ComponentContext componentContext;
Added:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java?rev=1444632&view=auto
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
(added)
+++
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
Mon Feb 11 00:05:24 2013
@@ -0,0 +1,235 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The SF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.sling.resourceresolver.impl;
+
+import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceMetadata;
+import org.apache.sling.api.resource.ResourceProvider;
+import org.apache.sling.api.resource.ResourceProviderFactory;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.event.EventAdmin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This tests the ResourceResolver using mocks. The Unit test is in addition to
+ * ResourceResolverImplTest which covers API conformance more than it covers
all
+ * code paths.
+ */
+public class MockedResourceResolverImplTest {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(MockedResourceResolverImplTest.class);
+
+ private ResourceResolverFactoryActivator activator;
+
+ @Mock
+ private ComponentContext componentContext;
+
+ @Mock
+ private EventAdmin eventAdmin;
+
+ @Mock
+ private BundleContext bundleContext;
+
+ private Map<String, Object> services = new HashMap<String, Object>();
+
+ private Map<String, Object> serviceProperties = new HashMap<String,
Object>();
+
+ private ResourceResolverFactoryImpl resourceResolverFactory;
+
+ @Mock
+ private ResourceProvider resourceProvider;
+
+ @Mock
+ private ResourceProviderFactory resourceProviderFactory;
+
+ /**
+ * the factory creates these.
+ */
+ @Mock
+ private ResourceProvider factoryResourceProvider;
+
+ @Mock
+ private ResourceProvider factoryAdministrativeResourceProvider;
+
+ public MockedResourceResolverImplTest() {
+ MockitoAnnotations.initMocks(this);
+ }
+
+ @Before
+ public void before() throws LoginException {
+ activator = new ResourceResolverFactoryActivator();
+ Dictionary<String, Object> properties = new Hashtable<String,
Object>();
+ properties.put("resource.resolver.virtual", new String[] { "/:/" });
+ properties.put("resource.resolver.mapping", new String[] { "/:/",
+ "/content/:/", "/system/docroot/:/" });
+ properties.put("resource.resolver.allowDirect", true);
+ properties.put("resource.resolver.searchpath", new String[] { "/apps",
+ "/libs" });
+ properties.put("resource.resolver.manglenamespaces", true);
+ properties.put("resource.resolver.map.location", "/etc/map");
+ properties.put("resource.resolver.default.vanity.redirect.status",
302);
+ properties.put(
+ "resource.resolver.required.providers",
+ new String[] {
"org.apache.sling.resourceresolver.impl.DummyTestProvider" });
+ properties.put(Constants.SERVICE_VENDOR, "Apache");
+ properties.put(Constants.SERVICE_DESCRIPTION, "Testing");
+
+ Mockito.when(componentContext.getProperties()).thenReturn(properties);
+ Mockito.when(componentContext.getBundleContext()).thenReturn(
+ bundleContext);
+ activator.eventAdmin = eventAdmin;
+
+ // bind a ResourceProvider to satidy the pre-requirements
+ Map<String, Object> resourceProviderProperties = new HashMap<String,
Object>();
+ resourceProviderProperties.put(Constants.SERVICE_PID,
+ "org.apache.sling.resourceresolver.impl.DummyTestProvider");
+ resourceProviderProperties.put(Constants.SERVICE_ID, 10L);
+ resourceProviderProperties.put(Constants.SERVICE_VENDOR, "Apache");
+ resourceProviderProperties.put(Constants.SERVICE_DESCRIPTION,
+ "Dummy Provider");
+ resourceProviderProperties.put(ResourceProvider.ROOTS,
+ new String[] { "/single" });
+
+ activator.bindResourceProvider(resourceProvider,
+ resourceProviderProperties);
+
+ // bind a ResourceProviderFactory to satidy the pre-requirements
+ Map<String, Object> resourceProviderFactoryProperties = new
HashMap<String, Object>();
+ resourceProviderFactoryProperties.put(Constants.SERVICE_PID,
+ "org.apache.sling.resourceresolver.impl.DummyTestProviderFactory");
+ resourceProviderFactoryProperties.put(Constants.SERVICE_ID, 11L);
+ resourceProviderFactoryProperties.put(Constants.SERVICE_VENDOR,
+ "Apache");
+ resourceProviderFactoryProperties.put(Constants.SERVICE_DESCRIPTION,
+ "Dummy Provider Factor");
+ resourceProviderFactoryProperties.put(ResourceProvider.ROOTS,
+ new String[] { "/factory" });
+
+
Mockito.when(resourceProviderFactory.getResourceProvider(null)).thenReturn(
+ factoryResourceProvider);
+ Mockito.when(
+
resourceProviderFactory.getResourceProvider(Mockito.anyMap())).thenReturn(
+ factoryResourceProvider);
+ Mockito.when(
+
resourceProviderFactory.getAdministrativeResourceProvider(null)).thenReturn(
+ factoryAdministrativeResourceProvider);
+ Mockito.when(
+
resourceProviderFactory.getAdministrativeResourceProvider(Mockito.anyMap())).thenReturn(
+ factoryAdministrativeResourceProvider);
+ activator.bindResourceProviderFactory(resourceProviderFactory,
+ resourceProviderFactoryProperties);
+
+ // activate the components.
+ activator.activate(componentContext);
+
+ // extract any services that were registered into a map.
+ ArgumentCaptor<String> classesCaptor =
ArgumentCaptor.forClass(String.class);
+ ArgumentCaptor<Object> serviceCaptor =
ArgumentCaptor.forClass(Object.class);
+ ArgumentCaptor<Dictionary> propertiesCaptor =
ArgumentCaptor.forClass(Dictionary.class);
+ Mockito.verify(bundleContext, Mockito.atLeastOnce()).registerService(
+ classesCaptor.capture(), serviceCaptor.capture(),
+ propertiesCaptor.capture());
+
+ int si = 0;
+ List<Object> serviceList = serviceCaptor.getAllValues();
+ List<Dictionary> servicePropertiesList =
propertiesCaptor.getAllValues();
+ for (String serviceName : classesCaptor.getAllValues()) {
+ services.put(serviceName, serviceList.get(si));
+ serviceProperties.put(serviceName, serviceProperties.get(si));
+ si++;
+ }
+ // verify that a ResourceResolverFactoryImpl was created and
registered.
+
Assert.assertNotNull(services.get(ResourceResolverFactory.class.getName()));
+ ResourceResolverFactory rrf = (ResourceResolverFactory)
services.get(ResourceResolverFactory.class.getName());
+ Assert.assertTrue(rrf instanceof ResourceResolverFactoryImpl);
+ resourceResolverFactory = (ResourceResolverFactoryImpl) rrf;
+ }
+
+ @After
+ public void after() {
+
+ }
+
+ @Test
+ public void testGetResolver() throws LoginException {
+ ResourceResolver resourceResolver =
resourceResolverFactory.getResourceResolver(null);
+ Assert.assertNotNull(resourceResolver);
+ Map<String, Object> authenticationInfo = new HashMap<String, Object>();
+ resourceResolver =
resourceResolverFactory.getAdministrativeResourceResolver(authenticationInfo);
+ Assert.assertNotNull(resourceResolver);
+ }
+
+ @Test
+ public void testGetAuthenticatedResolve() throws LoginException {
+ ResourceResolver resourceResolver =
resourceResolverFactory.getAdministrativeResourceResolver(null);
+ Assert.assertNotNull(resourceResolver);
+ Map<String, Object> authenticationInfo = new HashMap<String, Object>();
+
+ resourceResolver =
resourceResolverFactory.getAdministrativeResourceResolver(authenticationInfo);
+ Assert.assertNotNull(resourceResolver);
+ }
+
+ @Test
+ public void testGetResource() throws LoginException {
+ ResourceResolver resourceResolver =
resourceResolverFactory.getResourceResolver(null);
+ Assert.assertNotNull(resourceResolver);
+ Resource singleResource = Mockito.mock(Resource.class);
+ ResourceMetadata singleResourceMetadata = new ResourceMetadata();
+
Mockito.when(singleResource.getResourceMetadata()).thenReturn(singleResourceMetadata);
+ Mockito.when(
+ resourceProvider.getResource(Mockito.any(ResourceResolver.class),
+ Mockito.eq("/single/test"))).thenReturn(singleResource);
+ Resource resource = resourceResolver.getResource("/single/test");
+ Assert.assertEquals(singleResource, resource);
+ }
+ @Test
+ public void testGetFactoryResource() throws LoginException {
+ ResourceResolver resourceResolver =
resourceResolverFactory.getResourceResolver(null);
+ Assert.assertNotNull(resourceResolver);
+ Resource factoryResource = Mockito.mock(Resource.class);
+ ResourceMetadata factoryResourceMetadata = new ResourceMetadata();
+ Mockito.when(
+ factoryResourceProvider.getResource(
+ Mockito.any(ResourceResolver.class),
+ Mockito.eq("/factory/test"))).thenReturn(factoryResource);
+
Mockito.when(factoryResource.getResourceMetadata()).thenReturn(factoryResourceMetadata);
+ Resource resource = resourceResolver.getResource("/factory/test");
+ Assert.assertEquals(factoryResource,resource);
+
+ }
+}
Propchange:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
