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-03-16 16:33:07 +01:00
parent 94bbf85c0e
commit 0882ca57d4
2 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,17 +127,6 @@ class EvaluationTests extends AbstractExpressionTests {
evaluate("null?.null?.null", null, null); evaluate("null?.null?.null", null, null);
} }
@Test // SPR-16731
void matchesWithPatternAccessThreshold() {
String pattern = "^(?=[a-z0-9-]{1,47})([a-z0-9]+[-]{0,1}){1,47}[a-z0-9]{1}$";
String expression = "'abcde-fghijklmn-o42pasdfasdfasdf.qrstuvwxyz10x.xx.yyy.zasdfasfd' matches \'" + pattern + "\'";
Expression expr = parser.parseExpression(expression);
assertThatExceptionOfType(SpelEvaluationException.class)
.isThrownBy(expr::getValue)
.withCauseInstanceOf(IllegalStateException.class)
.satisfies(ex -> assertThat(ex.getMessageCode()).isEqualTo(SpelMessage.FLAWED_PATTERN));
}
// mixing operators // mixing operators
@Test @Test
void mixingOperators() { void mixingOperators() {
@@ -460,28 +449,35 @@ class EvaluationTests extends AbstractExpressionTests {
} }
@Test @Test
void relOperatorsMatches01() { void matchesTrue() {
evaluate("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'", "false", Boolean.class);
}
@Test
void relOperatorsMatches02() {
evaluate("'5.00' matches '^-?\\d+(\\.\\d{2})?$'", "true", Boolean.class); evaluate("'5.00' matches '^-?\\d+(\\.\\d{2})?$'", "true", Boolean.class);
} }
@Test @Test
void relOperatorsMatches03() { void matchesFalse() {
evaluate("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'", "false", Boolean.class);
}
@Test
void matchesWithInputConversion() {
evaluate("27 matches '^.*2.*$'", true, Boolean.class); // conversion int --> string
}
@Test
void matchesWithNullInput() {
evaluateAndCheckError("null matches '^.*$'", SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, 0, null); evaluateAndCheckError("null matches '^.*$'", SpelMessage.INVALID_FIRST_OPERAND_FOR_MATCHES_OPERATOR, 0, null);
} }
@Test @Test
void relOperatorsMatches04() { void matchesWithNullPattern() {
evaluateAndCheckError("'abc' matches null", SpelMessage.INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR, 14, null); evaluateAndCheckError("'abc' matches null", SpelMessage.INVALID_SECOND_OPERAND_FOR_MATCHES_OPERATOR, 14, null);
} }
@Test @Test // SPR-16731
void relOperatorsMatches05() { void matchesWithPatternAccessThreshold() {
evaluate("27 matches '^.*2.*$'", true, Boolean.class); // conversion int>string String pattern = "^(?=[a-z0-9-]{1,47})([a-z0-9]+[-]{0,1}){1,47}[a-z0-9]{1}$";
String expression = "'abcde-fghijklmn-o42pasdfasdfasdf.qrstuvwxyz10x.xx.yyy.zasdfasfd' matches '" + pattern + "'";
evaluateAndCheckError(expression, SpelMessage.FLAWED_PATTERN);
} }
} }

