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

Clean up (boolean) (Boolean) casts in tests

This commit is contained in:
Sam Brannen 2023-09-29 18:16:04 +02:00
parent c3795731b5
commit 95838e18cc
3 changed files with 177 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

344
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
View File

@ -579,8 +579,8 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
expression = parse("#root or #root"); expression = parse("#root or #root");
Object resultI2 = expression.getValue(b); Object resultI2 = expression.getValue(b);
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) resultI2).isFalse(); assertThat((Boolean) resultI2).isFalse();
assertThat((boolean) (Boolean) expression.getValue(b)).isFalse(); assertThat((Boolean) expression.getValue(b)).isFalse();
} }
@Test @Test
@ -639,8 +639,8 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
expression = parse("#root and #root"); expression = parse("#root and #root");
Object resultI2 = expression.getValue(b); Object resultI2 = expression.getValue(b);
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) resultI2).isTrue(); assertThat((Boolean) resultI2).isTrue();
assertThat((boolean) (Boolean) expression.getValue(b)).isTrue(); assertThat((Boolean) expression.getValue(b)).isTrue();
} }
@Test @Test
@ -749,12 +749,12 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
// Single size primitive (boolean) // Single size primitive (boolean)
expression = (SpelExpression) parser.parseExpression("#var?.a"); expression = (SpelExpression) parser.parseExpression("#var?.a");
context.setVariable("var", new TestClass4()); context.setVariable("var", new TestClass4());
assertThat((boolean) (Boolean) expression.getValue(context)).isFalse(); assertThat((Boolean) expression.getValue(context)).isFalse();
context.setVariable("var", null); context.setVariable("var", null);
assertThat(expression.getValue(context)).isNull(); assertThat(expression.getValue(context)).isNull();
assertCanCompile(expression); assertCanCompile(expression);
context.setVariable("var", new TestClass4()); context.setVariable("var", new TestClass4());
assertThat((boolean) (Boolean) expression.getValue(context)).isFalse(); assertThat((Boolean) expression.getValue(context)).isFalse();
context.setVariable("var", null); context.setVariable("var", null);
assertThat(expression.getValue(context)).isNull(); assertThat(expression.getValue(context)).isNull();
@ -1359,282 +1359,282 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
public void opLt() throws Exception { public void opLt() throws Exception {
expression = parse("3.0d < 4.0d"); expression = parse("3.0d < 4.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3446.0d < 1123.0d"); expression = parse("3446.0d < 1123.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3 < 1"); expression = parse("3 < 1");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("2 < 4"); expression = parse("2 < 4");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3.0f < 1.0f"); expression = parse("3.0f < 1.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("1.0f < 5.0f"); expression = parse("1.0f < 5.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("30L < 30L"); expression = parse("30L < 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("15L < 20L"); expression = parse("15L < 20L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
// Differing types of number, not yet supported // Differing types of number, not yet supported
expression = parse("1 < 3.0d"); expression = parse("1 < 3.0d");
assertCantCompile(expression); assertCantCompile(expression);
expression = parse("T(Integer).valueOf(3) < 4"); expression = parse("T(Integer).valueOf(3) < 4");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Integer).valueOf(3) < T(Integer).valueOf(3)"); expression = parse("T(Integer).valueOf(3) < T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("5 < T(Integer).valueOf(3)"); expression = parse("5 < T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
} }
@Test @Test
public void opLe() throws Exception { public void opLe() throws Exception {
expression = parse("3.0d <= 4.0d"); expression = parse("3.0d <= 4.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3446.0d <= 1123.0d"); expression = parse("3446.0d <= 1123.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3446.0d <= 3446.0d"); expression = parse("3446.0d <= 3446.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3 <= 1"); expression = parse("3 <= 1");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("2 <= 4"); expression = parse("2 <= 4");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3 <= 3"); expression = parse("3 <= 3");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3.0f <= 1.0f"); expression = parse("3.0f <= 1.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("1.0f <= 5.0f"); expression = parse("1.0f <= 5.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("2.0f <= 2.0f"); expression = parse("2.0f <= 2.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("30L <= 30L"); expression = parse("30L <= 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("15L <= 20L"); expression = parse("15L <= 20L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
// Differing types of number, not yet supported // Differing types of number, not yet supported
expression = parse("1 <= 3.0d"); expression = parse("1 <= 3.0d");
assertCantCompile(expression); assertCantCompile(expression);
expression = parse("T(Integer).valueOf(3) <= 4"); expression = parse("T(Integer).valueOf(3) <= 4");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Integer).valueOf(3) <= T(Integer).valueOf(3)"); expression = parse("T(Integer).valueOf(3) <= T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5 <= T(Integer).valueOf(3)"); expression = parse("5 <= T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
} }
@Test @Test
public void opGt() throws Exception { public void opGt() throws Exception {
expression = parse("3.0d > 4.0d"); expression = parse("3.0d > 4.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3446.0d > 1123.0d"); expression = parse("3446.0d > 1123.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3 > 1"); expression = parse("3 > 1");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("2 > 4"); expression = parse("2 > 4");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3.0f > 1.0f"); expression = parse("3.0f > 1.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("1.0f > 5.0f"); expression = parse("1.0f > 5.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("30L > 30L"); expression = parse("30L > 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("15L > 20L"); expression = parse("15L > 20L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
// Differing types of number, not yet supported // Differing types of number, not yet supported
expression = parse("1 > 3.0d"); expression = parse("1 > 3.0d");
assertCantCompile(expression); assertCantCompile(expression);
expression = parse("T(Integer).valueOf(3) > 4"); expression = parse("T(Integer).valueOf(3) > 4");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Integer).valueOf(3) > T(Integer).valueOf(3)"); expression = parse("T(Integer).valueOf(3) > T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("5 > T(Integer).valueOf(3)"); expression = parse("5 > T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
} }
@Test @Test
public void opGe() throws Exception { public void opGe() throws Exception {
expression = parse("3.0d >= 4.0d"); expression = parse("3.0d >= 4.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3446.0d >= 1123.0d"); expression = parse("3446.0d >= 1123.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3446.0d >= 3446.0d"); expression = parse("3446.0d >= 3446.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3 >= 1"); expression = parse("3 >= 1");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("2 >= 4"); expression = parse("2 >= 4");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3 >= 3"); expression = parse("3 >= 3");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3.0f >= 1.0f"); expression = parse("3.0f >= 1.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("1.0f >= 5.0f"); expression = parse("1.0f >= 5.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3.0f >= 3.0f"); expression = parse("3.0f >= 3.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("40L >= 30L"); expression = parse("40L >= 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("15L >= 20L"); expression = parse("15L >= 20L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("30L >= 30L"); expression = parse("30L >= 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
// Differing types of number, not yet supported // Differing types of number, not yet supported
expression = parse("1 >= 3.0d"); expression = parse("1 >= 3.0d");
assertCantCompile(expression); assertCantCompile(expression);
expression = parse("T(Integer).valueOf(3) >= 4"); expression = parse("T(Integer).valueOf(3) >= 4");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Integer).valueOf(3) >= T(Integer).valueOf(3)"); expression = parse("T(Integer).valueOf(3) >= T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5 >= T(Integer).valueOf(3)"); expression = parse("5 >= T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
} }
@Test @Test
public void opEq() throws Exception { public void opEq() throws Exception {
String tvar = "35"; String tvar = "35";
expression = parse("#root == 35"); expression = parse("#root == 35");
assertThat((boolean) (Boolean) expression.getValue(tvar)).isFalse(); assertThat((Boolean) expression.getValue(tvar)).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(tvar)).isFalse(); assertThat((Boolean) expression.getValue(tvar)).isFalse();
expression = parse("35 == #root"); expression = parse("35 == #root");
expression.getValue(tvar); expression.getValue(tvar);
assertThat((boolean) (Boolean) expression.getValue(tvar)).isFalse(); assertThat((Boolean) expression.getValue(tvar)).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(tvar)).isFalse(); assertThat((Boolean) expression.getValue(tvar)).isFalse();
TestClass7 tc7 = new TestClass7(); TestClass7 tc7 = new TestClass7();
expression = parse("property == 'UK'"); expression = parse("property == 'UK'");
assertThat((boolean) (Boolean) expression.getValue(tc7)).isTrue(); assertThat((Boolean) expression.getValue(tc7)).isTrue();
TestClass7.property = null; TestClass7.property = null;
assertThat((boolean) (Boolean) expression.getValue(tc7)).isFalse(); assertThat((Boolean) expression.getValue(tc7)).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
TestClass7.reset(); TestClass7.reset();
assertThat((boolean) (Boolean) expression.getValue(tc7)).isTrue(); assertThat((Boolean) expression.getValue(tc7)).isTrue();
TestClass7.property = "UK"; TestClass7.property = "UK";
assertThat((boolean) (Boolean) expression.getValue(tc7)).isTrue(); assertThat((Boolean) expression.getValue(tc7)).isTrue();
TestClass7.reset(); TestClass7.reset();
TestClass7.property = null; TestClass7.property = null;
assertThat((boolean) (Boolean) expression.getValue(tc7)).isFalse(); assertThat((Boolean) expression.getValue(tc7)).isFalse();
expression = parse("property == null"); expression = parse("property == null");
assertThat((boolean) (Boolean) expression.getValue(tc7)).isTrue(); assertThat((Boolean) expression.getValue(tc7)).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(tc7)).isTrue(); assertThat((Boolean) expression.getValue(tc7)).isTrue();
expression = parse("3.0d == 4.0d"); expression = parse("3.0d == 4.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3446.0d == 3446.0d"); expression = parse("3446.0d == 3446.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3 == 1"); expression = parse("3 == 1");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3 == 3"); expression = parse("3 == 3");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3.0f == 1.0f"); expression = parse("3.0f == 1.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("2.0f == 2.0f"); expression = parse("2.0f == 2.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("30L == 30L"); expression = parse("30L == 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("15L == 20L"); expression = parse("15L == 20L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
// number types are not the same // number types are not the same
expression = parse("1 == 3.0d"); expression = parse("1 == 3.0d");
@ -1642,228 +1642,228 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
Double d = 3.0d; Double d = 3.0d;
expression = parse("#root==3.0d"); expression = parse("#root==3.0d");
assertThat((boolean) (Boolean) expression.getValue(d)).isTrue(); assertThat((Boolean) expression.getValue(d)).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(d)).isTrue(); assertThat((Boolean) expression.getValue(d)).isTrue();
Integer i = 3; Integer i = 3;
expression = parse("#root==3"); expression = parse("#root==3");
assertThat((boolean) (Boolean) expression.getValue(i)).isTrue(); assertThat((Boolean) expression.getValue(i)).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(i)).isTrue(); assertThat((Boolean) expression.getValue(i)).isTrue();
Float f = 3.0f; Float f = 3.0f;
expression = parse("#root==3.0f"); expression = parse("#root==3.0f");
assertThat((boolean) (Boolean) expression.getValue(f)).isTrue(); assertThat((Boolean) expression.getValue(f)).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(f)).isTrue(); assertThat((Boolean) expression.getValue(f)).isTrue();
long l = 300L; long l = 300L;
expression = parse("#root==300l"); expression = parse("#root==300l");
assertThat((boolean) (Boolean) expression.getValue(l)).isTrue(); assertThat((Boolean) expression.getValue(l)).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(l)).isTrue(); assertThat((Boolean) expression.getValue(l)).isTrue();
boolean b = true; boolean b = true;
expression = parse("#root==true"); expression = parse("#root==true");
assertThat((boolean) (Boolean) expression.getValue(b)).isTrue(); assertThat((Boolean) expression.getValue(b)).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue(b)).isTrue(); assertThat((Boolean) expression.getValue(b)).isTrue();
expression = parse("T(Integer).valueOf(3) == 4"); expression = parse("T(Integer).valueOf(3) == 4");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Integer).valueOf(3) == T(Integer).valueOf(3)"); expression = parse("T(Integer).valueOf(3) == T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5 == T(Integer).valueOf(3)"); expression = parse("5 == T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Float).valueOf(3.0f) == 4.0f"); expression = parse("T(Float).valueOf(3.0f) == 4.0f");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Float).valueOf(3.0f) == T(Float).valueOf(3.0f)"); expression = parse("T(Float).valueOf(3.0f) == T(Float).valueOf(3.0f)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5.0f == T(Float).valueOf(3.0f)"); expression = parse("5.0f == T(Float).valueOf(3.0f)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Long).valueOf(3L) == 4L"); expression = parse("T(Long).valueOf(3L) == 4L");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Long).valueOf(3L) == T(Long).valueOf(3L)"); expression = parse("T(Long).valueOf(3L) == T(Long).valueOf(3L)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5L == T(Long).valueOf(3L)"); expression = parse("5L == T(Long).valueOf(3L)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Double).valueOf(3.0d) == 4.0d"); expression = parse("T(Double).valueOf(3.0d) == 4.0d");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Double).valueOf(3.0d) == T(Double).valueOf(3.0d)"); expression = parse("T(Double).valueOf(3.0d) == T(Double).valueOf(3.0d)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5.0d == T(Double).valueOf(3.0d)"); expression = parse("5.0d == T(Double).valueOf(3.0d)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("false == true"); expression = parse("false == true");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Boolean).valueOf('true') == T(Boolean).valueOf('true')"); expression = parse("T(Boolean).valueOf('true') == T(Boolean).valueOf('true')");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Boolean).valueOf('true') == true"); expression = parse("T(Boolean).valueOf('true') == true");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("false == T(Boolean).valueOf('false')"); expression = parse("false == T(Boolean).valueOf('false')");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
} }
@Test @Test
public void opNe() throws Exception { public void opNe() throws Exception {
expression = parse("3.0d != 4.0d"); expression = parse("3.0d != 4.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3446.0d != 3446.0d"); expression = parse("3446.0d != 3446.0d");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3 != 1"); expression = parse("3 != 1");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("3 != 3"); expression = parse("3 != 3");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("3.0f != 1.0f"); expression = parse("3.0f != 1.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("2.0f != 2.0f"); expression = parse("2.0f != 2.0f");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("30L != 30L"); expression = parse("30L != 30L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("15L != 20L"); expression = parse("15L != 20L");
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
// not compatible number types // not compatible number types
expression = parse("1 != 3.0d"); expression = parse("1 != 3.0d");
assertCantCompile(expression); assertCantCompile(expression);
expression = parse("T(Integer).valueOf(3) != 4"); expression = parse("T(Integer).valueOf(3) != 4");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Integer).valueOf(3) != T(Integer).valueOf(3)"); expression = parse("T(Integer).valueOf(3) != T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("5 != T(Integer).valueOf(3)"); expression = parse("5 != T(Integer).valueOf(3)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Float).valueOf(3.0f) != 4.0f"); expression = parse("T(Float).valueOf(3.0f) != 4.0f");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Float).valueOf(3.0f) != T(Float).valueOf(3.0f)"); expression = parse("T(Float).valueOf(3.0f) != T(Float).valueOf(3.0f)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("5.0f != T(Float).valueOf(3.0f)"); expression = parse("5.0f != T(Float).valueOf(3.0f)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Long).valueOf(3L) != 4L"); expression = parse("T(Long).valueOf(3L) != 4L");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Long).valueOf(3L) != T(Long).valueOf(3L)"); expression = parse("T(Long).valueOf(3L) != T(Long).valueOf(3L)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("5L != T(Long).valueOf(3L)"); expression = parse("5L != T(Long).valueOf(3L)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Double).valueOf(3.0d) == 4.0d"); expression = parse("T(Double).valueOf(3.0d) == 4.0d");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Double).valueOf(3.0d) == T(Double).valueOf(3.0d)"); expression = parse("T(Double).valueOf(3.0d) == T(Double).valueOf(3.0d)");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("5.0d == T(Double).valueOf(3.0d)"); expression = parse("5.0d == T(Double).valueOf(3.0d)");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("false == true"); expression = parse("false == true");
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isFalse(); assertThat((Boolean) expression.getValue()).isFalse();
expression = parse("T(Boolean).valueOf('true') == T(Boolean).valueOf('true')"); expression = parse("T(Boolean).valueOf('true') == T(Boolean).valueOf('true')");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("T(Boolean).valueOf('true') == true"); expression = parse("T(Boolean).valueOf('true') == true");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
expression = parse("false == T(Boolean).valueOf('false')"); expression = parse("false == T(Boolean).valueOf('false')");
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
assertCanCompile(expression); assertCanCompile(expression);
assertThat((boolean) (Boolean) expression.getValue()).isTrue(); assertThat((Boolean) expression.getValue()).isTrue();
} }
@Test @Test
@ -3544,8 +3544,8 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
ex = parser.parseRaw("#it?.age.equals([0])"); ex = parser.parseRaw("#it?.age.equals([0])");
context = new StandardEvaluationContext(new Object[] {person2.getAge()}); context = new StandardEvaluationContext(new Object[] {person2.getAge()});
context.setVariable("it", person2); context.setVariable("it", person2);
assertThat((boolean) (Boolean) ex.getValue(context)).isTrue(); assertThat((Boolean) ex.getValue(context)).isTrue();
assertThat((boolean) (Boolean) ex.getValue(context)).isTrue(); assertThat((Boolean) ex.getValue(context)).isTrue();
} }
@Test @Test

