You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2008/12/14 23:15:12 UTC
svn commit: r726559 -
/incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2Test.java
Author: fmeschbe
Date: Sun Dec 14 14:15:12 2008
New Revision: 726559
URL: http://svn.apache.org/viewvc?rev=726559&view=rev
Log:
SLING-373 more unit tests
Modified:
incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2Test.java
Modified: incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2Test.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2Test.java?rev=726559&r1=726558&r2=726559&view=diff
==============================================================================
--- incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2Test.java (original)
+++ incubator/sling/trunk/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceResolver2Test.java Sun Dec 14 14:15:12 2008
@@ -715,6 +715,40 @@
String path = rootNode.getPath();
String mapped = resResolver.map(path);
assertEquals(path, mapped);
+
+ Node child = rootNode.addNode("child");
+ session.save();
+
+ // absolute path, expect rootPath segment to be
+ // cut off the mapped path because we map the rootPath
+ // onto root
+ final String selExt = ".html";
+ path = "/child" + selExt;
+ mapped = resResolver.map(child.getPath() + selExt);
+ assertEquals(path, mapped);
+ }
+
+ public void testMapSelectorsExtension() throws Exception {
+ String path = rootNode.getPath();
+ String mapped = resResolver.map(path);
+ assertEquals(path, mapped);
+
+ Node child = rootNode.addNode("child");
+ session.save();
+
+ // absolute path, expect rootPath segment to be
+ // cut off the mapped path because we map the rootPath
+ // onto root
+ final String selExt = ".sel1.sel2.html";
+ path = "/child" + selExt;
+ mapped = resResolver.map(child.getPath() + selExt);
+ assertEquals(path, mapped);
+ }
+
+ public void testMapExtensionSuffix() throws Exception {
+ String path = rootNode.getPath();
+ String mapped = resResolver.map(path);
+ assertEquals(path, mapped);
Node child = rootNode.addNode("child");
session.save();
@@ -722,7 +756,7 @@
// absolute path, expect rootPath segment to be
// cut off the mapped path because we map the rootPath
// onto root
- final String selExt = ".sel1.sel2.html";
+ final String selExt = ".html/some/suffx.pdf";
path = "/child" + selExt;
mapped = resResolver.map(child.getPath() + selExt);
assertEquals(path, mapped);
@@ -748,26 +782,68 @@
}
public void testAliasExtension() throws Exception {
-
+
+ final String selExt = ".html";
+
+ Node child = rootNode.addNode("child");
+ child.setProperty(JcrResourceResolver2.PROP_ALIAS, "kind");
+ session.save();
+
+ // expect kind due to alias and no parent due to mapping
+ // the rootPath onto root
+ String path = "/kind" + selExt;
+ String mapped = resResolver.map(child.getPath() + selExt);
+ assertEquals(path, mapped);
+
+ Resource res = resResolver.resolve(null, path);
+ Node resNode = res.adaptTo(Node.class);
+ assertNotNull(resNode);
+
+ assertEquals(child.getPath(), resNode.getPath());
+ }
+
+ public void testAliasSelectorsExtension() throws Exception {
+
final String selExt = ".sel1.sel2.html";
-
+
Node child = rootNode.addNode("child");
child.setProperty(JcrResourceResolver2.PROP_ALIAS, "kind");
session.save();
-
+
// expect kind due to alias and no parent due to mapping
// the rootPath onto root
String path = "/kind" + selExt;
String mapped = resResolver.map(child.getPath() + selExt);
assertEquals(path, mapped);
-
+
Resource res = resResolver.resolve(null, path);
Node resNode = res.adaptTo(Node.class);
assertNotNull(resNode);
-
+
assertEquals(child.getPath(), resNode.getPath());
}
-
+
+ public void testAliasExtensionSuffix() throws Exception {
+
+ final String selExt = ".html/some/suffx.pdf";
+
+ Node child = rootNode.addNode("child");
+ child.setProperty(JcrResourceResolver2.PROP_ALIAS, "kind");
+ session.save();
+
+ // expect kind due to alias and no parent due to mapping
+ // the rootPath onto root
+ String path = "/kind" + selExt;
+ String mapped = resResolver.map(child.getPath() + selExt);
+ assertEquals(path, mapped);
+
+ Resource res = resResolver.resolve(null, path);
+ Node resNode = res.adaptTo(Node.class);
+ assertNotNull(resNode);
+
+ assertEquals(child.getPath(), resNode.getPath());
+ }
+
// ---------- internal
private void testStarResourceHelper(final String path, final String method) {