Author: asanso
Date: Wed Mar 6 15:02:04 2013
New Revision: 1453363
URL: http://svn.apache.org/r1453363
Log:
SLING-2718 - Add integration test for the error handling mechanism.
- remove unused checks
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/errorhandler/testErrorHandler/testErrorHandler.jsp
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=1453363&r1=1453362&r2=1453363&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
Wed Mar 6 15:02:04 2013
@@ -81,30 +81,26 @@ public class ErrorHandlingTest extends J
final String expected = "Internal Server Error (500) - custom
error page";
final String url = testNodePath +SELECTOR_500+".html";
assertContains(getContent(url, CONTENT_TYPE_HTML,null,500),
expected);
- //assertNotContains(getContent(url,
CONTENT_TYPE_HTML,null,200), "All good");
- }
+ }
public void test_401_errorhandling() throws IOException{
final String expected = "401 Unauthorized - custom error page";
final String url = testNodePath +SELECTOR_401+".html";
assertContains(getContent(url, CONTENT_TYPE_HTML,null,401),
expected);
- //assertNotContains(getContent(url,
CONTENT_TYPE_HTML,null,401), "All good");
}
public void test_throwable_errorhandling() throws IOException{
final String expected = "Exception thrown - custom error page";
final String url = testNodePath +SELECTOR_THROWABLE+".html";
assertContains(getContent(url, CONTENT_TYPE_HTML,null,200),
expected);
- assertNotContains(getContent(url, CONTENT_TYPE_HTML,null,200),
"All good");
- }
+ }
public void test_500_errorhandling_POST_operation() throws IOException{
final String expected = "Internal Server Error (500) - custom
error page";
final String url = testNodePath +".html";
uploadTestScript(THROW_ERROR_PATH+"/"+"POST.jsp",
THROW_ERROR_PATH+"/"+"POST.jsp");
assertContains(getContent(url,
CONTENT_TYPE_HTML,null,500,HTTP_METHOD_POST), expected);
- //assertNotContains(getContent(url,
CONTENT_TYPE_HTML,null,200), "All good");
- }
+ }
public void test_errorhandling_POST_operation_SlingPostServlet() throws
IOException{
final String expected = "Exception thrown - custom error page";
Modified:
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/errorhandler/testErrorHandler/testErrorHandler.jsp
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/errorhandler/testErrorHandler/testErrorHandler.jsp?rev=1453363&r1=1453362&r2=1453363&view=diff
==============================================================================
---
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/errorhandler/testErrorHandler/testErrorHandler.jsp
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/resources/integration-test/servlets/errorhandler/testErrorHandler/testErrorHandler.jsp
Wed Mar 6 15:02:04 2013
@@ -38,4 +38,3 @@ if(Arrays.asList(slingRequest.getRequest
throw new Exception("throwable selector was specified");
}
%>
-All good
