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:36:32 UTC
svn commit: r746761 - in /incubator/sling/trunk: contrib/launchpad/testing/
contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/
contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integration...
Author: cziegeler
Date: Sun Feb 22 16:36:31 2009
New Revision: 746761
URL: http://svn.apache.org/viewvc?rev=746761&view=rev
Log:
SLING-865 - Clean up integration tests.
Added:
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java (with props)
Removed:
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonQueryServletTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/
Modified:
incubator/sling/trunk/contrib/launchpad/testing/pom.xml
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
incubator/sling/trunk/launchpad/testing/pom.xml
Modified: incubator/sling/trunk/contrib/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing/pom.xml?rev=746761&r1=746760&r2=746761&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/contrib/launchpad/testing/pom.xml Sun Feb 22 16:36:31 2009
@@ -27,20 +27,20 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.launchpad.testing</artifactId>
+ <artifactId>org.apache.sling.launchpad.contrib-testing</artifactId>
<packaging>war</packaging>
<version>4-incubator-SNAPSHOT</version>
- <name>Apache Sling Launchpad Testing</name>
+ <name>Apache Sling Launchpad Contrib Testing</name>
<description>
- Sling Launchpad Testing module, contains integration tests that
+ Sling Launchpad Contrib Testing module, contains integration tests that
were previously in the launchpad webapp module.
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/testing</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/testing</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/launchpad/testing</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/launchpad/testing</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing</url>
</scm>
<properties>
Modified: incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java?rev=746761&r1=746760&r2=746761&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java (original)
+++ incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java Sun Feb 22 16:36:31 2009
@@ -24,18 +24,6 @@
public class GetStarTest extends RenderingTestBase {
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;
Added: incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java?rev=746761&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java (added)
+++ incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java Sun Feb 22 16:36:31 2009
@@ -0,0 +1,39 @@
+/*
+ * 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.launchpad.webapp.integrationtest;
+
+import java.io.IOException;
+
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+/** Base class for rendering tests
+ */
+class RenderingTestBase extends HttpTestBase {
+ protected String scriptPath;
+ protected String testText;
+ protected String displayUrl;
+
+ protected String uploadTestScript(String localFilename,String filenameOnServer) throws IOException {
+ return uploadTestScript(scriptPath, localFilename, filenameOnServer);
+ }
+
+ protected void assertContains(String content, String expected) {
+ if(!content.contains(expected)) {
+ fail("Content does not contain '" + expected + "' (content=" + content + ")");
+ }
+ }
+}
\ No newline at end of file
Propchange: incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java?rev=746761&r1=746760&r2=746761&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java (original)
+++ incubator/sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java Sun Feb 22 16:36:31 2009
@@ -52,109 +52,6 @@
testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
}
- public void testWithoutScriptTxt() throws IOException {
- final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
- assertContains(content, "dumped by PlainTextRendererServlet");
- }
-
- public void testWithoutScriptHtml() throws IOException {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "dumped by HtmlRendererServlet");
- }
-
- public void testEspHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "ESP template");
- assertContains(content, "<p>" + testText + "</p>");
- assertContains(content, "<div class=\"SLING-142\" id=\"22\"/>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testEspJavaCode() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "ESP template");
- assertContains(content, "TestLinkedListTest");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testEspHtmlInAppsFolder() 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("ESP template"));
- }
-
- // 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.esp","html.esp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "ESP template");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- 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);
- assertContains(content, "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);
- final String toDelete = uploadTestScript(path,"rendering-test.esp","html.esp");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertContains(content, "ESP template");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testEspHtmlWithSelectors() throws IOException {
- testClient.mkdirs(WEBDAV_BASE_URL, scriptPath + "/a4");
- 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>"));
- } finally {
- testClient.delete(toDeleteA);
- testClient.delete(toDeleteB);
- testClient.delete(toDeleteC);
- }
- }
-
public void TODO_FAILS_testJstHtml() throws IOException {
final String toDelete = uploadTestScript("rendering-test.jst","html.jst");
try {
@@ -194,63 +91,6 @@
testClient.delete(toDelete);
}
}
-
- public void TODO_FAILS_testEspHtmlUppercase() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","html.esp");
- try {
- final String content = getContent(displayUrl + ".HTML", CONTENT_TYPE_HTML);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void TODO_FAILS_testEspNoExtension() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","GET.esp");
- try {
- final String content = getContent(displayUrl, CONTENT_TYPE_PLAIN);
- assertTrue("Content includes ESP marker",content.contains("ESP template"));
- assertTrue("Content contains formatted test text",content.contains("<p>" + testText + "</p>"));
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- /** SLING-107, verify that extension is used instead of Content-Type for script name */
- public void testEspJs() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","js.esp");
- try {
- final String content = getContent(displayUrl + ".js", CONTENT_TYPE_JS);
- // template makes no JS sense, that's not a problem for this test
- assertContains(content, "ESP template");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testEspXml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","xml.esp");
- try {
- final String content = getContent(displayUrl + ".xml", CONTENT_TYPE_XML);
- assertContains(content, "ESP template");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
-
- public void testEspPlain() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.esp","txt.esp");
- try {
- final String content = getContent(displayUrl + ".txt", CONTENT_TYPE_PLAIN);
- assertContains(content, "ESP template");
- assertContains(content, "<p>" + testText + "</p>");
- } finally {
- testClient.delete(toDelete);
- }
- }
public void testPythonHtml() throws IOException {
final String toDelete = uploadTestScript("rendering-test.py","html.py");
@@ -326,17 +166,6 @@
}
}
- public void TODO_FAILS_testJsHtml() throws IOException {
- final String toDelete = uploadTestScript("rendering-test.ecma","html.ecma");
- try {
- final String content = getContent(displayUrl + ".html", CONTENT_TYPE_HTML);
- assertTrue("Content includes JS marker",content.contains("Raw javascript template"));
- assertTrue("Content contains formatted test text",content.contains("<p><em>" + testText + "</em></p>"));
- } finally {
- testClient.delete(toDelete);
- }
- }
-
public void TODO_FAILS_testFtlHtml() throws IOException {
final String toDelete = uploadTestScript("rendering-test.ftl","html.ftl");
try {
Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=746761&r1=746760&r2=746761&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Sun Feb 22 16:36:31 2009
@@ -118,11 +118,6 @@
<value>${jetty.sling.home}</value>
</systemProperty>
- <!-- jython uses this to place various stuff -->
- <systemProperty>
- <name>python.home</name>
- <value>${jetty.sling.home}/python</value>
- </systemProperty>
</systemProperties>
<connectors>