Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed lambda functions, local function and local variable references

Browse Source
This commit is contained in:
Andy Clement
2008-09-16 17:00:16 +00:00
parent efee3b3434
commit 95892dc993
13 changed files with 1784 additions and 2824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
org.springframework.expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

@@ -18,8 +18,6 @@ package org.springframework.expression.spel;
import java.util.ArrayList;
import java.util.HashMap;
import org.springframework.expression.spel.ast.Lambda;
/**
* Tests the evaluation of real expressions in a real context.
*
@@ -285,9 +283,9 @@ public class EvaluationTests extends ExpressionTestCase {
"[false, false, false, false, false, true, true, true, true, true]", ArrayList.class);
}
public void testProjection04() {
evaluate("{1,2,3,4,5,6,7,8,9,10}.!{$index>5?'y':'n'}", "[n, n, n, n, n, n, y, y, y, y]", ArrayList.class);
}
// public void testProjection04() {
// evaluate("{1,2,3,4,5,6,7,8,9,10}.!{$index>5?'y':'n'}", "[n, n, n, n, n, n, y, y, y, y]", ArrayList.class);
// }
public void testSelection01() {
evaluate("{1,2,3,4,5,6,7,8,9,10}.?{#isEven(#this) == 'y'}", "[2, 4, 6, 8, 10]", ArrayList.class);
@@ -298,9 +296,9 @@ public class EvaluationTests extends ExpressionTestCase {
SpelMessages.RESULT_OF_SELECTION_CRITERIA_IS_NOT_BOOLEAN);
}
public void testSelectionUsingIndex() {
evaluate("{1,2,3,4,5,6,7,8,9,10}.?{$index > 5 }", "[7, 8, 9, 10]", ArrayList.class);
}
// public void testSelectionUsingIndex() {
// evaluate("{1,2,3,4,5,6,7,8,9,10}.?{$index > 5 }", "[7, 8, 9, 10]", ArrayList.class);
// }
public void testSelectionFirst01() {
evaluate("{1,2,3,4,5,6,7,8,9,10}.^{#isEven(#this) == 'y'}", "2", Integer.class);
@@ -394,16 +392,6 @@ public class EvaluationTests extends ExpressionTestCase {
evaluate("#reverseString('hello')", "olleh", String.class);
}
// lambda
public void testLambdaNoArgs() {
evaluate("{|| true }", "{|| true }", Lambda.class);
}
public void testLambda01() {
evaluate("{|x,y| $x > $y ? $x : $y }", "{|x,y| ($x > $y) ? $x : $y }",
org.springframework.expression.spel.ast.Lambda.class);
}
//
// public void testLambda02() {
// evaluate("(#max={|x,y| $x > $y ? $x : $y };true)", "true", Boolean.class);

5
org.springframework.expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
View File

@@ -355,11 +355,6 @@ public class ParsingTests extends TestCase {
"({1}.#isEven(#this) == 'y') ? 'it is even' : 'it is odd'");
}
// lambda
public void testLambda01() {
parseCheck("{|x,y| $x > $y ? $x : $y }", "{|x,y| ($x > $y) ? $x : $y }");
}
//
// public void testLambdaMax() {
// parseCheck("(#max = {|x,y| $x > $y ? $x : $y }; #max(5,25))", "(#max={|x,y| ($x > $y) ? $x : $y };#max(5,25))");