SLING-760 - move escaping code to DefaultErrorHandlerServlet (and SlingMainServlet, but that's only used as a last resort IIUC) and add tests
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk@731608 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
new file mode 100644
index 0000000..16c0107
--- /dev/null
+++ b/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
@@ -0,0 +1,53 @@
+/*
+ * 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.issues;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.sling.commons.testing.integration.HttpTestBase;
+
+public class SLING760Test extends HttpTestBase {
+ public static final String TEST_PATH = "/" + SLING760Test.class.getSimpleName();
+
+ /** Verify that all instances of our error message are escaped in response, which
+ * is generated by the default Sling error handler */
+ public void testEscapedErrorMessages() throws Exception {
+ final String [] mustContain = { "<characters/>", "filtered & escaped" };
+ final String [] mustNotContain = { "<characters/>", "filtered & escaped" };
+
+ final TestNode tn = new TestNode(HTTP_BASE_URL + TEST_PATH, null);
+
+ try {
+ uploadTestScript(tn.scriptPath, "issues/sling760/throw-with-markup.esp", "html.esp");
+ final String content = getContent(tn.nodeUrl + ".html", CONTENT_TYPE_HTML,
+ null, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+
+ for(String str : mustContain) {
+ assertTrue("Content must contain " + str + " (" + content + ")", content.contains(str));
+ }
+
+ for(String str : mustNotContain) {
+ assertFalse("Content must NOT contain " + str + " (" + content + ")", content.contains(str));
+ }
+ } finally {
+ tn.delete();
+ }
+ }
+}
diff --git a/src/test/resources/integration-test/issues/sling760/throw-with-markup.esp b/src/test/resources/integration-test/issues/sling760/throw-with-markup.esp
new file mode 100644
index 0000000..f600bcf
--- /dev/null
+++ b/src/test/resources/integration-test/issues/sling760/throw-with-markup.esp
@@ -0,0 +1,5 @@
+<%
+// SLING-760: test an error message with characters that must
+// be escaped
+throw("This string contains <characters/> that must be filtered & escaped");
+%>
\ No newline at end of file
