You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/10/29 14:40:45 UTC
svn commit: r1536709 - in
/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest:
./ issues/ scripting/ servlets/resolver/errorhandler/
Author: bdelacretaz
Date: Tue Oct 29 13:40:44 2013
New Revision: 1536709
URL: http://svn.apache.org/r1536709
Log:
Remove unused JspTestBase base class
Removed:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java?rev=1536709&r1=1536708&r2=1536709&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java Tue Oct 29 13:40:44 2013
@@ -16,8 +16,10 @@
*/
package org.apache.sling.launchpad.webapp.integrationtest;
+import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
+
/** Test the executeScript test method */
-public class ExecuteScriptTest extends JspTestBase {
+public class ExecuteScriptTest extends RenderingTestBase {
public void testEspScript() throws Exception {
final String content = executeScript("serverscripts/servertest.esp");
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java?rev=1536709&r1=1536708&r2=1536709&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java Tue Oct 29 13:40:44 2013
@@ -20,11 +20,10 @@ package org.apache.sling.launchpad.webap
import java.util.HashMap;
import java.util.Map;
-
-import org.apache.sling.launchpad.webapp.integrationtest.JspTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
/** Test the SLING-2094 JSP errorpage statement */
-public class SLING2094Test extends JspTestBase {
+public class SLING2094Test extends RenderingTestBase {
public final static String TEST_ROOT = "/apps/sling2094";
private String testNodePath;
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java?rev=1536709&r1=1536708&r2=1536709&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java Tue Oct 29 13:40:44 2013
@@ -20,10 +20,9 @@ package org.apache.sling.launchpad.webap
import java.util.HashMap;
import java.util.Map;
+import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.JspTestBase;
-
-public class SLING457Test extends JspTestBase {
+public class SLING457Test extends RenderingTestBase {
private String testRootUrl;
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java?rev=1536709&r1=1536708&r2=1536709&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java Tue Oct 29 13:40:44 2013
@@ -19,7 +19,8 @@ package org.apache.sling.launchpad.webap
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.launchpad.webapp.integrationtest.JspTestBase;
+import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
+
import org.apache.sling.servlets.post.SlingPostConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +30,7 @@ import org.slf4j.LoggerFactory;
* Test JSP and page to it and then checks to make sure the page responds with a
* 200 response.
*/
-public class SlingJSPTaglibTest extends JspTestBase {
+public class SlingJSPTaglibTest extends RenderingTestBase {
private static final Logger log = LoggerFactory
.getLogger(SlingJSPTaglibTest.class);
private String testPage;
Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java?rev=1536709&r1=1536708&r2=1536709&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java Tue Oct 29 13:40:44 2013
@@ -22,12 +22,11 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.httpclient.NameValuePair;
-import org.apache.sling.launchpad.webapp.integrationtest.JspTestBase;
import org.apache.sling.servlets.post.SlingPostConstants;
-
+import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
/** Test the sling error handling mechanism http://sling.apache.org/site/errorhandling.html*/
-public class ErrorHandlingTest extends JspTestBase {
+public class ErrorHandlingTest extends RenderingTestBase {
public final static String TEST_ROOT = "/apps";