From: markt Date: Mon, 8 Feb 2010 01:58:06 +0000 (+0000) Subject: Add test cases for bug 48668 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b63ac35d24e5e476c15fea939403ed5c15467454;p=tomcat7.0 Add test cases for bug 48668 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907534 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/test/org/apache/jasper/compiler/TestParser.java b/test/org/apache/jasper/compiler/TestParser.java index 0b9ad4ef2..8b714f8a6 100644 --- a/test/org/apache/jasper/compiler/TestParser.java +++ b/test/org/apache/jasper/compiler/TestParser.java @@ -45,6 +45,40 @@ public class TestParser extends TomcatBaseTest { assertEcho(result, "01-\\"); } + public void testBug48668a() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = + new File("test/webapp"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + ByteChunk res = getUrl("http://localhost:" + getPort() + + "/test/bug48668a.jsp"); + String result = res.toString(); + assertEcho(result, "00-Hello world

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

${foo.bar}"); + } + + public void testBug48668b() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = + new File("test/webapp"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + ByteChunk res = getUrl("http://localhost:" + getPort() + + "/test/bug48668b.jsp"); + String result = res.toString(); + System.out.println(result); + assertEcho(result, "00-Hello world

#{foo.bar}"); + } + /** Assertion for text printed by tags:echo */ private static void assertEcho(String result, String expected) { assertTrue(result.indexOf("

" + expected + "

") > 0); diff --git a/test/webapp/bug48668a.jsp b/test/webapp/bug48668a.jsp new file mode 100644 index 000000000..e995c2c56 --- /dev/null +++ b/test/webapp/bug48668a.jsp @@ -0,0 +1,26 @@ +<%-- + 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. +--%> +<%@ page isELIgnored="true" %> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> + + Bug 48668a test case + +

#{foo.bar}

+

${foo.bar}

+ + + diff --git a/test/webapp/bug48668b.jsp b/test/webapp/bug48668b.jsp new file mode 100644 index 000000000..3e44e3290 --- /dev/null +++ b/test/webapp/bug48668b.jsp @@ -0,0 +1,25 @@ +<%-- + 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. +--%> +<%@ page deferredSyntaxAllowedAsLiteral="true" %> +<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %> + + Bug 48668b test case + +

#{foo.bar}

+ + +