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

Polishing

Browse Source
This commit is contained in:
Sam Brannen
2023-04-03 14:42:38 +02:00
parent 98f1287f3a
commit 4eed2ced74
4 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
View File

@@ -869,7 +869,7 @@ class SpelReproTests extends AbstractExpressionTests {
Expression expression = parser.parseExpression("parseInt('-FF', 16)");
Integer result = expression.getValue(context, "", Integer.class);
assertThat(result.intValue()).isEqualTo(-255);
assertThat(result).isEqualTo(-255);
}
@Test
@@ -880,25 +880,25 @@ class SpelReproTests extends AbstractExpressionTests {
Object result = null;
expression = parser.parseExpression("new java.lang.Long[0].class");
result = expression.getValue(context, "");
assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [Ljava.lang.Long;");
result = expression.getValue(context);
assertThat(result).asString().isEqualTo("class [Ljava.lang.Long;");
expression = parser.parseExpression("T(java.lang.Long[])");
result = expression.getValue(context, "");
assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [Ljava.lang.Long;");
result = expression.getValue(context);
assertThat(result).asString().isEqualTo("class [Ljava.lang.Long;");
expression = parser.parseExpression("T(java.lang.String[][][])");
result = expression.getValue(context, "");
assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [[[Ljava.lang.String;");
result = expression.getValue(context);
assertThat(result).asString().isEqualTo("class [[[Ljava.lang.String;");
assertThat(((SpelExpression) expression).toStringAST()).isEqualTo("T(java.lang.String[][][])");
expression = parser.parseExpression("new int[0].class");
result = expression.getValue(context, "");
assertThat(result.toString()).as("Equal assertion failed: ").isEqualTo("class [I");
result = expression.getValue(context);
assertThat(result).asString().isEqualTo("class [I");
expression = parser.parseExpression("T(int[][])");
result = expression.getValue(context, "");
assertThat(result.toString()).isEqualTo("class [[I");
result = expression.getValue(context);
assertThat(result).asString().isEqualTo("class [[I");
}
@Test
@@ -1587,12 +1587,12 @@ class SpelReproTests extends AbstractExpressionTests {
// #this should be the element from list1
Expression ex = parser.parseExpression("#list1.?[#list2.contains(#this)]");
Object result = ex.getValue(context);
assertThat(result.toString()).isEqualTo("[x]");
assertThat(result).asString().isEqualTo("[x]");
// toString() should be called on the element from list1
ex = parser.parseExpression("#list1.?[#list2.contains(toString())]");
result = ex.getValue(context);
assertThat(result.toString()).isEqualTo("[x]");
assertThat(result).asString().isEqualTo("[x]");
List list3 = new ArrayList();
list3.add(1);
@@ -1604,11 +1604,11 @@ class SpelReproTests extends AbstractExpressionTests {
context.setVariable("list3", list3);
ex = parser.parseExpression("#list3.?[#this > 2]");
result = ex.getValue(context);
assertThat(result.toString()).isEqualTo("[3, 4]");
assertThat(result).asString().isEqualTo("[3, 4]");
ex = parser.parseExpression("#list3.?[#this >= T(java.lang.Math).abs(T(java.lang.Math).abs(#this))]");
result = ex.getValue(context);
assertThat(result.toString()).isEqualTo("[1, 2, 3, 4]");
assertThat(result).asString().isEqualTo("[1, 2, 3, 4]");
}
@Test
@@ -1628,11 +1628,11 @@ class SpelReproTests extends AbstractExpressionTests {
// #this should be the element from list1
Expression ex = parser.parseExpression("#map1.?[#map2.containsKey(#this.getKey())]");
Object result = ex.getValue(context);
assertThat(result.toString()).isEqualTo("{X=66}");
assertThat(result).asString().isEqualTo("{X=66}");
ex = parser.parseExpression("#map1.?[#map2.containsKey(key)]");
result = ex.getValue(context);
assertThat(result.toString()).isEqualTo("{X=66}");
assertThat(result).asString().isEqualTo("{X=66}");
}
@Test