From 4269b230cb2fb03645004c1db4d36d0741d277ab Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 6 Jan 2010 17:41:11 +0000
Subject: [PATCH] Additional tests for the specific escaping (of "${" and "#{")
 for LiteralExpressions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@896571 13f79535-47bb-0310-9956-ffa450edef68
---
 test/org/apache/el/TestELEvaluation.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/org/apache/el/TestELEvaluation.java b/test/org/apache/el/TestELEvaluation.java
index e1ca9c05c..08f6d9171 100644
--- a/test/org/apache/el/TestELEvaluation.java
+++ b/test/org/apache/el/TestELEvaluation.java
@@ -52,6 +52,22 @@ public class TestELEvaluation extends TestCase {
 
         // '\' is only an escape character inside a StringLiteral
         assertEquals("\\\\", evaluateExpression("\\\\"));
+        
+        /*
+         * LiteralExpresions can only contain ${ or #{ if escaped with \
+         * \ is not an escape character in any other circumstances including \\
+         */
+        assertEquals("\\", evaluateExpression("\\"));
+        assertEquals("$", evaluateExpression("$"));
+        assertEquals("#", evaluateExpression("#"));
+        assertEquals("\\$", evaluateExpression("\\$"));
+        assertEquals("\\#", evaluateExpression("\\#"));
+        assertEquals("\\\\$", evaluateExpression("\\\\$"));
+        assertEquals("\\\\#", evaluateExpression("\\\\#"));
+        assertEquals("${", evaluateExpression("\\${"));
+        assertEquals("#{", evaluateExpression("\\#{"));
+        assertEquals("\\${", evaluateExpression("\\\\${"));
+        assertEquals("\\#{", evaluateExpression("\\\\#{"));
     }
 
     public void testParserStringLiteral() {
-- 
2.11.0