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/02/02 12:36:54 UTC
svn commit: r1656443 - in /sling/trunk/testing/mocks:
resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/
resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/
sling-mock/ sling-mock/src/test/java/org...
Author: sseifert
Date: Mon Feb 2 11:36:54 2015
New Revision: 1656443
URL: http://svn.apache.org/r1656443
Log:
SLING-4376 ResourceResolver.resolve(null) should resolve to root resource
Modified:
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
sling/trunk/testing/mocks/sling-mock/pom.xml
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
Modified: sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java?rev=1656443&r1=1656442&r2=1656443&view=diff
==============================================================================
--- sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java (original)
+++ sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java Mon Feb 2 11:36:54 2015
@@ -75,6 +75,9 @@ public class MockResourceResolver extend
@Override
public Resource resolve(final HttpServletRequest request, final String absPath) {
String path = absPath;
+ if (path == null) {
+ path = "/";
+ }
// split off query string or fragment that may be appendend to the URL
String urlRemainder = null;
Modified: sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java?rev=1656443&r1=1656442&r2=1656443&view=diff
==============================================================================
--- sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java Mon Feb 2 11:36:54 2015
@@ -222,4 +222,11 @@ public class SlingCrudResourceResolverTe
assertEquals(STRING_VALUE, propValue);
}
+ @Test
+ public void testGetRootResourceByNullPath() {
+ Resource rootResource = this.resourceResolver.resolve((String)null);
+ assertNotNull(rootResource);
+ assertEquals("/", rootResource.getPath());
+ }
+
}
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1656443&r1=1656442&r2=1656443&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Mon Feb 2 11:36:54 2015
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java?rev=1656443&r1=1656442&r2=1656443&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java Mon Feb 2 11:36:54 2015
@@ -229,4 +229,11 @@ public abstract class AbstractSlingCrudR
assertEquals(JcrConstants.NT_UNSTRUCTURED, resource.getResourceType());
}
+ @Test
+ public void testGetRootResourceByNullPath() {
+ Resource rootResource = this.resourceResolver.resolve((String)null);
+ assertNotNull(rootResource);
+ assertEquals("/", rootResource.getPath());
+ }
+
}