From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 11 Apr 2010 18:09:16 +0000 (+0000)
Subject: Add test cases for https://issues.apache.org/bugzilla/show_bug.cgi?id=49081
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6d5e305ac97147e2e8229741bbd229991ed9e2f4;p=tomcat7.0

Add test cases for https://issues.apache.org/bugzilla/show_bug.cgi?id=49081
"#${1+1}" should evaluate to "#2"

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@932965 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/org/apache/el/parser/TestELParser.java b/test/org/apache/el/parser/TestELParser.java
new file mode 100644
index 000000000..62ea0328d
--- /dev/null
+++ b/test/org/apache/el/parser/TestELParser.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package org.apache.el.parser;
+
+import javax.el.ELContext;
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
+
+import org.apache.jasper.el.ELContextImpl;
+
+import junit.framework.TestCase;
+
+public class TestELParser extends TestCase {
+
+    public void testBug49081() {
+        ExpressionFactory factory = ExpressionFactory.newInstance();
+        ELContext context = new ELContextImpl();
+        
+        ValueExpression ve = factory.createValueExpression(
+                context, "#${1+1}", String.class);
+
+        // First check the basics work
+        String result = (String) ve.getValue(context);
+        assertEquals("#2", result);
+    }
+
+}
diff --git a/test/org/apache/jasper/compiler/TestAttributeParser.java b/test/org/apache/jasper/compiler/TestAttributeParser.java
index 42e0d87d3..0d6e1a6c0 100644
--- a/test/org/apache/jasper/compiler/TestAttributeParser.java
+++ b/test/org/apache/jasper/compiler/TestAttributeParser.java
@@ -113,6 +113,10 @@ public class TestAttributeParser extends TestCase {
         assertEquals("\\2", evalAttr("\\\\${1+1}", '\"'));
     }
     
+    public void testBug49081() {
+        assertEquals("#2", evalAttr("#${1+1}", '\"'));
+    }
+
     public void testLiteral() {
         // Inspired by work on bug 45451, comments from kkolinko on the dev
         // list and looking at the spec to find some edge cases