Author: fmeschbe
Date: Wed Jan 28 15:57:39 2009
New Revision: 738520
URL: http://svn.apache.org/viewvc?rev=738520&view=rev
Log:
SLING-601 Fix recursive loop detection test to check for the correct
exception
Modified:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
Modified:
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=738520&r1=738519&r2=738520&view=diff
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
Wed Jan 28 15:57:39 2009
@@ -125,8 +125,9 @@
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"));
+ 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
Modified:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java?rev=738520&r1=738519&r2=738520&view=diff
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
Wed Jan 28 15:57:39 2009
@@ -127,8 +127,9 @@
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"));
+ 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
Modified:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java?rev=738520&r1=738519&r2=738520&view=diff
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
Wed Jan 28 15:57:39 2009
@@ -125,8 +125,9 @@
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"));
+ 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
Modified:
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java?rev=738520&r1=738519&r2=738520&view=diff
==============================================================================
---
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
(original)
+++
incubator/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
Wed Jan 28 15:57:39 2009
@@ -128,8 +128,9 @@
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"));
+ 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
