From e556007ee0804d5b43c960972215968656da5b32 Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 24 Jul 2011 11:12:58 +0000 Subject: [PATCH] Another test case for bug 51544 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1150339 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/el/TestELInJsp.java | 16 ++++++++++++++++ test/webapp-3.0/bug51544.jsp | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 test/webapp-3.0/bug51544.jsp diff --git a/test/org/apache/el/TestELInJsp.java b/test/org/apache/el/TestELInJsp.java index 51bc8edb5..c3ed96c8c 100644 --- a/test/org/apache/el/TestELInJsp.java +++ b/test/org/apache/el/TestELInJsp.java @@ -325,6 +325,22 @@ public class TestELInJsp extends TomcatBaseTest { assertEcho(result, "00-" + TesterFunctions.Inner$Class.RETVAL); } + public void testBug51544() throws Exception { + Tomcat tomcat = getTomcatInstance(); + + File appDir = new File("test/webapp-3.0"); + // app dir is relative to server home + tomcat.addWebapp(null, "/test", appDir.getAbsolutePath()); + + tomcat.start(); + + ByteChunk res = getUrl("http://localhost:" + getPort() + + "/test/bug51544.jsp"); + + String result = res.toString(); + assertEcho(result, "Empty list: true"); + } + public void testELMisc() throws Exception { Tomcat tomcat = getTomcatInstance(); diff --git a/test/webapp-3.0/bug51544.jsp b/test/webapp-3.0/bug51544.jsp new file mode 100644 index 000000000..ff266924d --- /dev/null +++ b/test/webapp-3.0/bug51544.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 import="java.util.Collections" %> + + Bug 51544 test case + <% + pageContext.setAttribute("list",Collections.emptyList()); + %> + +

Empty list: ${list.isEmpty()}

+ + \ No newline at end of file -- 2.11.0