Author: fmeschbe
Date: Mon Jan 26 11:47:53 2009
New Revision: 737674
URL: http://svn.apache.org/viewvc?rev=737674&view=rev
Log:
SLING-704 Add integration tests for SlingScriptHelper.forward
Added:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
(with props)
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-forced.esp
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-test.esp
Added:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java?rev=737674&view=auto
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
(added)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
Mon Jan 26 11:47:53 2009
@@ -0,0 +1,143 @@
+/*
+ * 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 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#forward) functionality */
+ public class ForwardTest extends HttpTestBase {
+
+ private String nodeUrlA;
+ private String testTextA;
+ private String nodeUrlB;
+ private String testTextB;
+ private String nodeUrlC;
+ private String nodeUrlD;
+ private String nodeUrlE;
+ private String scriptPath;
+ private String forcedResourceType;
+ private Set<String> toDelete = new HashSet<String>();
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // Create the test nodes under a path that's specific to this class to
+ // allow collisions
+ final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() +
"/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
+ final Map<String,String> props = new HashMap<String,String>();
+
+ // Create two test nodes and store their paths
+ testTextA = "Text A " + System.currentTimeMillis();
+ props.put("text", testTextA);
+ nodeUrlA = testClient.createNode(url, props);
+
+ // Node B stores the path of A, so that the test script can
+ // forward A when rendering B
+ testTextB = "Text B " + System.currentTimeMillis();
+ props.put("text", testTextB);
+ props.put("pathToInclude", new URL(nodeUrlA).getPath());
+ nodeUrlB = testClient.createNode(url, props);
+
+ // Node E is like B but with an extension on the forward path
+ props.put("pathToInclude", new URL(nodeUrlA).getPath() + ".html");
+ nodeUrlE = testClient.createNode(url, props);
+
+ // Node C is used for the infinite loop detection test
+ props.remove("pathToInclude");
+ 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");
+ props.put("forceResourceType", forcedResourceType);
+ props.put("pathToInclude", new URL(nodeUrlA).getPath());
+ nodeUrlD = testClient.createNode(url, props);
+
+ // Script for forced resource type
+ scriptPath = "/apps/" + forcedResourceType;
+ testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
+
toDelete.add(uploadTestScript(scriptPath,"forward-forced.esp","html.esp"));
+
+ // The main rendering script goes under /apps in the repository
+ scriptPath = "/apps/nt/unstructured";
+ testClient.mkdirs(WEBDAV_BASE_URL, scriptPath);
+
toDelete.add(uploadTestScript(scriptPath,"forward-test.esp","html.esp"));
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ for(String script : toDelete) {
+ testClient.delete(script);
+ }
+ }
+
+ public void testWithoutForward() throws IOException {
+ final String content = getContent(nodeUrlA + ".html",
CONTENT_TYPE_HTML);
+ assertTrue("Content includes ESP marker",content.contains("ESP
template"));
+ assertTrue("Content contains formatted test text",content.contains("<p
class=\"main\">" + testTextA + "</p>"));
+ }
+
+ public void testWithForward() throws IOException {
+ final String content = getContent(nodeUrlB + ".html",
CONTENT_TYPE_HTML);
+ assertTrue("Content includes ESP marker",content.contains("ESP
template"));
+ assertTrue("Content contains formatted test text",content.contains("<p
class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content +
")",!content.contains(testTextB));
+ }
+
+ public void testWithForwardAndExtension() throws IOException {
+ final String content = getContent(nodeUrlE + ".html",
CONTENT_TYPE_HTML);
+ assertTrue("Content includes ESP marker",content.contains("ESP
template"));
+ assertTrue("Content contains formatted test text",content.contains("<p
class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is not included (" + content +
")",!content.contains(testTextB));
+ }
+
+ public void xtestInfiniteLoopDetection() throws IOException {
+ // Node C has a property that causes an infinite include loop,
+ // Sling must indicate the problem in its response
+ final GetMethod get = new GetMethod(nodeUrlC + ".html");
+ httpClient.executeMethod(get);
+ final String content = get.getResponseBodyAsString();
+ assertTrue("Response contains infinite loop error message",
+ content.contains("InfiniteIncludeLoopException"));
+
+ // 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 testForcedResourceType() throws IOException {
+ final String content = getContent(nodeUrlD + ".html",
CONTENT_TYPE_HTML);
+ assertTrue("Content includes ESP marker",content.contains("ESP
template"));
+ assertTrue("Content contains formatted test text",content.contains("<p
class=\"main\">" + testTextA + "</p>"));
+ assertTrue("Text of node A is included (" + content +
")",!content.contains(testTextB));
+ assertTrue("Resource type has been forced (" + content +
")",content.contains("Forced resource type:" + forcedResourceType));
+ }
+}
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev Url
Added:
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-forced.esp
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-forced.esp?rev=737674&view=auto
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-forced.esp
(added)
+++
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-forced.esp
Mon Jan 26 11:47:53 2009
@@ -0,0 +1,31 @@
+<%
+
+/*
+ * 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.
+ */
+
+// used by ForwardTest
+%><html>
+ <body>
+ <h1>ESP template</h1>
+ <p class="main"><%= currentNode.text %></p>
+ <div>
+ Forced resource type:<%= resource.resourceType %></p>.
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added:
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-test.esp
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-test.esp?rev=737674&view=auto
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-test.esp
(added)
+++
incubator/sling/trunk/launchpad/testing/src/test/resources/integration-test/forward-test.esp
Mon Jan 26 11:47:53 2009
@@ -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.
+ */
+
+// used by ForwardTest
+
+// Test 3: Forced Resource Type
+if(currentNode.pathToInclude && currentNode.forceResourceType) {
+ sling.forward(currentNode.pathToInclude, currentNode.forceResourceType);
+}
+
+else
+
+// Test 1: Simple Forward
+if(currentNode.pathToInclude) {
+ sling.forward(currentNode.pathToInclude);
+}
+
+else
+
+// Test 2: Infinite Loop
+if(currentNode.testInfiniteLoop) {
+ // try to include the item itself, to cause an infinite loop
+ sling.forward(resource.getPath());
+} else {
+
+// Test 0: No Forward
+%><html>
+ <body>
+ <h1>ESP template</h1>
+ <p class="main"><%= currentNode.text %></p>
+ </body>
+</html><%
+
+}
+%>
\ No newline at end of file
