From 27cba0db7e6a8c6dc1d80218e8cb0de7a42a1cb5 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 23 Jul 2009 13:15:41 +0000
Subject: [PATCH] Moved and renamed TestELParser class. Some more EL tests to
 be added later.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@797058 13f79535-47bb-0310-9956-ffa450edef68
---
 test/org/apache/TestAll.java                       |  4 ++--
 .../TestELParser.java => TestELEvaluation.java}    | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)
 rename test/org/apache/el/{parser/TestELParser.java => TestELEvaluation.java} (81%)

diff --git a/test/org/apache/TestAll.java b/test/org/apache/TestAll.java
index 78a070bd3..1a6bfc850 100644
--- a/test/org/apache/TestAll.java
+++ b/test/org/apache/TestAll.java
@@ -4,7 +4,7 @@ import org.apache.catalina.ha.session.TestSerializablePrincipal;
 import org.apache.catalina.startup.TestTomcat;
 import org.apache.catalina.tribes.test.TribesTestSuite;
 import org.apache.el.lang.TestELSupport;
-import org.apache.el.parser.TestELParser;
+import org.apache.el.TestELEvaluation;
 import org.apache.tomcat.util.http.TestCookies;
 import org.apache.tomcat.util.res.TestStringManager;
 
@@ -25,7 +25,7 @@ public class TestAll {
         // suite.addTest(TribesTestSuite.suite());
         // o.a.el
         suite.addTestSuite(TestELSupport.class);
-        suite.addTestSuite(TestELParser.class);
+        suite.addTestSuite(TestELEvaluation.class);
         // o.a.tomcat.util
         suite.addTestSuite(TestStringManager.class);
         
diff --git a/test/org/apache/el/parser/TestELParser.java b/test/org/apache/el/TestELEvaluation.java
similarity index 81%
rename from test/org/apache/el/parser/TestELParser.java
rename to test/org/apache/el/TestELEvaluation.java
index 2cce2098b..c441be793 100644
--- a/test/org/apache/el/parser/TestELParser.java
+++ b/test/org/apache/el/TestELEvaluation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.el.parser;
+package org.apache.el;
 
 import javax.el.ValueExpression;
 
@@ -24,34 +24,36 @@ import org.apache.jasper.el.ELContextImpl;
 
 import junit.framework.TestCase;
 
-public class TestELParser extends TestCase {
-    
-    public void testBug45511() {
+/**
+ * Tests for EL parsing and evaluation.
+ */
+public class TestELEvaluation extends TestCase {
+
+    public void testParserBug45511() {
         // Test cases provided by OP
         assertEquals("true", evaluateExpression("${empty ('')}"));
         assertEquals("true", evaluateExpression("${empty('')}"));
         assertEquals("false", evaluateExpression("${(true) and (false)}"));
         assertEquals("false", evaluateExpression("${(true)and(false)}"));
     }
-    
 
-    public void testBug42565() {
+    public void testParserBug42565() {
         // Test cases provided by OP
         assertEquals("false", evaluateExpression("${false?true:false}"));
     }
 
-
     public void testMisc() {
         // From bug 45451 - not a parser bug
         assertEquals("\\", evaluateExpression("\\\\"));
     }
-    
+
+    // ************************************************************************
 
     private String evaluateExpression(String expression) {
         ELContextImpl ctx = new ELContextImpl();
         ExpressionFactoryImpl exprFactory = new ExpressionFactoryImpl();
-        ValueExpression ve =
-            exprFactory.createValueExpression(ctx, expression, String.class );
+        ValueExpression ve = exprFactory.createValueExpression(ctx, expression,
+                String.class);
         return (String) ve.getValue(ctx);
     }
 }
-- 
2.11.0