SLING-5757 NonExistingResource.getParent() should not return null in case the parent is not existing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1746673 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/api/resource/NonExistingResource.java b/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
index c3f70b6..cde0375 100644
--- a/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
+++ b/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
@@ -54,4 +54,18 @@
// overwrite to only list the class name and path, type is irrelevant
return getClass().getSimpleName() + ", path=" + getPath();
}
+
+ /**
+ *
+ * @return the parent resource (might be a {@link NonExistingResource} in case the parent does not exist either).
+ */
+ public Resource getParent() {
+ Resource parent = super.getParent();
+ if (parent == null) {
+ return new NonExistingResource(getResourceResolver(), ResourceUtil.getParent(getPath()));
+ } else {
+ return parent;
+ }
+ }
+
}
diff --git a/src/main/java/org/apache/sling/api/resource/package-info.java b/src/main/java/org/apache/sling/api/resource/package-info.java
index acb8a86..f0f94d9 100644
--- a/src/main/java/org/apache/sling/api/resource/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/package-info.java
@@ -17,7 +17,7 @@
* under the License.
*/
-@Version("2.9.1")
+@Version("2.9.2")
package org.apache.sling.api.resource;
import aQute.bnd.annotation.Version;
diff --git a/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java b/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
new file mode 100644
index 0000000..11ec84f
--- /dev/null
+++ b/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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 ASF 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.api.resource;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(JMock.class)
+public class NonExistingResourceTest {
+
+ protected final Mockery context = new JUnit4Mockery();
+ protected ResourceResolver resolver;
+
+ @Before
+ public void setUp() {
+ resolver = this.context.mock(ResourceResolver.class);
+ }
+
+ @Test
+ public void testGetParentWithNonExistingParent() {
+ NonExistingResource nonExistingResource = new NonExistingResource(resolver, "/nonExistingParent/nonExistingResource");
+
+ context.checking(new Expectations() {{
+ allowing(resolver).getParent(nonExistingResource); will(returnValue(null));
+ }});
+
+ Resource parentResource = nonExistingResource.getParent();
+ Assert.assertNotNull("Non existing parent of NonExistingResource must not return null!", parentResource);
+ Assert.assertEquals("/nonExistingParent", parentResource.getPath());
+ Assert.assertTrue(ResourceUtil.isNonExistingResource(parentResource));
+ }
+
+ @Test
+ public void testGetParentWithExistingParent() throws PersistenceException {
+ NonExistingResource nonExistingResource = new NonExistingResource(resolver, "/existingParent/nonExistingResource");
+
+ Resource mockParentResource = this.context.mock(Resource.class);
+ context.checking(new Expectations() {{
+ allowing(resolver).getParent(nonExistingResource); will(returnValue(mockParentResource));
+ allowing(mockParentResource).getPath(); will(returnValue("/existingParent"));
+ allowing(mockParentResource).getResourceType(); will(returnValue("anyResourceType"));
+ }});
+
+ Resource parentResource = nonExistingResource.getParent();
+ Assert.assertNotNull("Existing parent of NonExistingResource must not return null!", parentResource);
+ Assert.assertEquals("/existingParent", parentResource.getPath());
+ Assert.assertFalse(ResourceUtil.isNonExistingResource(parentResource));
+ }
+}
