This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.resourcebuilder-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcebuilder.git
commit 493b2d5dbf2b5edd24ec9f3eb1517d2e7cc4109b Author: Stefan Seifert <[email protected]> AuthorDate: Thu Sep 8 13:01:51 2016 +0000 SLING-6040 use resourceresolver-mock instead of sling-mock to avoid cyclic dependency to sling-mock referencing the resourcebuilder itself git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder@1759810 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 16 +++++++++---- .../impl/ResourceBuilderImplTest.java | 27 +++++++++++++--------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 3b90050..3713f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,9 +53,9 @@ <jar.executor.jar.options>-p $JAREXEC_SERVER_PORT$</jar.executor.jar.options> </properties> <scm> - <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</developerConnection> - <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/resourcebuilder</url> + <connection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder</developerConnection> + <url>https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/resourcebuilder</url> </scm> <build> @@ -221,8 +221,14 @@ </dependency> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.testing.sling-mock</artifactId> - <version>1.6.0</version> + <artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId> + <version>1.1.14</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java index 9ab055f..e33b900 100644 --- a/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java +++ b/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java @@ -21,6 +21,8 @@ package org.apache.sling.resourcebuilder.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.when; import java.util.Random; import java.util.UUID; @@ -32,28 +34,29 @@ import org.apache.sling.api.resource.ResourceUtil; import org.apache.sling.commons.mime.MimeTypeService; import org.apache.sling.resourcebuilder.api.ResourceBuilder; import org.apache.sling.resourcebuilder.test.ResourceAssertions; -import org.apache.sling.testing.mock.sling.ResourceResolverType; -import org.apache.sling.testing.mock.sling.junit.SlingContext; -import org.apache.sling.testing.mock.sling.services.MockMimeTypeService; +import org.apache.sling.testing.resourceresolver.MockResourceResolverFactory; 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; +@RunWith(MockitoJUnitRunner.class) public class ResourceBuilderImplTest { private String testRootPath; - private ResourceResolver resourceResolver; private long lastModified; private Random random = new Random(System.currentTimeMillis()); - private static final MimeTypeService mimeTypeService = new MockMimeTypeService(); private ResourceAssertions A; - @Rule - public SlingContext context = new SlingContext(ResourceResolverType.RESOURCERESOLVER_MOCK); + @Mock + private MimeTypeService mimeTypeService; + + private ResourceResolver resourceResolver; private Resource getTestRoot(String path) throws PersistenceException { - final Resource root = context.resourceResolver().resolve("/"); + final Resource root = resourceResolver.resolve("/"); assertNotNull("Expecting non-null root", root); return resourceResolver.create(root, ResourceUtil.getName(path), null); } @@ -82,9 +85,11 @@ public class ResourceBuilderImplTest { } @Before - public void setup() { + public void setup() throws Exception { + when(mimeTypeService.getMimeType(anyString())).thenReturn("application/javascript"); + resourceResolver = new MockResourceResolverFactory().getResourceResolver(null); + testRootPath = "/" + UUID.randomUUID().toString(); - resourceResolver = context.resourceResolver(); A = new ResourceAssertions(testRootPath, resourceResolver); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
