From 229e22b5f30291987fdd00c5a2d5852924705750 Mon Sep 17 00:00:00 2001 From: kkolinko Date: Sat, 6 Mar 2010 20:46:06 +0000 Subject: [PATCH] Additional tests for https://issues.apache.org/bugzilla/show_bug.cgi?id=48668 The TestCase currently passes: the parts that do not pass currently are commented-out: - in bug48668a.jsp: those that prevent JSP from being compiled - in TestParser.java: also those that provide wrong output. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919847 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/jasper/compiler/TestParser.java | 29 +++++++++++++++++++++ test/webapp/WEB-INF/tags/bug48668.tagx | 26 +++++++++++++++++++ test/webapp/bug48668a.jsp | 34 +++++++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 test/webapp/WEB-INF/tags/bug48668.tagx diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index aa04249cc..4d3654b6f 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -58,8 +58,37 @@ public class TestParser extends TomcatBaseTest { ByteChunk res = getUrl("http://localhost:" + getPort() + "/test/bug48668a.jsp"); String result = res.toString(); + System.out.println(result); assertEcho(result, "00-Hello world

#{foo.bar}"); assertEcho(result, "01-Hello world

${foo.bar}"); + assertEcho(result, "10-Hello ${'foo.bar}"); + assertEcho(result, "11-Hello ${'foo.bar}"); + //assertEcho(result, "12-Hello #{'foo.bar}"); + //assertEcho(result, "13-Hello #{'foo.bar}"); + assertEcho(result, "14-Hello ${'foo}"); + assertEcho(result, "15-Hello ${'foo}"); + //assertEcho(result, "16-Hello #{'foo}"); + //assertEcho(result, "17-Hello #{'foo}"); + assertEcho(result, "18-Hello ${'foo.bar}"); + assertEcho(result, "19-Hello ${'foo.bar}"); + assertEcho(result, "20-Hello #{'foo.bar}"); + assertEcho(result, "21-Hello #{'foo.bar}"); + assertEcho(result, "30-Hello ${'foo}"); + assertEcho(result, "31-Hello ${'foo}"); + assertEcho(result, "32-Hello #{'foo}"); + assertEcho(result, "33-Hello #{'foo}"); + assertEcho(result, "34-Hello ${'foo}"); + //assertEcho(result, "35-Hello ${'foo}"); + assertEcho(result, "36-Hello #{'foo}"); + //assertEcho(result, "37-Hello #{'foo}"); + assertEcho(result, "40-Hello ${'foo}"); + //assertEcho(result, "41-Hello ${'foo}"); + //assertEcho(result, "42-Hello #{'foo}"); + //assertEcho(result, "43-Hello #{'foo}"); + assertEcho(result, "50-Hello ${'foo}"); + //assertEcho(result, "51-Hello ${'foo}"); + //assertEcho(result, "52-Hello #{'foo}"); + //assertEcho(result, "53-Hello #{'foo}"); } public void testBug48668b() throws Exception { diff --git a/test/webapp/WEB-INF/tags/bug48668.tagx b/test/webapp/WEB-INF/tags/bug48668.tagx new file mode 100644 index 000000000..db8587acc --- /dev/null +++ b/test/webapp/WEB-INF/tags/bug48668.tagx @@ -0,0 +1,26 @@ + + + + + + + +${expr}${noexpr} + + + diff --git a/test/webapp/bug48668a.jsp b/test/webapp/bug48668a.jsp index e995c2c56..94a944229 100644 --- a/test/webapp/bug48668a.jsp +++ b/test/webapp/bug48668a.jsp @@ -21,6 +21,40 @@

#{foo.bar}

${foo.bar}

+ +

10-

11-Hello

+<%--

12-

--%> +<%--

13-Hello

--%> + +

14-}

15-Hello }

+<%--

16-}

--%> +<%--

17-Hello }

--%> + +

18-Hello ${'foo.bar}

19-Hello ${'foo.bar}

20-Hello #{'foo.bar}

21-Hello #{'foo.bar}

+ +

30-

31-Hello

32-

33-Hello

34-Hello ${'foo}

+<%--

35-Hello ${'foo}

--%> +

36-Hello #{'foo}

+<%--

37-Hello #{'foo}

--%> + +

40-Hello ${'foo}

41-Hello ${'foo}

42-Hello #{'foo}

+<%--

43-Hello #{'foo}

--%> + +

50-Hello ${'foo}

51-Hello ${'foo}

52-Hello #{'foo}

+<%--

53-Hello #{'foo}

--%> -- 2.11.0