sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r1746673 - in /sling/trunk/bundles/api/src: main/java/org/apache/sling/api/resource/NonExistingResource.java main/java/org/apache/sling/api/resource/package-info.java test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
Date Fri, 03 Jun 2016 06:44:45 GMT
Author: kwin
Date: Fri Jun  3 06:44:45 2016
New Revision: 1746673

URL: http://svn.apache.org/viewvc?rev=1746673&view=rev
Log:
SLING-5757 NonExistingResource.getParent() should not return null in case the parent is not
existing

Added:
    sling/trunk/bundles/api/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
  (with props)
Modified:
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
    sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java

Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/NonExistingResource.java?rev=1746673&r1=1746672&r2=1746673&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
(original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
Fri Jun  3 06:44:45 2016
@@ -54,4 +54,18 @@ public final class NonExistingResource e
         // 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;
+        }
+    }
+
 }

Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java?rev=1746673&r1=1746672&r2=1746673&view=diff
==============================================================================
--- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java
(original)
+++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/package-info.java
Fri Jun  3 06:44:45 2016
@@ -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;

Added: sling/trunk/bundles/api/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java?rev=1746673&view=auto
==============================================================================
--- sling/trunk/bundles/api/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
(added)
+++ sling/trunk/bundles/api/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
Fri Jun  3 06:44:45 2016
@@ -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));
+    }
+}

Propchange: sling/trunk/bundles/api/src/test/java/org/apache/sling/api/resource/NonExistingResourceTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message