From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 31 Jan 2010 00:56:47 +0000 (+0000)
Subject: Test mixing ${...} and #{...} in the same expression
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f65b909d9dcdb7754ff3627cfd8b29ae573749d6;p=tomcat7.0

Test mixing ${...} and #{...} in the same expression

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

diff --git a/test/org/apache/el/TestELEvaluation.java b/test/org/apache/el/TestELEvaluation.java
index ad1619844..d394c2d4a 100644
--- a/test/org/apache/el/TestELEvaluation.java
+++ b/test/org/apache/el/TestELEvaluation.java
@@ -171,6 +171,22 @@ public class TestELEvaluation extends TestCase {
         assertTrue(null == null);
     }
 
+    /**
+     * Test mixing ${...} and #{...} in the same expression.
+     */
+    public void testMixedTypes() {
+        // Mixing types should throw an error
+        Exception e = null;
+        try {
+            evaluateExpression("${1+1}#{1+1}");
+        } catch (ELException el) {
+            e = el;
+        }
+        assertNotNull(e);
+    }
+
+
+
     // ************************************************************************
 
     private String evaluateExpression(String expression) {