Author: cziegeler
Date: Tue Nov 3 23:48:19 2009
New Revision: 832620
URL: http://svn.apache.org/viewvc?rev=832620&view=rev
Log:
Clean up code
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java?rev=832620&r1=832619&r2=832620&view=diff
==============================================================================
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
Tue Nov 3 23:48:19 2009
@@ -17,7 +17,6 @@
package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -28,6 +27,7 @@
import org.apache.sling.servlets.post.SlingPostConstants;
+
/** Test the {link ScriptHelper#forward) functionality */
public class ForwardTest extends HttpTestBase {
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java?rev=832620&r1=832619&r2=832620&view=diff
==============================================================================
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
Tue Nov 3 23:48:19 2009
@@ -17,7 +17,6 @@
package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java?rev=832620&r1=832619&r2=832620&view=diff
==============================================================================
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
Tue Nov 3 23:48:19 2009
@@ -17,14 +17,12 @@
package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java?rev=832620&r1=832619&r2=832620&view=diff
==============================================================================
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
Tue Nov 3 23:48:19 2009
@@ -17,17 +17,16 @@
package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
+
/** Test the {link ScriptHelper#include) functionality */
public class JspIncludeTest extends JspTestBase {
@@ -78,7 +77,7 @@
props.remove("testMaxCalls");
props.put("testInfiniteLoop","true");
nodeUrlC = testClient.createNode(url, props);
-
+
// Node D is used for the "force resource type" test
forcedResourceType = getClass().getSimpleName() + "/" +
System.currentTimeMillis();
props.remove("testInfiniteLoop");
@@ -137,13 +136,13 @@
assertTrue(
"Response contains infinite loop error message",
content.contains("org.apache.sling.api.request.RecursionTooDeepException"));
-
+
// TODO: SLING-515, status is 500 when running the tests as part of
the maven build
// but 200 if running tests against a separate instance started with
mvn jetty:run
// final int status = get.getStatusCode();
// assertEquals("Status is 500 for infinite
loop",HttpServletResponse.SC_INTERNAL_SERVER_ERROR, status);
}
-
+
public void testMaxCallsDetection() throws IOException {
// Node F has a property that causes over 1000 includes
// Sling must indicate the problem in its response
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java?rev=832620&r1=832619&r2=832620&view=diff
==============================================================================
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
Tue Nov 3 23:48:19 2009
@@ -16,7 +16,6 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
-import org.apache.sling.commons.testing.integration.HttpTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
/** Test JSP scripting
