You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2009/07/23 15:15:41 UTC
svn commit: r797058 - in /tomcat/trunk/test/org/apache: TestAll.java
el/TestELEvaluation.java el/parser/
Author: kkolinko
Date: Thu Jul 23 13:15:41 2009
New Revision: 797058
URL: http://svn.apache.org/viewvc?rev=797058&view=rev
Log:
Moved and renamed TestELParser class.
Some more EL tests to be added later.
Added:
tomcat/trunk/test/org/apache/el/TestELEvaluation.java
- copied, changed from r796266, tomcat/trunk/test/org/apache/el/parser/TestELParser.java
Removed:
tomcat/trunk/test/org/apache/el/parser/
Modified:
tomcat/trunk/test/org/apache/TestAll.java
Modified: tomcat/trunk/test/org/apache/TestAll.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=797058&r1=797057&r2=797058&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/TestAll.java (original)
+++ tomcat/trunk/test/org/apache/TestAll.java Thu Jul 23 13:15:41 2009
@@ -4,7 +4,7 @@
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 @@
// 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);
Copied: tomcat/trunk/test/org/apache/el/TestELEvaluation.java (from r796266, tomcat/trunk/test/org/apache/el/parser/TestELParser.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELEvaluation.java?p2=tomcat/trunk/test/org/apache/el/TestELEvaluation.java&p1=tomcat/trunk/test/org/apache/el/parser/TestELParser.java&r1=796266&r2=797058&rev=797058&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestELParser.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELEvaluation.java Thu Jul 23 13:15:41 2009
@@ -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 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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org