From d1031567833ace6866f43b4d8e6666a22b466020 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 7 Oct 2010 15:33:46 +0000 Subject: [PATCH] Fix some failing tests. No regression in Tomcat/Jasper, just need to take account of changes in test framework. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1005493 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/jasper/compiler/TestJspDocumentParser.java | 16 +++++++--------- test/org/apache/jasper/compiler/TestValidator.java | 14 +++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/test/org/apache/jasper/compiler/TestJspDocumentParser.java b/test/org/apache/jasper/compiler/TestJspDocumentParser.java index 08b636c7d..0049df0c2 100644 --- a/test/org/apache/jasper/compiler/TestJspDocumentParser.java +++ b/test/org/apache/jasper/compiler/TestJspDocumentParser.java @@ -20,8 +20,11 @@ package org.apache.jasper.compiler; import java.io.File; import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; +import org.apache.tomcat.util.buf.ByteChunk; public class TestJspDocumentParser extends TomcatBaseTest { @@ -35,15 +38,10 @@ public class TestJspDocumentParser extends TomcatBaseTest { tomcat.start(); - Exception e = null; - try { - getUrl("http://localhost:" + getPort() + "/test/bug47977.jspx"); - } catch (IOException ioe) { - e = ioe; - } - - // Failure is expected - assertNotNull(e); + int rc = getUrl("http://localhost:" + getPort() + + "/test/bug47977.jspx", new ByteChunk(), null); + + assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc); } public void testBug48827() throws Exception { diff --git a/test/org/apache/jasper/compiler/TestValidator.java b/test/org/apache/jasper/compiler/TestValidator.java index 2040bd0ff..c1eb3151e 100644 --- a/test/org/apache/jasper/compiler/TestValidator.java +++ b/test/org/apache/jasper/compiler/TestValidator.java @@ -20,6 +20,7 @@ package org.apache.jasper.compiler; import java.io.File; import java.io.IOException; +import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.TagSupport; @@ -39,15 +40,10 @@ public class TestValidator extends TomcatBaseTest { tomcat.start(); - Exception e = null; - try { - getUrl("http://localhost:" + getPort() + "/test/bug47331.jsp"); - } catch (IOException ioe) { - e = ioe; - } - - // Failure is expected - assertNotNull(e); + int rc = getUrl("http://localhost:" + getPort() + + "/test/bug47331.jsp", new ByteChunk(), null); + + assertEquals(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, rc); } -- 2.11.0