100
spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2021 the original author or authors. * Copyright 2002-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.springframework.expression.spel.standard.SpelExpression;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests the evaluation of expressions using relational operators. * Tests the evaluation of expressions using various operators.
* *
* @author Andy Clement * @author Andy Clement
* @author Juergen Hoeller * @author Juergen Hoeller
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class OperatorTests extends AbstractExpressionTests { class OperatorTests extends AbstractExpressionTests {
@Test @Test
void testEqual() { void equal() {
evaluate("3 == 5", false, Boolean.class); evaluate("3 == 5", false, Boolean.class);
evaluate("5 == 3", false, Boolean.class); evaluate("5 == 3", false, Boolean.class);
evaluate("6 == 6", true, Boolean.class); evaluate("6 == 6", true, Boolean.class);
@@ -85,7 +85,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testNotEqual() { void notEqual() {
evaluate("3 != 5", true, Boolean.class); evaluate("3 != 5", true, Boolean.class);
evaluate("5 != 3", true, Boolean.class); evaluate("5 != 3", true, Boolean.class);
evaluate("6 != 6", false, Boolean.class); evaluate("6 != 6", false, Boolean.class);
@@ -134,7 +134,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testLessThan() { void lessThan() {
evaluate("5 < 5", false, Boolean.class); evaluate("5 < 5", false, Boolean.class);
evaluate("3 < 5", true, Boolean.class); evaluate("3 < 5", true, Boolean.class);
evaluate("5 < 3", false, Boolean.class); evaluate("5 < 3", false, Boolean.class);
@@ -176,7 +176,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testLessThanOrEqual() { void lessThanOrEqual() {
evaluate("3 <= 5", true, Boolean.class); evaluate("3 <= 5", true, Boolean.class);
evaluate("5 <= 3", false, Boolean.class); evaluate("5 <= 3", false, Boolean.class);
evaluate("6 <= 6", true, Boolean.class); evaluate("6 <= 6", true, Boolean.class);
@@ -225,7 +225,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testGreaterThan() { void greaterThan() {
evaluate("3 > 5", false, Boolean.class); evaluate("3 > 5", false, Boolean.class);
evaluate("5 > 3", true, Boolean.class); evaluate("5 > 3", true, Boolean.class);
evaluate("3L > 5L", false, Boolean.class); evaluate("3L > 5L", false, Boolean.class);
@@ -266,7 +266,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testGreaterThanOrEqual() { void greaterThanOrEqual() {
evaluate("3 >= 5", false, Boolean.class); evaluate("3 >= 5", false, Boolean.class);
evaluate("5 >= 3", true, Boolean.class); evaluate("5 >= 3", true, Boolean.class);
evaluate("6 >= 6", true, Boolean.class); evaluate("6 >= 6", true, Boolean.class);
@@ -315,27 +315,27 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testIntegerLiteral() { void integerLiteral() {
evaluate("3", 3, Integer.class); evaluate("3", 3, Integer.class);
} }
@Test @Test
void testRealLiteral() { void realLiteral() {
evaluate("3.5", 3.5d, Double.class); evaluate("3.5", 3.5d, Double.class);
} }
@Test @Test
void testMultiplyStringInt() { void multiplyStringInt() {
evaluate("'a' * 5", "aaaaa", String.class); evaluate("'a' * 5", "aaaaa", String.class);
} }
@Test @Test
void testMultiplyDoubleDoubleGivesDouble() { void multiplyDoubleDoubleGivesDouble() {
evaluate("3.0d * 5.0d", 15.0d, Double.class); evaluate("3.0d * 5.0d", 15.0d, Double.class);
} }
@Test @Test
void testMixedOperandsBigDecimal() { void mixedOperandsBigDecimal() {
evaluate("3 * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class); evaluate("3 * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class);
evaluate("3L * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class); evaluate("3L * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class);
evaluate("3.0d * new java.math.BigDecimal('5')", new BigDecimal("15.0"), BigDecimal.class); evaluate("3.0d * new java.math.BigDecimal('5')", new BigDecimal("15.0"), BigDecimal.class);
@@ -361,19 +361,19 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testMathOperatorAdd02() { void mathOperatorAdd02() {
evaluate("'hello' + ' ' + 'world'", "hello world", String.class); evaluate("'hello' + ' ' + 'world'", "hello world", String.class);
} }
@Test @Test
void testMathOperatorsInChains() { void mathOperatorsInChains() {
evaluate("1+2+3",6,Integer.class); evaluate("1+2+3",6,Integer.class);
evaluate("2*3*4",24,Integer.class); evaluate("2*3*4",24,Integer.class);
evaluate("12-1-2",9,Integer.class); evaluate("12-1-2",9,Integer.class);
} }
@Test @Test
void testIntegerArithmetic() { void integerArithmetic() {
evaluate("2 + 4", "6", Integer.class); evaluate("2 + 4", "6", Integer.class);
evaluate("5 - 4", "1", Integer.class); evaluate("5 - 4", "1", Integer.class);
evaluate("3 * 5", 15, Integer.class); evaluate("3 * 5", 15, Integer.class);
@@ -388,7 +388,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testPlus() { void plus() {
evaluate("7 + 2", "9", Integer.class); evaluate("7 + 2", "9", Integer.class);
evaluate("3.0f + 5.0f", 8.0f, Float.class); evaluate("3.0f + 5.0f", 8.0f, Float.class);
evaluate("3.0d + 5.0d", 8.0d, Double.class); evaluate("3.0d + 5.0d", 8.0d, Double.class);
@@ -400,44 +400,44 @@ class OperatorTests extends AbstractExpressionTests {
evaluate("null + 'ab'", "nullab", String.class); evaluate("null + 'ab'", "nullab", String.class);
// AST: // AST:
SpelExpression expr = (SpelExpression)parser.parseExpression("+3"); SpelExpression expr = (SpelExpression) parser.parseExpression("+3");
assertThat(expr.toStringAST()).isEqualTo("+3"); assertThat(expr.toStringAST()).isEqualTo("+3");
expr = (SpelExpression)parser.parseExpression("2+3"); expr = (SpelExpression) parser.parseExpression("2+3");
assertThat(expr.toStringAST()).isEqualTo("(2 + 3)"); assertThat(expr.toStringAST()).isEqualTo("(2 + 3)");
// use as a unary operator // use as a unary operator
evaluate("+5d",5d,Double.class); evaluate("+5d", 5d, Double.class);
evaluate("+5L",5L,Long.class); evaluate("+5L", 5L, Long.class);
evaluate("+5",5,Integer.class); evaluate("+5", 5, Integer.class);
evaluate("+new java.math.BigDecimal('5')", new BigDecimal("5"),BigDecimal.class); evaluate("+new java.math.BigDecimal('5')", new BigDecimal("5"), BigDecimal.class);
evaluateAndCheckError("+'abc'",SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES); evaluateAndCheckError("+'abc'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
// string concatenation // string concatenation
evaluate("'abc'+'def'","abcdef",String.class); evaluate("'abc'+'def'", "abcdef", String.class);
evaluate("5 + new Integer('37')",42,Integer.class); evaluate("5 + new Integer('37')", 42, Integer.class);
} }
@Test @Test
void testMinus() { void minus() {
evaluate("'c' - 2", "a", String.class); evaluate("'c' - 2", "a", String.class);
evaluate("3.0f - 5.0f", -2.0f, Float.class); evaluate("3.0f - 5.0f", -2.0f, Float.class);
evaluateAndCheckError("'ab' - 2", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES); evaluateAndCheckError("'ab' - 2", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
evaluateAndCheckError("2-'ab'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES); evaluateAndCheckError("2-'ab'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
SpelExpression expr = (SpelExpression)parser.parseExpression("-3"); SpelExpression expr = (SpelExpression) parser.parseExpression("-3");
assertThat(expr.toStringAST()).isEqualTo("-3"); assertThat(expr.toStringAST()).isEqualTo("-3");
expr = (SpelExpression)parser.parseExpression("2-3"); expr = (SpelExpression) parser.parseExpression("2-3");
assertThat(expr.toStringAST()).isEqualTo("(2 - 3)"); assertThat(expr.toStringAST()).isEqualTo("(2 - 3)");
evaluate("-5d",-5d,Double.class); evaluate("-5d", -5d, Double.class);
evaluate("-5L",-5L,Long.class); evaluate("-5L", -5L, Long.class);
evaluate("-5", -5, Integer.class); evaluate("-5", -5, Integer.class);
evaluate("-new java.math.BigDecimal('5')", new BigDecimal("-5"),BigDecimal.class); evaluate("-new java.math.BigDecimal('5')", new BigDecimal("-5"), BigDecimal.class);
evaluateAndCheckError("-'abc'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES); evaluateAndCheckError("-'abc'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
} }
@Test @Test
void testModulus() { void modulus() {
evaluate("3%2",1,Integer.class); evaluate("3%2",1,Integer.class);
evaluate("3L%2L",1L,Long.class); evaluate("3L%2L",1L,Long.class);
evaluate("3.0f%2.0f",1f,Float.class); evaluate("3.0f%2.0f",1f,Float.class);
@@ -448,7 +448,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testDivide() { void divide() {
evaluate("3.0f / 5.0f", 0.6f, Float.class); evaluate("3.0f / 5.0f", 0.6f, Float.class);
evaluate("4L/2L",2L,Long.class); evaluate("4L/2L",2L,Long.class);
evaluate("3.0f div 5.0f", 0.6f, Float.class); evaluate("3.0f div 5.0f", 0.6f, Float.class);
@@ -461,17 +461,17 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testMathOperatorDivide_ConvertToDouble() { void mathOperatorDivide_ConvertToDouble() {
evaluateAndAskForReturnType("8/4", 2.0, Double.class); evaluateAndAskForReturnType("8/4", 2.0, Double.class);
} }
@Test @Test
void testMathOperatorDivide04_ConvertToFloat() { void mathOperatorDivide04_ConvertToFloat() {
evaluateAndAskForReturnType("8/4", 2.0F, Float.class); evaluateAndAskForReturnType("8/4", 2.0F, Float.class);
} }
@Test @Test
void testDoubles() { void doubles() {
evaluate("3.0d == 5.0d", false, Boolean.class); evaluate("3.0d == 5.0d", false, Boolean.class);
evaluate("3.0d == 3.0d", true, Boolean.class); evaluate("3.0d == 3.0d", true, Boolean.class);
evaluate("3.0d != 5.0d", true, Boolean.class); evaluate("3.0d != 5.0d", true, Boolean.class);
@@ -484,7 +484,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testBigDecimals() { void bigDecimals() {
evaluate("3 + new java.math.BigDecimal('5')", new BigDecimal("8"), BigDecimal.class); evaluate("3 + new java.math.BigDecimal('5')", new BigDecimal("8"), BigDecimal.class);
evaluate("3 - new java.math.BigDecimal('5')", new BigDecimal("-2"), BigDecimal.class); evaluate("3 - new java.math.BigDecimal('5')", new BigDecimal("-2"), BigDecimal.class);
evaluate("3 * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class); evaluate("3 * new java.math.BigDecimal('5')", new BigDecimal("15"), BigDecimal.class);
@@ -495,7 +495,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testOperatorNames() { void operatorNames() {
Operator node = getOperatorNode((SpelExpression)parser.parseExpression("1==3")); Operator node = getOperatorNode((SpelExpression)parser.parseExpression("1==3"));
assertThat(node.getOperatorName()).isEqualTo("=="); assertThat(node.getOperatorName()).isEqualTo("==");
@@ -534,22 +534,22 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testOperatorOverloading() { void operatorOverloading() {
evaluateAndCheckError("'a' * '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES); evaluateAndCheckError("'a' * '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
evaluateAndCheckError("'a' ^ '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES); evaluateAndCheckError("'a' ^ '2'", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
} }
@Test @Test
void testPower() { void power() {
evaluate("3^2",9,Integer.class); evaluate("3^2", 9, Integer.class);
evaluate("3.0d^2.0d",9.0d,Double.class); evaluate("3.0d^2.0d", 9.0d, Double.class);
evaluate("3L^2L",9L,Long.class); evaluate("3L^2L", 9L, Long.class);
evaluate("(2^32)^2", 9223372036854775807L, Long.class); evaluate("(2^32)^2", 9223372036854775807L, Long.class);
evaluate("new java.math.BigDecimal('5') ^ 3", new BigDecimal("125"), BigDecimal.class); evaluate("new java.math.BigDecimal('5') ^ 3", new BigDecimal("125"), BigDecimal.class);
} }
@Test @Test
void testMixedOperands_FloatsAndDoubles() { void mixedOperands_FloatsAndDoubles() {
evaluate("3.0d + 5.0f", 8.0d, Double.class); evaluate("3.0d + 5.0f", 8.0d, Double.class);
evaluate("3.0D - 5.0f", -2.0d, Double.class); evaluate("3.0D - 5.0f", -2.0d, Double.class);
evaluate("3.0f * 5.0d", 15.0d, Double.class); evaluate("3.0f * 5.0d", 15.0d, Double.class);
@@ -558,7 +558,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testMixedOperands_DoublesAndInts() { void mixedOperands_DoublesAndInts() {
evaluate("3.0d + 5", 8.0d, Double.class); evaluate("3.0d + 5", 8.0d, Double.class);
evaluate("3.0D - 5", -2.0d, Double.class); evaluate("3.0D - 5", -2.0d, Double.class);
evaluate("3.0f * 5", 15.0f, Float.class); evaluate("3.0f * 5", 15.0f, Float.class);
@@ -569,7 +569,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testStrings() { void strings() {
evaluate("'abc' == 'abc'", true, Boolean.class); evaluate("'abc' == 'abc'", true, Boolean.class);
evaluate("'abc' == 'def'", false, Boolean.class); evaluate("'abc' == 'def'", false, Boolean.class);
evaluate("'abc' != 'abc'", false, Boolean.class); evaluate("'abc' != 'abc'", false, Boolean.class);
@@ -577,7 +577,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testLongs() { void longs() {
evaluate("3L == 4L", false, Boolean.class); evaluate("3L == 4L", false, Boolean.class);
evaluate("3L == 3L", true, Boolean.class); evaluate("3L == 3L", true, Boolean.class);
evaluate("3L != 4L", true, Boolean.class); evaluate("3L != 4L", true, Boolean.class);
@@ -588,7 +588,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
@Test @Test
void testBigIntegers() { void bigIntegers() {
evaluate("3 + new java.math.BigInteger('5')", new BigInteger("8"), BigInteger.class); evaluate("3 + new java.math.BigInteger('5')", new BigInteger("8"), BigInteger.class);
evaluate("3 - new java.math.BigInteger('5')", new BigInteger("-2"), BigInteger.class); evaluate("3 - new java.math.BigInteger('5')", new BigInteger("-2"), BigInteger.class);
evaluate("3 * new java.math.BigInteger('5')", new BigInteger("15"), BigInteger.class); evaluate("3 * new java.math.BigInteger('5')", new BigInteger("15"), BigInteger.class);
@@ -619,7 +619,7 @@ class OperatorTests extends AbstractExpressionTests {
} }
public static class BaseComparable implements Comparable<BaseComparable> { static class BaseComparable implements Comparable<BaseComparable> {
@Override @Override
public int compareTo(BaseComparable other) { public int compareTo(BaseComparable other) {