Skip to content

Commit 29bb7b9

Browse files
sbrannenLeMikaelF
sbrannen
and
LeMikaelF
committed
Polish SpelCompilationCoverageTests
See gh-32804 Co-authored-by: Mikaël Francoeur <[email protected]>
1 parent 9516f87 commit 29bb7b9

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,7 @@ public static String join(String...strings) {
22772277

22782278
@Test
22792279
void compiledExpressionShouldWorkWhenUsingCustomFunctionWithVarargs() throws Exception {
2280-
StandardEvaluationContext context = null;
2280+
StandardEvaluationContext context;
22812281

22822282
// Here the target method takes Object... and we are passing a string
22832283
expression = parser.parseExpression("#doFormat('hey %s', 'there')");
@@ -2287,7 +2287,7 @@ void compiledExpressionShouldWorkWhenUsingCustomFunctionWithVarargs() throws Exc
22872287
((SpelExpression) expression).setEvaluationContext(context);
22882288

22892289
assertThat(expression.getValue(String.class)).isEqualTo("hey there");
2290-
assertThat(((SpelNodeImpl) ((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2290+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
22912291
assertCanCompile(expression);
22922292
assertThat(expression.getValue(String.class)).isEqualTo("hey there");
22932293

@@ -2298,7 +2298,7 @@ void compiledExpressionShouldWorkWhenUsingCustomFunctionWithVarargs() throws Exc
22982298
((SpelExpression) expression).setEvaluationContext(context);
22992299

23002300
assertThat(expression.getValue(String.class)).isEqualTo("hey there");
2301-
assertThat(((SpelNodeImpl) ((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2301+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
23022302
assertCanCompile(expression);
23032303
assertThat(expression.getValue(String.class)).isEqualTo("hey there");
23042304

@@ -2310,7 +2310,7 @@ void compiledExpressionShouldWorkWhenUsingCustomFunctionWithVarargs() throws Exc
23102310
((SpelExpression) expression).setEvaluationContext(context);
23112311

23122312
assertThat(expression.getValue(String.class)).isEqualTo("hey there");
2313-
assertThat(((SpelNodeImpl) ((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2313+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
23142314
assertCanCompile(expression);
23152315
assertThat(expression.getValue(String.class)).isEqualTo("hey there");
23162316
}
@@ -2465,173 +2465,173 @@ void functionReferenceVarargs_SPR12359() throws Exception {
24652465

24662466
expression = parser.parseExpression("#append('a','b','c')");
24672467
assertThat(expression.getValue(context).toString()).isEqualTo("abc");
2468-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2468+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
24692469
assertCanCompile(expression);
24702470
assertThat(expression.getValue(context).toString()).isEqualTo("abc");
24712471

24722472
expression = parser.parseExpression("#append('a')");
24732473
assertThat(expression.getValue(context).toString()).isEqualTo("a");
2474-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2474+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
24752475
assertCanCompile(expression);
24762476
assertThat(expression.getValue(context).toString()).isEqualTo("a");
24772477

24782478
expression = parser.parseExpression("#append()");
24792479
assertThat(expression.getValue(context).toString()).isEmpty();
2480-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2480+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
24812481
assertCanCompile(expression);
24822482
assertThat(expression.getValue(context).toString()).isEmpty();
24832483

24842484
expression = parser.parseExpression("#append(#stringArray)");
24852485
assertThat(expression.getValue(context).toString()).isEqualTo("xyz");
2486-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2486+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
24872487
assertCanCompile(expression);
24882488
assertThat(expression.getValue(context).toString()).isEqualTo("xyz");
24892489

24902490
// This is a methodreference invocation, to compare with functionreference
24912491
expression = parser.parseExpression("append(#stringArray)");
24922492
assertThat(expression.getValue(context, new SomeCompareMethod2()).toString()).isEqualTo("xyz");
2493-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2493+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
24942494
assertCanCompile(expression);
24952495
assertThat(expression.getValue(context, new SomeCompareMethod2()).toString()).isEqualTo("xyz");
24962496

24972497
expression = parser.parseExpression("#append2('a','b','c')");
24982498
assertThat(expression.getValue(context).toString()).isEqualTo("abc");
2499-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2499+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25002500
assertCanCompile(expression);
25012501
assertThat(expression.getValue(context).toString()).isEqualTo("abc");
25022502

25032503
expression = parser.parseExpression("append2('a','b')");
25042504
assertThat(expression.getValue(context, new SomeCompareMethod2()).toString()).isEqualTo("ab");
2505-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2505+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25062506
assertCanCompile(expression);
25072507
assertThat(expression.getValue(context, new SomeCompareMethod2()).toString()).isEqualTo("ab");
25082508

25092509
expression = parser.parseExpression("#append2('a','b')");
25102510
assertThat(expression.getValue(context).toString()).isEqualTo("ab");
2511-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2511+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25122512
assertCanCompile(expression);
25132513
assertThat(expression.getValue(context).toString()).isEqualTo("ab");
25142514

25152515
expression = parser.parseExpression("#append2()");
25162516
assertThat(expression.getValue(context).toString()).isEmpty();
2517-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2517+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25182518
assertCanCompile(expression);
25192519
assertThat(expression.getValue(context).toString()).isEmpty();
25202520

25212521
expression = parser.parseExpression("#append3(#stringArray)");
25222522
assertThat(expression.getValue(context, new SomeCompareMethod2()).toString()).isEqualTo("xyz");
2523-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2523+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25242524
assertCanCompile(expression);
25252525
assertThat(expression.getValue(context, new SomeCompareMethod2()).toString()).isEqualTo("xyz");
25262526

25272527
// TODO Determine why the String[] is passed as the first element of the Object... varargs array instead of the entire varargs array.
25282528
// expression = parser.parseExpression("#append2(#stringArray)");
25292529
// assertThat(expression.getValue(context)).hasToString("xyz");
2530-
// assertThat(((SpelNodeImpl) ((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2530+
// assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25312531
// assertCanCompile(expression);
25322532
// assertThat(expression.getValue(context)).hasToString("xyz");
25332533

25342534
expression = parser.parseExpression("#sum(1,2,3)");
25352535
assertThat(expression.getValue(context)).isEqualTo(6);
2536-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2536+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25372537
assertCanCompile(expression);
25382538
assertThat(expression.getValue(context)).isEqualTo(6);
25392539

25402540
expression = parser.parseExpression("#sum(2)");
25412541
assertThat(expression.getValue(context)).isEqualTo(2);
2542-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2542+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25432543
assertCanCompile(expression);
25442544
assertThat(expression.getValue(context)).isEqualTo(2);
25452545

25462546
expression = parser.parseExpression("#sum()");
25472547
assertThat(expression.getValue(context)).isEqualTo(0);
2548-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2548+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25492549
assertCanCompile(expression);
25502550
assertThat(expression.getValue(context)).isEqualTo(0);
25512551

25522552
expression = parser.parseExpression("#sum(#intArray)");
25532553
assertThat(expression.getValue(context)).isEqualTo(20);
2554-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2554+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25552555
assertCanCompile(expression);
25562556
assertThat(expression.getValue(context)).isEqualTo(20);
25572557

25582558
expression = parser.parseExpression("#sumDouble(1.0d,2.0d,3.0d)");
25592559
assertThat(expression.getValue(context)).isEqualTo(6);
2560-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2560+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25612561
assertCanCompile(expression);
25622562
assertThat(expression.getValue(context)).isEqualTo(6);
25632563

25642564
expression = parser.parseExpression("#sumDouble(2.0d)");
25652565
assertThat(expression.getValue(context)).isEqualTo(2);
2566-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2566+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25672567
assertCanCompile(expression);
25682568
assertThat(expression.getValue(context)).isEqualTo(2);
25692569

25702570
expression = parser.parseExpression("#sumDouble()");
25712571
assertThat(expression.getValue(context)).isEqualTo(0);
2572-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2572+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25732573
assertCanCompile(expression);
25742574
assertThat(expression.getValue(context)).isEqualTo(0);
25752575

25762576
expression = parser.parseExpression("#sumDouble(#doubleArray)");
25772577
assertThat(expression.getValue(context)).isEqualTo(20);
2578-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2578+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25792579
assertCanCompile(expression);
25802580
assertThat(expression.getValue(context)).isEqualTo(20);
25812581

25822582
expression = parser.parseExpression("#sumFloat(1.0f,2.0f,3.0f)");
25832583
assertThat(expression.getValue(context)).isEqualTo(6);
2584-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2584+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25852585
assertCanCompile(expression);
25862586
assertThat(expression.getValue(context)).isEqualTo(6);
25872587

25882588
expression = parser.parseExpression("#sumFloat(2.0f)");
25892589
assertThat(expression.getValue(context)).isEqualTo(2);
2590-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2590+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25912591
assertCanCompile(expression);
25922592
assertThat(expression.getValue(context)).isEqualTo(2);
25932593

25942594
expression = parser.parseExpression("#sumFloat()");
25952595
assertThat(expression.getValue(context)).isEqualTo(0);
2596-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2596+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
25972597
assertCanCompile(expression);
25982598
assertThat(expression.getValue(context)).isEqualTo(0);
25992599

26002600
expression = parser.parseExpression("#sumFloat(#floatArray)");
26012601
assertThat(expression.getValue(context)).isEqualTo(20);
2602-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2602+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
26032603
assertCanCompile(expression);
26042604
assertThat(expression.getValue(context)).isEqualTo(20);
26052605

26062606

26072607
expression = parser.parseExpression("#appendChar('abc'.charAt(0),'abc'.charAt(1))");
26082608
assertThat(expression.getValue(context)).isEqualTo("ab");
2609-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2609+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
26102610
assertCanCompile(expression);
26112611
assertThat(expression.getValue(context)).isEqualTo("ab");
26122612

26132613

26142614
expression = parser.parseExpression("#append4('a','b','c')");
26152615
assertThat(expression.getValue(context).toString()).isEqualTo("a::bc");
2616-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2616+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
26172617
assertCanCompile(expression);
26182618
assertThat(expression.getValue(context).toString()).isEqualTo("a::bc");
26192619

26202620
expression = parser.parseExpression("#append4('a','b')");
26212621
assertThat(expression.getValue(context).toString()).isEqualTo("a::b");
2622-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2622+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
26232623
assertCanCompile(expression);
26242624
assertThat(expression.getValue(context).toString()).isEqualTo("a::b");
26252625

26262626
expression = parser.parseExpression("#append4('a')");
26272627
assertThat(expression.getValue(context).toString()).isEqualTo("a::");
2628-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2628+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
26292629
assertCanCompile(expression);
26302630
assertThat(expression.getValue(context).toString()).isEqualTo("a::");
26312631

26322632
expression = parser.parseExpression("#append4('a',#stringArray)");
26332633
assertThat(expression.getValue(context).toString()).isEqualTo("a::xyz");
2634-
assertThat(((SpelNodeImpl)((SpelExpression) expression).getAST()).isCompilable()).isTrue();
2634+
assertThat(((SpelExpression) expression).getAST().isCompilable()).isTrue();
26352635
assertCanCompile(expression);
26362636
assertThat(expression.getValue(context).toString()).isEqualTo("a::xyz");
26372637
}

0 commit comments

Comments
 (0)