svn commit: r1502971 - in /tomcat/trunk: java/org/apache/el/parser/AstListData.java test/org/apache/el/parser/TestAstListData.java

[ma...@apache.org]

Author: markt
Date: Sun Jul 14 13:18:12 2013
New Revision: 1502971

URL: http://svn.apache.org/r1502971
Log:
Implement the List construction syntax.
Includes the initial unit tests for this syntax.

Added:
    tomcat/trunk/test/org/apache/el/parser/TestAstListData.java   (with props)
Modified:
    tomcat/trunk/java/org/apache/el/parser/AstListData.java

Modified: tomcat/trunk/java/org/apache/el/parser/AstListData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstListData.java?rev=1502971&r1=1502970&r2=1502971&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstListData.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstListData.java Sun Jul 14 13:18:12 2013
@@ -17,10 +17,34 @@
 /* Generated By:JJTree: Do not edit this line. AstListData.java Version 4.3 */
 package org.apache.el.parser;
 
-public
-class AstListData extends SimpleNode {
-  public AstListData(int id) {
-    super(id);
-  }
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.el.ELException;
+
+import org.apache.el.lang.EvaluationContext;
+
+public class AstListData extends SimpleNode {
+    public AstListData(int id) {
+        super(id);
+    }
+
+    @Override
+    public Object getValue(EvaluationContext ctx) throws ELException {
+        List<Object> result = new ArrayList<>();
+
+        if (children != null) {
+            for (Node child : children) {
+                result.add(child.getValue(ctx));
+            }
+        }
+
+        return result;
+    }
+
+    @Override
+    public Class<?> getType(EvaluationContext ctx) throws ELException {
+        return List.class;
+    }
 }
 /* JavaCC - OriginalChecksum=7f2694086a9ba64558ee39d1cd719db1 (do not edit this line) */

Added: tomcat/trunk/test/org/apache/el/parser/TestAstListData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/parser/TestAstListData.java?rev=1502971&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/el/parser/TestAstListData.java (added)
+++ tomcat/trunk/test/org/apache/el/parser/TestAstListData.java Sun Jul 14 13:18:12 2013
@@ -0,0 +1,87 @@
+/*
+ * 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+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 TestAstListData {
+
+    private static final List<String> simpleList = new ArrayList<>();
+    private static final List<Object> nestedList = new ArrayList<>();
+
+    static {
+        simpleList.add("a");
+        simpleList.add("b");
+        simpleList.add("c");
+        simpleList.add("b");
+        simpleList.add("c");
+        nestedList.add(simpleList);
+        nestedList.add(Collections.EMPTY_LIST);
+        nestedList.add("d");
+    }
+
+
+    @Test
+    public void testSimple01() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.getValue(
+                "['a','b','c', 'b', 'c']", List.class);
+        Assert.assertEquals(simpleList, result);
+    }
+
+
+    @Test
+    public void testSimple02() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.getValue("[]", List.class);
+        Assert.assertEquals(Collections.EMPTY_LIST, result);
+    }
+
+
+    @Test
+    public void testNested01() {
+        ELProcessor processor = new ELProcessor();
+        Object result = processor.getValue(
+                "[['a','b','c','b','c'],[],'d']", List.class);
+        Assert.assertEquals(nestedList, result);
+    }
+
+
+    @Test
+    public void testGetType() {
+        ELProcessor processor = new ELProcessor();
+        ELContext context = processor.getELManager().getELContext();
+        ExpressionFactory factory = ELManager.getExpressionFactory();
+
+        ValueExpression ve = factory.createValueExpression(
+                context, "${['a','b','c','b','c']}", List.class);
+
+        Assert.assertEquals(List.class, ve.getType(context));
+        Assert.assertEquals(simpleList, ve.getValue(context));
+    }
+}

Propchange: tomcat/trunk/test/org/apache/el/parser/TestAstListData.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org