SLING-620 - Use resource abstraction and value map for get servlets.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk@688134 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
index 0cca856..3b96fd9 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
@@ -25,30 +25,30 @@
*/
public class GetStarTest extends HttpTestBase {
private final String random = getClass().getSimpleName() + String.valueOf(System.currentTimeMillis());
-
+
public void testGetStarHtml() throws IOException {
getContent(HTTP_BASE_URL + "/*.html", CONTENT_TYPE_HTML);
getContent(HTTP_BASE_URL + "/" + random + "/*.html", CONTENT_TYPE_HTML);
getContent(HTTP_BASE_URL + "/" + random + "/" + random + "/*.html", CONTENT_TYPE_HTML);
getContent(HTTP_BASE_URL + "/" + random + "/*.someselector.html", CONTENT_TYPE_HTML);
}
-
+
public void testGetStarJson() throws IOException {
getContent(HTTP_BASE_URL + "/*.json", CONTENT_TYPE_JSON);
getContent(HTTP_BASE_URL + "/" + random + "/*.json", CONTENT_TYPE_JSON);
getContent(HTTP_BASE_URL + "/" + random + "/*.12.json", CONTENT_TYPE_JSON);
}
-
+
public void testGetStarWithScript() throws IOException {
final String scriptPath = "/apps/" + random;
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
urlsToDelete.add(WEBDAV_BASE_URL + scriptPath);
- final String fakeNodePath = HTTP_BASE_URL + "/sling-test-pbrt/" + random + "/something/*.html";
+ final String fakeNodePath = HTTP_BASE_URL + "/sling-test-pbrt/" + random + "/something/*.html";
{
final String content = getContent(fakeNodePath, CONTENT_TYPE_HTML);
assertTrue("Without script, default renderer marker must be present (" + content + ")",
- content.contains("Node dumped by HtmlRendererServlet"));
+ content.contains("Resource dumped by HtmlRendererServlet"));
}
final String urlToDelete = uploadTestScript(scriptPath, "rendering-test.esp", "html.esp");
@@ -59,7 +59,7 @@
} finally {
testClient.delete(urlToDelete);
}
-
+
}
}
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
index 7490193..28cfa5e 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
@@ -29,7 +29,7 @@
public class NodetypeRenderingTest extends RenderingTestBase {
private String secondFolderOfContentPath;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -56,7 +56,7 @@
public void testWithoutScriptHtml() throws IOException {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content contains default rendering",content.contains("Node dumped by HtmlRendererServlet"));
+ assertTrue("Content contains default rendering",content.contains("Resource dumped by HtmlRendererServlet"));
}
public void testMiniScriptHtml() throws IOException {
@@ -90,15 +90,15 @@
testClient.delete(toDelete);
}
}
-
+
public void TODO_FAILS_testEspHtmlWithContentBasedPath() throws IOException {
-
+
// make sure there's no leftover rendering script
{
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertFalse("Content must not include ESP marker before test",content.contains("ESP template"));
}
-
+
// put our script in the /apps/<second folder level of content> (SLING-125)
final String path = "/apps/" + secondFolderOfContentPath;
testClient.mkdirs(WEBDAV_BASE_URL, path);
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java
index 2082a8c..6a3c59b 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java
@@ -27,10 +27,10 @@
*/
public class PathBasedResourceTypeTest extends HttpTestBase {
-
+
public static final String testPath = "sling-integration-test-" + System.currentTimeMillis();
public static final String contentPath = "/sling-test-pbrt/" + testPath;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -39,11 +39,11 @@
public void testDefaultResourceType() throws IOException {
final TestNode tn = new TestNode(HTTP_BASE_URL + contentPath, null);
-
+
// without script -> default rendering
String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content contains default rendering",content.contains("Node dumped by HtmlRendererServlet"));
-
+ assertTrue("Content contains default rendering",content.contains("Resource dumped by HtmlRendererServlet"));
+
// check default resource type
final String scriptPath = "/apps/" + testPath;
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
@@ -56,14 +56,14 @@
testClient.delete(urlsToDelete);
}
}
-
+
public void testExplicitResourceType() throws IOException {
-
+
final String resourceType = getClass().getSimpleName();
final Map<String, String> properties = new HashMap<String, String>();
properties.put(SLING_RESOURCE_TYPE, resourceType);
final TestNode tn = new TestNode(HTTP_BASE_URL + contentPath, properties);
-
+
urlsToDelete.add(uploadTestScript(tn.scriptPath, "rendering-test-2.esp", "html.esp"));
final String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML);
assertTrue("Test script marker found in content (" + content + ")",content.contains("Template #2 for ESP tests"));
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
index 17bd8e9..438ff07 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
@@ -49,7 +49,7 @@
final String json = getContent(displayUrl + ".json", CONTENT_TYPE_JSON);
assertJavascript(testText, json, "out.println(data.text)");
}
-
+
public void testTextJson() throws IOException {
final String json = getContent(displayUrl + "/text.json", CONTENT_TYPE_JSON);
assertEquals("{\"text\":\"" + testText + "\"}",json);
@@ -57,19 +57,19 @@
public void testTextHtml() throws IOException {
final String data = getContent(displayUrl + "/text.html", CONTENT_TYPE_HTML);
- assertEquals(testText, data);
+ assertTrue(data.contains(testText));
}
-
+
public void testTextTxt() throws IOException {
final String data = getContent(displayUrl + "/text.txt", CONTENT_TYPE_PLAIN);
assertEquals(testText, data);
}
-
+
public void testTextNoExt() throws IOException {
final String data = getContent(displayUrl + "/text", null);
assertEquals(testText, data);
}
-
+
public void testResourceTypeNoExt() throws IOException {
final String data = getContent(displayUrl + "/sling:resourceType", null);
assertEquals(slingResourceType, data);
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
index 28af28e..52ca083 100644
--- a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
@@ -59,7 +59,7 @@
public void testWithoutScriptHtml() throws IOException {
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content contains default rendering",content.contains("Node dumped by HtmlRendererServlet"));
+ assertTrue("Content contains default rendering",content.contains("Resource dumped by HtmlRendererServlet"));
}
public void testEspHtml() throws IOException {
@@ -107,13 +107,13 @@
}
public void TODO_FAILS_testEspHtmlWithContentBasedPath() throws IOException {
-
+
// make sure there's no leftover rendering script
{
final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertFalse("Content must not include ESP marker before test",content.contains("ESP template"));
}
-
+
// put our script in the /apps/<second folder level of content> (SLING-125)
final String path = "/apps/" + secondFolderOfContentPath;
testClient.mkdirs(WEBDAV_BASE_URL, path);
@@ -132,20 +132,20 @@
final String toDeleteA = uploadTestScript("rendering-test.esp","html.esp");
final String toDeleteB = uploadTestScript("rendering-test-2.esp","a4.esp");
final String toDeleteC = uploadTestScript("rendering-test-3.esp","a4/print.esp");
-
+
try {
String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
assertTrue("Without selectors, content includes standard marker",content.contains("ESP template"));
assertTrue("Without selectors, content contains formatted test text",content.contains("<p>" + testText + "</p>"));
-
+
content = getContent(displayUrl + ".a4.print.html", CONTENT_TYPE_HTML);
assertTrue("With a4.print selectors, content includes marker 3",content.contains("Template #3 for ESP tests"));
assertTrue("With a4.print selectors, content contains italic text",content.contains("<em>" + testText + "</em>"));
-
+
content = getContent(displayUrl + ".a4.html", CONTENT_TYPE_HTML);
assertTrue("With a4 selector, content includes marker 2",content.contains("Template #2 for ESP tests"));
assertTrue("With a4 selector, content contains bold text",content.contains("<b>" + testText + "</b>"));
-
+
content = getContent(displayUrl + ".different.html", CONTENT_TYPE_HTML);
assertTrue("With different selector only, content includes standard marker",content.contains("ESP template"));
assertTrue("With different selector only, content contains formatted test text",content.contains("<p>" + testText + "</p>"));
@@ -177,9 +177,9 @@
assertTrue("Content contains scripted stuff (" + content + ")",
content.contains("something scripted"));
assertFalse("Script opening tag must be broken in two in content (" + content + ")",
- content.contains("<script>something"));
+ content.contains("<script>something"));
assertFalse("Script closing tag must be broken in two in content (" + content + ")",
- content.contains("scripted</script>"));
+ content.contains("scripted</script>"));
} finally {
testClient.delete(toDelete);
}
@@ -194,9 +194,9 @@
assertTrue("Content contains scripted stuff (" + content + ")",
content.contains("more scripting"));
assertFalse("Script opening tag must be broken in two in content (" + content + ")",
- content.contains("<script>more"));
+ content.contains("<script>more"));
assertFalse("Script closing tag must be broken in two in content (" + content + ")",
- content.contains("scripting</script>"));
+ content.contains("scripting</script>"));
} finally {
testClient.delete(toDelete);
}
