svn commit: r1759810 - in /sling/trunk/bundles/extensions/resourcebuilder: pom.xml src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java

[ss...@apache.org]

Author: sseifert
Date: Thu Sep  8 13:01:51 2016
New Revision: 1759810

URL: http://svn.apache.org/viewvc?rev=1759810&view=rev
Log:
SLING-6040 use resourceresolver-mock instead of sling-mock to avoid cyclic dependency to sling-mock referencing the resourcebuilder itself

Modified:
    sling/trunk/bundles/extensions/resourcebuilder/pom.xml
    sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java

Modified: sling/trunk/bundles/extensions/resourcebuilder/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/resourcebuilder/pom.xml?rev=1759810&r1=1759809&r2=1759810&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/resourcebuilder/pom.xml (original)
+++ sling/trunk/bundles/extensions/resourcebuilder/pom.xml Thu Sep  8 13:01:51 2016
@@ -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>

Modified: sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java?rev=1759810&r1=1759809&r2=1759810&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java (original)
+++ sling/trunk/bundles/extensions/resourcebuilder/src/test/java/org/apache/sling/resourcebuilder/impl/ResourceBuilderImplTest.java Thu Sep  8 13:01:51 2016
@@ -21,6 +21,8 @@ package org.apache.sling.resourcebuilder
 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.Res
 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);
     }