Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 12041 invoked from network); 10 Jan 2010 11:37:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jan 2010 11:37:41 -0000 Received: (qmail 86825 invoked by uid 500); 10 Jan 2010 11:37:40 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 86753 invoked by uid 500); 10 Jan 2010 11:37:40 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 86742 invoked by uid 99); 10 Jan 2010 11:37:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2010 11:37:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2010 11:37:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 54ACD2388906; Sun, 10 Jan 2010 11:37:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r897619 - in /tomcat/trunk/test: org/apache/el/TestELInJsp.java webapp/bug36923.jsp Date: Sun, 10 Jan 2010 11:37:17 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100110113717.54ACD2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Sun Jan 10 11:37:16 2010 New Revision: 897619 URL: http://svn.apache.org/viewvc?rev=897619&view=rev Log: Add a test case for bug36923 Added: tomcat/trunk/test/webapp/bug36923.jsp (with props) Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=897619&r1=897618&r2=897619&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original) +++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Sun Jan 10 11:37:16 2010 @@ -30,6 +30,22 @@ */ public class TestELInJsp extends TomcatBaseTest { + public void testBug36923() 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/bug36923.jsp"); + + String result = res.toString(); + assertTrue(result.indexOf("00-${hello world}") > 0); + } + public void testBug42565() throws Exception { Tomcat tomcat = getTomcatInstance(); Added: tomcat/trunk/test/webapp/bug36923.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/bug36923.jsp?rev=897619&view=auto ============================================================================== --- tomcat/trunk/test/webapp/bug36923.jsp (added) +++ tomcat/trunk/test/webapp/bug36923.jsp Sun Jan 10 11:37:16 2010 @@ -0,0 +1,24 @@ +<%-- + 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" %> + + Bug 44994 test case + +

00-${<%= "hello world" %>}

+ + + Propchange: tomcat/trunk/test/webapp/bug36923.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/test/webapp/bug36923.jsp ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org