You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2009/02/22 17:19:51 UTC
svn commit: r746751 - in /incubator/sling/trunk/launchpad/testing/src/test:
java/org/apache/sling/launchpad/webapp/integrationtest/
resources/integration-test/
Author: cziegeler
Date: Sun Feb 22 16:19:50 2009
New Revision: 746751
URL: http://svn.apache.org/viewvc?rev=746751&view=rev
Log:
SLING-865 : Remove contrib tests.
Removed:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PathBasedResourceTypeTest.java
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/rendering-test.erb
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/rendering-test.ftl
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/rendering-test.jst
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/rendering-test.py
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/rendering-test.vlt
Modified:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
Modified: incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java?rev=746751&r1=746750&r2=746751&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java (original)
+++ incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java Sun Feb 22 16:19:50 2009
@@ -155,46 +155,6 @@
}
}
- public void TODO_FAILS_testJstHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.jst","html.jst");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "JST template");
- assertContains(content, "\"text\":\"" + testText + "\"");
- assertContains(content, "div id=\"JstDefaultRendering");
- assertContains(content, "out.write( currentNode.text )");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void TODO_FAILS_testJstScriptTagA() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.jst","html.jst");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "JST template");
- assertContains(content, "something scripted");
- assertContains(content, "<script>something");
- assertContains(content, "scripted</script>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- /** TODO this test currently fails, see SLING-114 */
- public void TODO_FAILS_testJstHtmlScriptTagB() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.jst","html.jst");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "JST template");
- assertContains(content, "more scripting");
- assertContains(content, "<script>more");
- assertContains(content, "scripting</script>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
public void TODO_FAILS_testEspHtmlUppercase() throws IOException {
final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
try {
@@ -251,80 +211,6 @@
testClient.delete(toDelete);
}
}
-
- public void testPythonHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.py","html.py");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "Python");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testPythonJavaCode() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.py","html.py");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "Python");
- assertContains(content, "TestLinkedListTest");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testPythonHtmlInAppsFolder() throws IOException {
- // make sure there's no leftover rendering script
- {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertFalse("Content must not contain script marker before testing", content.contains("Python"));
- }
-
- // put our script under /apps/<resource type>
- final String path = "/apps/" + slingResourceType;
- testClient.mkdirs(WEBDAV_BASE_URL, path);
- final String toDelete = uploadTestScript(path,"rendering-test.py","html.py");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "Python");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testPythonXml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.py","xml.py");
- try {
- final String content = getContent(displayUrl + ".xml", CONTENT_TYPE_XML);
- assertContains(content, "Python");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testPythonPlain() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.py","txt.py");
- try {
- final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
- assertContains(content, "Python");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void TODO_FAILS_testVltHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.vlt","html.vlt");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes VLT marker",content.contains("Velocity template"));
- assertTrue("Content contains formatted test text",content.contains("<p><b>" + testText + "</b></p>"));
- } finally {
- testClient.delete(toDelete);
- }
- }
public void TODO_FAILS_testJsHtml() throws IOException {
final String toDelete = uploadTestScript("rendering-test.ecma","html.ecma");
@@ -336,26 +222,4 @@
testClient.delete(toDelete);
}
}
-
- public void TODO_FAILS_testFtlHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.ftl","html.ftl");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes FreeMarker marker",content.contains("FreeMarker template"));
- assertTrue("Content contains formatted test text",content.contains("<p><span>" + testText + "</span></p>"));
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void TODO_FAILS_testErbHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.erb","html.erb");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes Ruby marker",content.contains("Ruby template"));
- assertTrue("Content contains formatted test text",content.contains("<p><span>" + testText + "</span></p>"));
- } finally {
- testClient.delete(toDelete);
- }
- }
}
\ No newline at end of file