8
spring-web/src/test/java/org/springframework/http/codec/EncoderHttpMessageWriterTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 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.
@ -194,9 +194,9 @@ class EncoderHttpMessageWriterTests {
Method method = ReflectionUtils.findMethod(writer.getClass(), "isStreamingMediaType", MediaType.class); Method method = ReflectionUtils.findMethod(writer.getClass(), "isStreamingMediaType", MediaType.class);
ReflectionUtils.makeAccessible(method); ReflectionUtils.makeAccessible(method);
assertThat((boolean) (Boolean) method.invoke(writer, streamingMediaType)).isTrue(); assertThat((Boolean) method.invoke(writer, streamingMediaType)).isTrue();
assertThat((boolean) (Boolean) method.invoke(writer, new MediaType(TEXT_PLAIN, Collections.singletonMap("streaming", "false")))).isFalse(); assertThat((Boolean) method.invoke(writer, new MediaType(TEXT_PLAIN, Collections.singletonMap("streaming", "false")))).isFalse();
assertThat((boolean) (Boolean) method.invoke(writer, TEXT_HTML)).isFalse(); assertThat((Boolean) method.invoke(writer, TEXT_HTML)).isFalse();
} }
private void configureEncoder(MimeType... mimeTypes) { private void configureEncoder(MimeType... mimeTypes) {

2
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
View File

@ -315,7 +315,7 @@ public class WebMvcConfigurationSupportExtensionTests {
DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0)); DirectFieldAccessor accessor = new DirectFieldAccessor(viewResolvers.get(0));
assertThat(viewResolvers).hasSize(1); assertThat(viewResolvers).hasSize(1);
assertThat(viewResolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class); assertThat(viewResolvers.get(0).getClass()).isEqualTo(ContentNegotiatingViewResolver.class);
assertThat((boolean) (Boolean) accessor.getPropertyValue("useNotAcceptableStatusCode")).isFalse(); assertThat((Boolean) accessor.getPropertyValue("useNotAcceptableStatusCode")).isFalse();
assertThat(accessor.getPropertyValue("contentNegotiationManager")).isNotNull(); assertThat(accessor.getPropertyValue("contentNegotiationManager")).isNotNull();
List<View> defaultViews = (List<View>) accessor.getPropertyValue("defaultViews"); List<View> defaultViews = (List<View>) accessor.getPropertyValue("defaultViews");