AssertThrowsOnLastStatement: Support calls with lambda parameters (#859)

Added `J.Lambda` to the list of expression types that should be skipped in the `extractExpressionArguments` method:

```java
if (e instanceof J.Identifier || e instanceof J.Literal || e instanceof J.Empty || e instanceof J.Lambda) {
    return e;
}
```

Lambdas are effectively "constant" expressions that don't need to be extracted into separate variables - they're anonymous functions that don't depend on mutable state that would change during the extraction.

Author: knutwannheden

src/main/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatement.java

@@ -148,7 +148,7 @@ private Statement extractExpressionArguments(Statement lambdaStatement, List<Sta
                     J.MethodInvocation mi = (J.MethodInvocation) lambdaStatement;
                     Map<String, Integer> generatedVariableSuffixes = new HashMap<>();
                     return mi.withArguments(ListUtils.map(mi.getArguments(), e -> {
-                        if (e instanceof J.Identifier || e instanceof J.Literal || e instanceof J.Empty || e == null) {
+                        if (e instanceof J.Identifier || e instanceof J.Literal || e instanceof J.Empty || e instanceof J.Lambda) {
                             return e;
                         }
 

src/test/java/org/openrewrite/java/testing/junit5/AssertThrowsOnLastStatementTest.java

@@ -39,8 +39,8 @@ public void defaults(RecipeSpec spec) {
     @DocumentExample
     @Test
     void applyToLastStatementWithDeclaringVariableThreeLines() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -89,8 +89,8 @@ void foo() {
 
     @Test
     void applyToLastStatementWithDeclaringVariableThreeLinesHasLineBefore() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -141,8 +141,8 @@ void foo() {
 
     @Test
     void applyToLastStatementNoDeclaringVariableTwoLinesNoLinesAfter() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -185,8 +185,8 @@ void foo() {
 
     @Test
     void applyToLastStatementHasMessage() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -230,8 +230,8 @@ void foo() {
 
     @Test
     void makeNoChangesAsOneLine() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -257,8 +257,8 @@ void foo() {
     @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/618")
     @Test
     void bodyNull() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -283,8 +283,8 @@ interface InnerInterface {
 
     @Test
     void lastStatementHasArgumentWhichIsMethodCall() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -336,8 +336,8 @@ void test() {
 
     @Test
     void lastStatementHasArgumentWhichIsChainedMethodCall() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -391,8 +391,8 @@ void test() {
 
     @Test
     void lastStatementHasArgumentWhichIsExpression() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -444,17 +444,18 @@ void test() {
 
     @Test
     void lastStatementHasArgumentWhichNeedImport() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
-             import java.nio.file.Path;
+              import java.nio.file.Path;
 
-             class Tester {
-                 public static void testThing(Path path) {}
-             }
-             """
+              class Tester {
+                  public static void testThing(Path path) {}
+              }
+              """
           ),
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -507,8 +508,8 @@ void test() {
 
     @Test
     void lastStatementHasArgumentWhichNeedImportFromSource() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               package org.test.other;
@@ -521,6 +522,7 @@ public static void testThing(SomeObject someObject) {}
               }
               """
           ),
+          //language=java
           java(
             """
               package org.test;
@@ -575,8 +577,8 @@ void test() {
 
     @Test
     void uniqueVariableNames() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -627,8 +629,8 @@ void testThing(String one, String two) {}
 
     @Test
     void variableNameAlreadyExists() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -687,8 +689,8 @@ void testThing(String one, String two) {}
 
     @Test
     void duplicateVariableNames() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -739,8 +741,8 @@ void testThing(String one, String two, String three, String four) {}
 
     @Test
     void lambdaWithSingleStatementStillExtractsVariable() {
-        //language=java
         rewriteRun(
+          //language=java
           java(
             """
               import org.junit.jupiter.api.Test;
@@ -781,4 +783,61 @@ void testThing(String one) {}
           )
         );
     }
+
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/858")
+    @Test
+    void lastStatementWithLambdaArguments() {
+        rewriteRun(
+          spec -> spec.parser(JavaParser.fromJavaVersion()
+            .classpathFromResources(new InMemoryExecutionContext(), "junit-jupiter-api-5", "assertj-core-3")),
+          //language=java
+          java(
+            """
+              import org.junit.jupiter.api.Test;
+
+              import static org.assertj.core.api.Assertions.assertThat;
+              import static org.junit.jupiter.api.Assertions.assertThrows;
+
+              class MyTest {
+
+                  @Test
+                  void test() {
+                      assertThrows(Exception.class, () -> {
+                          doA();
+                          assertThat(getB()).satisfies(
+                              arg -> assertThat(arg).isNotNull(),
+                              arg -> assertThat(arg).isEqualTo("expected")
+                          );
+                      });
+                  }
+
+                  void doA() {}
+                  String getB() { return "B"; }
+              }
+              """,
+            """
+              import org.junit.jupiter.api.Test;
+
+              import static org.assertj.core.api.Assertions.assertThat;
+              import static org.junit.jupiter.api.Assertions.assertThrows;
+
+              class MyTest {
+
+                  @Test
+                  void test() {
+                      doA();
+                      assertThrows(Exception.class, () ->
+                          assertThat(getB()).satisfies(
+                              arg -> assertThat(arg).isNotNull(),
+                              arg -> assertThat(arg).isEqualTo("expected")
+                          ));
+                  }
+
+                  void doA() {}
+                  String getB() { return "B"; }
+              }
+              """
+          )
+        );
+    }
 }