incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asa...@apache.org
Subject svn commit: r1601645 - /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Date Tue, 10 Jun 2014 14:18:01 GMT
Author: asanso
Date: Tue Jun 10 14:18:01 2014
New Revision: 1601645

URL: http://svn.apache.org/r1601645
Log:
SLING-3563 - Removal of node with sling:alias property is ignored by sling resource resolution

* enabled test

Modified:
    sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java

Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java?rev=1601645&r1=1601644&r2=1601645&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
(original)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Tue Jun 10 14:18:01 2014
@@ -143,7 +143,7 @@ public class ResourceResolverTest {
         vanity = new String[] {"testVanity","testV", "testVanityToUpdate"};
         rootNode.setProperty("sling:vanityPath", vanity);
         rootNode.addMixin("sling:VanityPath");
-        session.save();
+        saveMappings(session);
     }
     
     private void closeResolver() {
@@ -1250,10 +1250,8 @@ public class ResourceResolverTest {
         assertTrue(res instanceof NonExistingResource);
         assertEquals("/"+alias+".print.html", res.getPath());
         
-        
-        //Commenting for now until SLING-3563 is solved
         //create new child with alias
-        /*String childNodeName = "rootChildAlias";
+        String childNodeName = "rootChildAlias";
         Node childNode = maybeCreateNode(rootNode, childNodeName, "nt:unstructured");
         childNode.setProperty("sling:alias", "childAlias");
         saveMappings(session);
@@ -1296,14 +1294,14 @@ public class ResourceResolverTest {
         saveMappings(session);
         
         path = ResourceUtil.normalize(ResourceUtil.getParent(rootPath)+ "/"+ rootPath + "/childAlias"
+
-                ".print.html/suffix.pdf");
+                ".print.html");
 
         request = new FakeSlingHttpServletRequest(path);
         res = resResolver.resolve(request, path);
         
         assertNotNull(res);
         assertTrue(res instanceof NonExistingResource);
-        assertEquals("/"+alias+".print.html", res.getPath());*/
+        assertEquals (rootPath + "/childAlias.print.html", res.getPath());
     }
     
     @Test public void testResolveResourceAliasJcrContent() throws Exception {



Mime
View raw message