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

renamed operator IS to INSTANCEOF, may yet delete..

Browse Source
This commit is contained in:
Andy Clement
2008-09-16 17:20:03 +00:00
parent 39c966f419
commit afdf54eff8
11 changed files with 1380 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,27 +72,27 @@ public class EvaluationTests extends ExpressionTestCase {
}
public void testRelOperatorsIs01() {
evaluate("'xyz' is T(int)", "false", Boolean.class);
evaluate("'xyz' instanceof T(int)", "false", Boolean.class);
}
public void testRelOperatorsIs02() {
evaluate("{1, 2, 3, 4, 5} is T(List)", "true", Boolean.class);
evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class);
}
public void testRelOperatorsIs03() {
evaluate("{1, 2, 3, 4, 5} is T(List)", "true", Boolean.class);
evaluate("{1, 2, 3, 4, 5} instanceof T(List)", "true", Boolean.class);
}
public void testRelOperatorsIs04() {
evaluate("null is T(String)", "false", Boolean.class);
evaluate("null instanceof T(String)", "false", Boolean.class);
}
public void testRelOperatorsIs05() {
evaluate("null is T(Integer)", "false", Boolean.class);
evaluate("null instanceof T(Integer)", "false", Boolean.class);
}
public void testRelOperatorsIs06() {
evaluateAndCheckError("'A' is null", SpelMessages.IS_OPERATOR_NEEDS_CLASS_OPERAND, 7, "null");
evaluateAndCheckError("'A' instanceof null", SpelMessages.INSTANCEOF_OPERATOR_NEEDS_CLASS_OPERAND, 15, "null");
}
public void testRelOperatorsMatches01() {

3
org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
View File

@@ -48,7 +48,8 @@ public class ParserErrorMessagesTests extends ExpressionTestCase {
public void testBrokenExpression07() {
// T() can only take an identifier (possibly qualified), not a literal
// message ought to say identifier rather than ID
parseAndCheckError("null is T('a')", SpelMessages.PARSE_PROBLEM, 10, "mismatched input ''a'' expecting ID"); // POOR
parseAndCheckError("null instanceof T('a')", SpelMessages.PARSE_PROBLEM, 18,
"mismatched input ''a'' expecting ID"); // POOR
}
}

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

@@ -146,11 +146,11 @@ public class ParsingTests extends TestCase {
}// true
public void testRelOperatorsIs01() {
parseCheck("'xyz' is int", "('xyz' is int)");
parseCheck("'xyz' instanceof int", "('xyz' instanceof int)");
}// false
public void testRelOperatorsIs02() {
parseCheck("{1, 2, 3, 4, 5} is List", "({1,2,3,4,5} is List)");
parseCheck("{1, 2, 3, 4, 5} instanceof List", "({1,2,3,4,5} instanceof List)");
}// true
public void testRelOperatorsMatches01() {