Author: markt
Date: Sun Jul 14 18:33:06 2013
New Revision: 1503017
URL: http://svn.apache.org/r1503017
Log:
Implement the semicolon syntax.
Includes the initial unit tests for this syntax.
Added:
tomcat/trunk/test/org/apache/el/parser/TestAstSemicolon.java (with props)
Modified:
tomcat/trunk/java/org/apache/el/parser/AstSemicolon.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstSemicolon.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstSemicolon.java?rev=1503017&r1=1503016&r2=1503017&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstSemicolon.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstSemicolon.java Sun Jul 14
18:33:06 2013
@@ -17,10 +17,33 @@
/* Generated By:JJTree: Do not edit this line. AstSemicolon.java Version 4.3 */
package org.apache.el.parser;
-public
-class AstSemicolon extends SimpleNode {
- public AstSemicolon(int id) {
- super(id);
- }
+import javax.el.ELException;
+
+import org.apache.el.lang.EvaluationContext;
+
+public class AstSemicolon extends SimpleNode {
+
+ public AstSemicolon(int id) {
+ super(id);
+ }
+
+
+ @Override
+ public Object getValue(EvaluationContext ctx) throws ELException {
+
+ // Evaluate and throw away
+ children[0].getValue(ctx);
+
+ return children[1].getValue(ctx);
+ }
+
+
+ @Override
+ public Class<?> getType(EvaluationContext ctx) throws ELException {
+ // Evaluate and throw away
+ children[0].getType(ctx);
+
+ return children[1].getType(ctx);
+ }
}
/* JavaCC - OriginalChecksum=ce956594ca572a4e452fe4f084a03099 (do not edit
this line) */
Added: tomcat/trunk/test/org/apache/el/parser/TestAstSemicolon.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TestAstSemicolon.java?rev=1503017&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestAstSemicolon.java (added)
+++ tomcat/trunk/test/org/apache/el/parser/TestAstSemicolon.java Sun Jul 14
18:33:06 2013
@@ -0,0 +1,66 @@
+/*
+ * 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.ELManager;
+import javax.el.ELProcessor;
+import javax.el.ExpressionFactory;
+import javax.el.ValueExpression;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAstSemicolon {
+
+ @Test
+ public void testGetValue01() {
+ ELProcessor processor = new ELProcessor();
+ Object result = processor.getValue("1;2", String.class);
+ Assert.assertEquals("2", result);
+ }
+
+
+ @Test
+ public void testGetValue02() {
+ ELProcessor processor = new ELProcessor();
+ Object result = processor.getValue("1;2", Integer.class);
+ Assert.assertEquals(Integer.valueOf(2), result);
+ }
+
+
+ @Test
+ public void testGetValue03() {
+ ELProcessor processor = new ELProcessor();
+ Object result = processor.getValue("1;2 + 3", Integer.class);
+ Assert.assertEquals(Integer.valueOf(5), result);
+ }
+
+
+ @Test
+ public void testGetType() {
+ ELProcessor processor = new ELProcessor();
+ ELContext context = processor.getELManager().getELContext();
+ ExpressionFactory factory = ELManager.getExpressionFactory();
+
+ ValueExpression ve = factory.createValueExpression(
+ context, "${1+1;2+2}", Integer.class);
+
+ Assert.assertEquals(Number.class, ve.getType(context));
+ Assert.assertEquals(Integer.valueOf(4), ve.getValue(context));
+ }
+}
Propchange: tomcat/trunk/test/org/apache/el/parser/TestAstSemicolon.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
