You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/10/02 21:58:44 UTC
svn commit: r1706483 - in
/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling:
./ context/ junit/ loader/ resource/ rrmock/loader/ servlet/
Author: sseifert
Date: Fri Oct 2 19:58:44 2015
New Revision: 1706483
URL: http://svn.apache.org/viewvc?rev=1706483&view=rev
Log:
SLING-5088 refactor unit test to make sure resource resolver and bundle contexts are properly shutdown
Modified:
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingRepositoryTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingRepositoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingRepositoryTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingRepositoryTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingRepositoryTest.java Fri Oct 2 19:58:44 2015
@@ -21,6 +21,7 @@ package org.apache.sling.testing.mock.sl
import static org.junit.Assert.assertNotNull;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.testing.mock.jcr.MockJcr;
@@ -38,9 +39,17 @@ public class MockSlingRepositoryTest {
@SuppressWarnings("deprecation")
@Test
- public void testLogin() throws RepositoryException {
- assertNotNull(this.repository.loginAdministrative(MockJcr.DEFAULT_WORKSPACE));
- assertNotNull(this.repository.loginService("test", MockJcr.DEFAULT_WORKSPACE));
+ public void testLoginAdministrative() throws RepositoryException {
+ Session session = this.repository.loginAdministrative(MockJcr.DEFAULT_WORKSPACE);
+ assertNotNull(session);
+ session.logout();
+ }
+
+ @Test
+ public void testLoginService() throws RepositoryException {
+ Session session = this.repository.loginService("test", MockJcr.DEFAULT_WORKSPACE);
+ assertNotNull(session);
+ session.logout();
}
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/MockSlingScriptHelperTest.java Fri Oct 2 19:58:44 2015
@@ -54,6 +54,7 @@ public class MockSlingScriptHelperTest {
@After
public void tearDown() {
this.resourceResolver.close();
+ MockOsgi.shutdown(this.bundleContext);
}
@Test
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/AbstractSlingContextImplTest.java Fri Oct 2 19:58:44 2015
@@ -38,34 +38,27 @@ import org.apache.sling.models.annotatio
import org.apache.sling.settings.SlingSettingsService;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.apache.sling.testing.mock.sling.loader.ContentLoader;
import org.apache.sling.testing.mock.sling.services.MockMimeTypeService;
import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
public abstract class AbstractSlingContextImplTest {
- private SlingContextImpl context;
+ @Rule
+ public SlingContext context = new SlingContext(getResourceResolverType());
@Before
public void setUp() throws Exception {
- this.context = new SlingContextImpl();
- this.context.setResourceResolverType(getResourceResolverType());
- this.context.setUp();
-
context.addModelsForPackage("org.apache.sling.testing.mock.sling.context");
ContentLoader contentLoader = this.context.load();
contentLoader.json("/json-import-samples/content.json", "/content/sample/en");
}
- @After
- public void tearDown() throws Exception {
- this.context.tearDown();
- }
-
protected abstract ResourceResolverType getResourceResolverType();
@Test
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/context/ModelAdapterFactoryUtilTest.java Fri Oct 2 19:58:44 2015
@@ -32,7 +32,6 @@ import org.apache.sling.testing.mock.sli
import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.apache.sling.testing.mock.sling.services.MockMimeTypeService;
import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -48,11 +47,6 @@ public class ModelAdapterFactoryUtilTest
context.addModelsForPackage("org.apache.sling.testing.mock.sling.context");
}
- @After
- public void tearDown() throws Exception {
- MockSling.clearAdapterManagerBundleContext();
- }
-
@Test
public void testRequestAttribute() {
MockSlingHttpServletRequest request = new MockSlingHttpServletRequest();
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/junit/SlingContextDefaultRRTypeTest.java Fri Oct 2 19:58:44 2015
@@ -25,7 +25,6 @@ import org.junit.Test;
public class SlingContextDefaultRRTypeTest {
- // Run all unit tests for each resource resolver types listed here
@Rule
public SlingContext context = new SlingContext();
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderBinaryTest.java Fri Oct 2 19:58:44 2015
@@ -21,102 +21,78 @@ package org.apache.sling.testing.mock.sl
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Hashtable;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.commons.mime.MimeTypeService;
-import org.apache.sling.testing.mock.osgi.MockOsgi;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
-import org.osgi.framework.BundleContext;
@RunWith(MockitoJUnitRunner.class)
public abstract class AbstractContentLoaderBinaryTest {
private static final int SAMPLE_IMAGE_FILESIZE = 62;
-
- private BundleContext bundleContext;
- private ResourceResolver resourceResolver;
- private ContentLoader contentLoader;
-
- @Mock
- private MimeTypeService mimeTypeService;
+
+ @Rule
+ public SlingContext context = new SlingContext(getResourceResolverType());
protected abstract ResourceResolverType getResourceResolverType();
-
- protected ResourceResolver newResourceResolver() {
- return MockSling.newResourceResolver(getResourceResolverType());
- }
-
+
+ private String path;
+
@Before
- public final void setUp() {
- bundleContext = MockOsgi.newBundleContext();
- bundleContext.registerService(MimeTypeService.class.getName(), mimeTypeService, new Hashtable());
- resourceResolver = newResourceResolver();
- contentLoader = new ContentLoader(this.resourceResolver, this.bundleContext);
-
- when(mimeTypeService.getMimeType("gif")).thenReturn("image/gif");
+ public void setUp() {
+ path = context.uniqueRoot().content();
}
@After
public final void tearDown() throws Exception {
// make sure all changes from ContentLoader are committed
- assertFalse(resourceResolver.hasChanges());
- // remove everything below /content
- Resource content = resourceResolver.getResource("/content");
- if (content != null) {
- resourceResolver.delete(content);
- resourceResolver.commit();
- }
- resourceResolver.close();
+ assertFalse(context.resourceResolver().hasChanges());
}
@Test
public void testBinaryFile() throws IOException {
- contentLoader.binaryFile("/sample-image.gif", "/content/binary/sample-image.gif");
+ context.load().binaryFile("/sample-image.gif", path + "/sample-image.gif");
- Resource fileResource = resourceResolver.getResource("/content/binary/sample-image.gif");
+ Resource fileResource = context.resourceResolver().getResource(path + "/sample-image.gif");
assertSampleImageFileSize(fileResource);
assertMimeType(fileResource.getChild(JcrConstants.JCR_CONTENT), "image/gif");
}
@Test
public void testBinaryFileWithMimeType() throws IOException {
- contentLoader.binaryFile("/sample-image.gif", "/content/binary/sample-image.gif", "mime/test");
+ context.load().binaryFile("/sample-image.gif", path + "/sample-image.gif", "mime/test");
- Resource fileResource = resourceResolver.getResource("/content/binary/sample-image.gif");
+ Resource fileResource = context.resourceResolver().getResource(path + "/sample-image.gif");
assertSampleImageFileSize(fileResource);
assertMimeType(fileResource.getChild(JcrConstants.JCR_CONTENT), "mime/test");
}
@Test
public void testBinaryResource() throws IOException {
- contentLoader.binaryResource("/sample-image.gif", "/content/binary/sample-image.gif");
+ context.load().binaryResource("/sample-image.gif", path + "/sample-image.gif");
- Resource fileResource = resourceResolver.getResource("/content/binary/sample-image.gif");
+ Resource fileResource = context.resourceResolver().getResource(path + "/sample-image.gif");
assertSampleImageFileSize(fileResource);
assertMimeType(fileResource, "image/gif");
}
@Test
public void testBinaryResourceWithMimeType() throws IOException {
- contentLoader.binaryResource("/sample-image.gif", "/content/binary/sample-image.gif", "mime/test");
+ context.load().binaryResource("/sample-image.gif", path + "/sample-image.gif", "mime/test");
- Resource fileResource = resourceResolver.getResource("/content/binary/sample-image.gif");
+ Resource fileResource = context.resourceResolver().getResource(path + "/sample-image.gif");
assertSampleImageFileSize(fileResource);
assertMimeType(fileResource, "mime/test");
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonDamTest.java Fri Oct 2 19:58:44 2015
@@ -32,29 +32,33 @@ import javax.jcr.Session;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.NodeTypeDefinitionScanner;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
public abstract class AbstractContentLoaderJsonDamTest {
- private ResourceResolver resourceResolver;
+ @Rule
+ public SlingContext context = new SlingContext(getResourceResolverType());
protected abstract ResourceResolverType getResourceResolverType();
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
+ private String path;
+
+ @Before
+ public void setUp() {
+ path = context.uniqueRoot().content() + "/dam";
try {
- NodeTypeDefinitionScanner.get().register(resolver.adaptTo(Session.class),
+ NodeTypeDefinitionScanner.get().register(context.resourceResolver().adaptTo(Session.class),
ImmutableList.of("SLING-INF/nodetypes/app.cnd"),
getResourceResolverType().getNodeTypeMode());
}
@@ -62,33 +66,19 @@ public abstract class AbstractContentLoa
throw new RuntimeException("Unable to register namespaces.", ex);
}
- return resolver;
- }
-
- @Before
- public final void setUp() {
- this.resourceResolver = newResourceResolver();
- ContentLoader contentLoader = new ContentLoader(this.resourceResolver);
- contentLoader.json("/json-import-samples/dam.json", "/content/dam/sample");
+ context.load().json("/json-import-samples/dam.json", path + "/sample");
}
@After
public final void tearDown() throws Exception {
// make sure all changes from ContentLoader are committed
- assertFalse(resourceResolver.hasChanges());
- // remove everything below /content
- Resource content = resourceResolver.getResource("/content");
- if (content != null) {
- resourceResolver.delete(content);
- resourceResolver.commit();
- }
- this.resourceResolver.close();
+ assertFalse(context.resourceResolver().hasChanges());
}
@Test
public void testDamAssetMetadata() throws IOException {
- Resource assetMetadata = this.resourceResolver
- .getResource("/content/dam/sample/portraits/scott_reynolds.jpg/jcr:content/metadata");
+ Resource assetMetadata = context.resourceResolver()
+ .getResource(path + "/sample/portraits/scott_reynolds.jpg/jcr:content/metadata");
ValueMap props = ResourceUtil.getValueMap(assetMetadata);
assertEquals("Canon\u0000", props.get("tiff:Make", String.class));
@@ -100,8 +90,8 @@ public abstract class AbstractContentLoa
"properties:orientation/landscape" }, props.get("app:tags", String[].class));
// validate that a binary data node is present, but empty
- Resource binaryMetadata = this.resourceResolver
- .getResource("/content/dam/sample/portraits/scott_reynolds.jpg/jcr:content/renditions/original/jcr:content");
+ Resource binaryMetadata = context.resourceResolver()
+ .getResource(path + "/sample/portraits/scott_reynolds.jpg/jcr:content/renditions/original/jcr:content");
ValueMap binaryProps = ResourceUtil.getValueMap(binaryMetadata);
InputStream is = binaryProps.get(JcrConstants.JCR_DATA, InputStream.class);
assertNotNull(is);
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/loader/AbstractContentLoaderJsonTest.java Fri Oct 2 19:58:44 2015
@@ -32,29 +32,33 @@ import javax.jcr.Session;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.NodeTypeDefinitionScanner;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import com.google.common.collect.ImmutableList;
public abstract class AbstractContentLoaderJsonTest {
- private ResourceResolver resourceResolver;
+ @Rule
+ public SlingContext context = new SlingContext(getResourceResolverType());
protected abstract ResourceResolverType getResourceResolverType();
+
+ private String path;
- protected ResourceResolver newResourceResolver() {
- ResourceResolver resolver = MockSling.newResourceResolver(getResourceResolverType());
+ @Before
+ public void setUp() {
+ path = context.uniqueRoot().content();
try {
- NodeTypeDefinitionScanner.get().register(resolver.adaptTo(Session.class),
+ NodeTypeDefinitionScanner.get().register(context.resourceResolver().adaptTo(Session.class),
ImmutableList.of("SLING-INF/nodetypes/app.cnd"),
getResourceResolverType().getNodeTypeMode());
}
@@ -62,56 +66,42 @@ public abstract class AbstractContentLoa
throw new RuntimeException("Unable to register namespaces.", ex);
}
- return resolver;
- }
-
- @Before
- public final void setUp() {
- this.resourceResolver = newResourceResolver();
- ContentLoader contentLoader = new ContentLoader(this.resourceResolver);
- contentLoader.json("/json-import-samples/content.json", "/content/sample/en");
+ context.load().json("/json-import-samples/content.json", path + "/sample/en");
}
@After
public final void tearDown() throws Exception {
// make sure all changes from ContentLoader are committed
- assertFalse(resourceResolver.hasChanges());
- // remove everything below /content
- Resource content = resourceResolver.getResource("/content");
- if (content != null) {
- resourceResolver.delete(content);
- resourceResolver.commit();
- }
- this.resourceResolver.close();
+ assertFalse(context.resourceResolver().hasChanges());
}
@Test
public void testPageResourceType() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en");
assertEquals("app:Page", resource.getResourceType());
}
@Test
public void testPageJcrPrimaryType() throws RepositoryException {
- Resource resource = this.resourceResolver.getResource("/content/sample/en");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en");
assertPrimaryNodeType(resource, "app:Page");
}
@Test
public void testPageContentResourceType() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/toolbar/profiles/jcr:content");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/toolbar/profiles/jcr:content");
assertEquals("sample/components/contentpage", resource.getResourceType());
}
@Test
public void testPageContentJcrPrimaryType() throws RepositoryException {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/toolbar/profiles/jcr:content");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/toolbar/profiles/jcr:content");
assertPrimaryNodeType(resource, "app:PageContent");
}
@Test
public void testPageContentProperties() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/toolbar/profiles/jcr:content");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/toolbar/profiles/jcr:content");
ValueMap props = ResourceUtil.getValueMap(resource);
assertEquals(true, props.get("hideInNav", Boolean.class));
@@ -126,19 +116,19 @@ public abstract class AbstractContentLoa
@Test
public void testContentResourceType() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content/header");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/jcr:content/header");
assertEquals("sample/components/header", resource.getResourceType());
}
@Test
public void testContentJcrPrimaryType() throws RepositoryException {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content/header");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/jcr:content/header");
assertPrimaryNodeType(resource, JcrConstants.NT_UNSTRUCTURED);
}
@Test
public void testContentProperties() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content/header");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/jcr:content/header");
ValueMap props = ResourceUtil.getValueMap(resource);
assertEquals("/content/dam/sample/header.png", props.get("imageReference", String.class));
}
@@ -155,7 +145,7 @@ public abstract class AbstractContentLoa
@Test
public void testCalendarEcmaFormat() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/jcr:content");
ValueMap props = ResourceUtil.getValueMap(resource);
Calendar calendar = props.get("app:lastModified", Calendar.class);
@@ -174,7 +164,7 @@ public abstract class AbstractContentLoa
@Test
public void testCalendarISO8601Format() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/jcr:content");
ValueMap props = ResourceUtil.getValueMap(resource);
Calendar calendar = props.get("dateISO8601String", Calendar.class);
@@ -193,7 +183,7 @@ public abstract class AbstractContentLoa
@Test
public void testUTF8Chars() {
- Resource resource = this.resourceResolver.getResource("/content/sample/en/jcr:content");
+ Resource resource = context.resourceResolver().getResource(path + "/sample/en/jcr:content");
ValueMap props = ResourceUtil.getValueMap(resource);
assertEquals("äöüÃâ¬", props.get("utf8Property"));
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractMultipleResourceResolverTest.java Fri Oct 2 19:58:44 2015
@@ -27,6 +27,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.junit.After;
import org.junit.Test;
import org.osgi.framework.BundleContext;
@@ -45,6 +46,11 @@ public abstract class AbstractMultipleRe
return MockSling.newResourceResolverFactory(getResourceResolverType(), bundleContext);
}
+ @After
+ public void tearDown() {
+ MockOsgi.shutdown(bundleContext);
+ }
+
@Test
public void testMultipleResourceResolver() throws Exception {
ResourceResolverFactory factory = newResourceResolerFactory();
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderBinaryTest.java Fri Oct 2 19:58:44 2015
@@ -18,8 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.rrmock.loader;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderBinaryTest;
@@ -30,9 +28,4 @@ public class ContentLoaderBinaryTest ext
return ResourceResolverType.RESOURCERESOLVER_MOCK;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- return MockSling.newResourceResolver(getResourceResolverType());
- }
-
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonDamTest.java Fri Oct 2 19:58:44 2015
@@ -18,8 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.rrmock.loader;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonDamTest;
@@ -30,9 +28,4 @@ public class ContentLoaderJsonDamTest ex
return ResourceResolverType.RESOURCERESOLVER_MOCK;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- return MockSling.newResourceResolver(getResourceResolverType());
- }
-
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/rrmock/loader/ContentLoaderJsonTest.java Fri Oct 2 19:58:44 2015
@@ -18,8 +18,6 @@
*/
package org.apache.sling.testing.mock.sling.rrmock.loader;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.loader.AbstractContentLoaderJsonTest;
@@ -30,9 +28,4 @@ public class ContentLoaderJsonTest exten
return ResourceResolverType.RESOURCERESOLVER_MOCK;
}
- @Override
- protected ResourceResolver newResourceResolver() {
- return MockSling.newResourceResolver(getResourceResolverType());
- }
-
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java?rev=1706483&r1=1706482&r2=1706483&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/servlet/MockSlingHttpServletRequestTest.java Fri Oct 2 19:58:44 2015
@@ -51,6 +51,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.servlets.HttpConstants;
import org.apache.sling.i18n.ResourceBundleProvider;
import org.apache.sling.testing.mock.osgi.MockOsgi;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -73,6 +74,11 @@ public class MockSlingHttpServletRequest
public void setUp() throws Exception {
request = new MockSlingHttpServletRequest(resourceResolver, bundleContext);
}
+
+ @After
+ public void tearDown() {
+ MockOsgi.shutdown(bundleContext);
+ }
@Test
public void testResourceResolver() {