root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2024-02-07 13:29:33 +01:00
parent 9a38355896
commit 7d612e8958
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-expression/src/test/java/org/springframework/expression/spel/SelectionAndProjectionTests.java
View File

@ -38,7 +38,6 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.support.StandardEvaluationContext;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.InstanceOfAssertFactories.INTEGER;
import static org.assertj.core.api.InstanceOfAssertFactories.LIST; import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
import static org.assertj.core.api.InstanceOfAssertFactories.array; import static org.assertj.core.api.InstanceOfAssertFactories.array;
import static org.springframework.expression.spel.SpelMessage.INVALID_TYPE_FOR_SELECTION; import static org.springframework.expression.spel.SpelMessage.INVALID_TYPE_FOR_SELECTION;
@ -95,21 +94,21 @@ class SelectionAndProjectionTests {
void selectionWithList() { void selectionWithList() {
Expression expression = new SpelExpressionParser().parseRaw("integers.?[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.?[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ListTestBean()); EvaluationContext context = new StandardEvaluationContext(new ListTestBean());
assertThat(expression.getValue(context)).asInstanceOf(LIST).containsExactly(0, 1, 2, 3, 4); assertThat(expression.getValue(context, List.class)).containsExactly(0, 1, 2, 3, 4);
} }
@Test @Test
void selectFirstItemInList() { void selectFirstItemInList() {
Expression expression = new SpelExpressionParser().parseRaw("integers.^[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.^[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ListTestBean()); EvaluationContext context = new StandardEvaluationContext(new ListTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isZero(); assertThat(expression.getValue(context, Integer.class)).isZero();
} }
@Test @Test
void selectLastItemInList() { void selectLastItemInList() {
Expression expression = new SpelExpressionParser().parseRaw("integers.$[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.$[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ListTestBean()); EvaluationContext context = new StandardEvaluationContext(new ListTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isEqualTo(4); assertThat(expression.getValue(context, Integer.class)).isEqualTo(4);
} }
@Test @Test
@ -124,21 +123,21 @@ class SelectionAndProjectionTests {
void selectionWithSet() { void selectionWithSet() {
Expression expression = new SpelExpressionParser().parseRaw("integers.?[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.?[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new SetTestBean()); EvaluationContext context = new StandardEvaluationContext(new SetTestBean());
assertThat(expression.getValue(context)).asInstanceOf(LIST).containsExactly(0, 1, 2, 3, 4); assertThat(expression.getValue(context, List.class)).containsExactly(0, 1, 2, 3, 4);
} }
@Test @Test
void selectFirstItemInSet() { void selectFirstItemInSet() {
Expression expression = new SpelExpressionParser().parseRaw("integers.^[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.^[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new SetTestBean()); EvaluationContext context = new StandardEvaluationContext(new SetTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isZero(); assertThat(expression.getValue(context, Integer.class)).isZero();
} }
@Test @Test
void selectLastItemInSet() { void selectLastItemInSet() {
Expression expression = new SpelExpressionParser().parseRaw("integers.$[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.$[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new SetTestBean()); EvaluationContext context = new StandardEvaluationContext(new SetTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isEqualTo(4); assertThat(expression.getValue(context, Integer.class)).isEqualTo(4);
} }
@ParameterizedTest @ParameterizedTest
@ -161,14 +160,14 @@ class SelectionAndProjectionTests {
void selectFirstItemInArray() { void selectFirstItemInArray() {
Expression expression = new SpelExpressionParser().parseRaw("integers.^[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.^[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean()); EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isZero(); assertThat(expression.getValue(context, Integer.class)).isZero();
} }
@Test @Test
void selectLastItemInArray() { void selectLastItemInArray() {
Expression expression = new SpelExpressionParser().parseRaw("integers.$[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("integers.$[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean()); EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isEqualTo(4); assertThat(expression.getValue(context, Integer.class)).isEqualTo(4);
} }
@Test @Test
@ -183,14 +182,14 @@ class SelectionAndProjectionTests {
void selectFirstItemInPrimitiveArray() { void selectFirstItemInPrimitiveArray() {
Expression expression = new SpelExpressionParser().parseRaw("ints.^[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("ints.^[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean()); EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isZero(); assertThat(expression.getValue(context, Integer.class)).isZero();
} }
@Test @Test
void selectLastItemInPrimitiveArray() { void selectLastItemInPrimitiveArray() {
Expression expression = new SpelExpressionParser().parseRaw("ints.$[#this < 5]"); Expression expression = new SpelExpressionParser().parseRaw("ints.$[#this < 5]");
EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean()); EvaluationContext context = new StandardEvaluationContext(new ArrayTestBean());
assertThat(expression.getValue(context)).asInstanceOf(INTEGER).isEqualTo(4); assertThat(expression.getValue(context, Integer.class)).isEqualTo(4);
} }
@Test @Test
@ -254,7 +253,7 @@ class SelectionAndProjectionTests {
Expression expression = new SpelExpressionParser().parseRaw("#testList.![wrapper.value]"); Expression expression = new SpelExpressionParser().parseRaw("#testList.![wrapper.value]");
EvaluationContext context = new StandardEvaluationContext(); EvaluationContext context = new StandardEvaluationContext();
context.setVariable("testList", IntegerTestBean.createList()); context.setVariable("testList", IntegerTestBean.createList());
assertThat(expression.getValue(context)).asInstanceOf(LIST).containsExactly(5, 6, 7); assertThat(expression.getValue(context, List.class)).containsExactly(5, 6, 7);
} }
@Test @Test
@ -269,7 +268,7 @@ class SelectionAndProjectionTests {
Expression expression = new SpelExpressionParser().parseRaw("#testSet.![wrapper.value]"); Expression expression = new SpelExpressionParser().parseRaw("#testSet.![wrapper.value]");
EvaluationContext context = new StandardEvaluationContext(); EvaluationContext context = new StandardEvaluationContext();
context.setVariable("testSet", IntegerTestBean.createSet()); context.setVariable("testSet", IntegerTestBean.createSet());
assertThat(expression.getValue(context)).asInstanceOf(LIST).containsExactly(5, 6, 7); assertThat(expression.getValue(context, List.class)).containsExactly(5, 6, 7);
} }
@ParameterizedTest @ParameterizedTest