[martinfrancois]

Suggested review order: 25 of 52 (Score: 5)
Review first: openrewrite/rewrite-static-analysis#980

What's changed?

Keeps the first assertion's prefix and comments on the collapsed assertThat(...) call. Comments between later compatible assertions remain attached to their corresponding chained assertion.

What's your motivation?

Recipe: org.openrewrite.java.testing.assertj.CollapseConsecutiveAssertThatStatements.

I found this by running org.openrewrite.java.testing.assertj.CollapseConsecutiveAssertThatStatements from org.openrewrite.recipe:rewrite-testing-frameworks:3.42.0 on TestConventionTest.java in Symphony-Trello at a8013f27. I reproduced the same result with the latest released recipe artifact, org.openrewrite.recipe:rewrite-testing-frameworks:3.44.0.

Before

// then
assertThat(pom).contains("<jspecify.version>1.0.0</jspecify.version>");
assertThat(pom).contains(dependency);
assertThat(pom).doesNotContain("<artifactId>jspecify</artifactId>");

Actual after the recipe

assertThat(pom)
        // then
        .contains("<jspecify.version>1.0.0</jspecify.version>")
        .contains(dependency)
        .doesNotContain("<artifactId>jspecify</artifactId>");

Expected after the recipe

// then
assertThat(pom)
        .contains("<jspecify.version>1.0.0</jspecify.version>")
        .contains(dependency)
        .doesNotContain("<artifactId>jspecify</artifactId>");

The // then comment marks the start of the assertion phase. Moving it inside the fluent chain attaches it to the first .contains(...) call instead of the assertion block.

Confirmed real-world execution

• Project: Symphony-Trello.
• Location: TestConventionTest.java at a8013f27.
• Discovery checkout: martinfrancois/symphony-trello@a8013f27.

Anything in particular you'd like reviewers to focus on?

Please review comment ownership at the collapse boundary and the behavior when later assertions also have comments.

Have you considered any alternatives or workarounds?

Leaving all commented sequences uncollapsed would avoid movement but would reject safe cases where only later assertion comments need to remain on their calls.

Any additional context

Pre-existing tests changed: CollapseConsecutiveAssertThatStatementsTest.java.collapseIfMultipleConsecutiveAssertThatPresent (updated), CollapseConsecutiveAssertThatStatementsTest.java.preserveCommentsWhenCollapsingAssertions (updated).

• Target commit: martinfrancois/symphony-trello@a8013f27
• Discovery release: org.openrewrite.recipe:rewrite-testing-frameworks:3.42.0
• Latest verification release: org.openrewrite.recipe:rewrite-testing-frameworks:3.44.0
• Upstream reproduction commit: openrewrite/rewrite-testing-frameworks@23a04efc
• Focused test: CollapseConsecutiveAssertThatStatementsTest.preservesSectionCommentBeforeCollapsedChain

This change was prepared with AI assistance. I reviewed the target execution evidence, implementation, tests, and contribution text.

Checklist

• I've added unit tests to cover both positive and negative cases
• I've read and applied the recipe conventions and best practices
• I've run ./gradlew build locally, and committed any resulting changes to recipes.csv
• I've formatted the lines I changed, without reformatting code I didn't touch