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

Rely on auto-boxing in tests

Browse Source
This commit is contained in:
Sam Brannen
2023-07-12 11:29:57 +02:00
parent 1edc0d8002
commit 68f2b0ca59
32 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
View File

@@ -859,7 +859,7 @@ class EvaluationTests extends AbstractExpressionTests {
StandardEvaluationContext ctx = new StandardEvaluationContext(i);
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e = parser.parseExpression("#this++");
assertThat(i.intValue()).isEqualTo(42);
assertThat(i).isEqualTo(42);
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
e.getValue(ctx, Integer.class))
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.NOT_ASSIGNABLE));
@@ -1009,7 +1009,7 @@ class EvaluationTests extends AbstractExpressionTests {
StandardEvaluationContext ctx = new StandardEvaluationContext(i);
ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true));
Expression e = parser.parseExpression("#this--");
assertThat(i.intValue()).isEqualTo(42);
assertThat(i).isEqualTo(42);
assertThatExceptionOfType(SpelEvaluationException.class).isThrownBy(() ->
e.getValue(ctx, Integer.class))
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.NOT_ASSIGNABLE));
@@ -1170,13 +1170,13 @@ class EvaluationTests extends AbstractExpressionTests {
// index1 is 3 intArray[3] is 4
e = parser.parseExpression("intArray[#root.index1++]--");
assertThat(e.getValue(ctx, Integer.class).intValue()).isEqualTo(4);
assertThat(e.getValue(ctx, Integer.class)).isEqualTo(4);
assertThat(helper.index1).isEqualTo(4);
assertThat(helper.intArray[3]).isEqualTo(3);
// index1 is 4, intArray[3] is 3
e = parser.parseExpression("intArray[--#root.index1]++");
assertThat(e.getValue(ctx, Integer.class).intValue()).isEqualTo(3);
assertThat(e.getValue(ctx, Integer.class)).isEqualTo(3);
assertThat(helper.index1).isEqualTo(3);
assertThat(helper.intArray[3]).isEqualTo(4);
}
@@ -1427,22 +1427,22 @@ class EvaluationTests extends AbstractExpressionTests {
ctx.setVariable("wobble", 3);
e = parser.parseExpression("#wobble++");
assertThat(((Integer) ctx.lookupVariable("wobble")).intValue()).isEqualTo(3);
assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3);
int r = e.getValue(ctx, Integer.TYPE);
assertThat(r).isEqualTo(3);
assertThat(((Integer) ctx.lookupVariable("wobble")).intValue()).isEqualTo(4);
assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(4);
e = parser.parseExpression("--#wobble");
assertThat(((Integer) ctx.lookupVariable("wobble")).intValue()).isEqualTo(4);
assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(4);
r = e.getValue(ctx, Integer.TYPE);
assertThat(r).isEqualTo(3);
assertThat(((Integer) ctx.lookupVariable("wobble")).intValue()).isEqualTo(3);
assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3);
e = parser.parseExpression("#wobble=34");
assertThat(((Integer) ctx.lookupVariable("wobble")).intValue()).isEqualTo(3);
assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(3);
r = e.getValue(ctx, Integer.TYPE);
assertThat(r).isEqualTo(34);
assertThat(((Integer) ctx.lookupVariable("wobble")).intValue()).isEqualTo(34);
assertThat(((Integer) ctx.lookupVariable("wobble"))).isEqualTo(34);
// Projection
expectFailNotIncrementable(parser, ctx, "({1,2,3}.![#isEven(#this)])++"); // projection would be {false,true,false}

4
spring-expression/src/test/java/org/springframework/expression/spel/ExpressionWithConversionTests.java
View File

@@ -90,12 +90,12 @@ public class ExpressionWithConversionTests extends AbstractExpressionTests {
public void testSetParameterizedList() throws Exception {
StandardEvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
Expression e = parser.parseExpression("listOfInteger.size()");
assertThat(e.getValue(context, Integer.class).intValue()).isEqualTo(0);
assertThat(e.getValue(context, Integer.class)).isZero();
context.setTypeConverter(new TypeConvertorUsingConversionService());
// Assign a List<String> to the List<Integer> field - the component elements should be converted
parser.parseExpression("listOfInteger").setValue(context,listOfString);
// size now 3
assertThat(e.getValue(context, Integer.class).intValue()).isEqualTo(3);
assertThat(e.getValue(context, Integer.class)).isEqualTo(3);
Class<?> clazz = parser.parseExpression("listOfInteger[1].getClass()").getValue(context, Class.class); // element type correctly Integer
assertThat(clazz).isEqualTo(Integer.class);
}