Conversation
…type matching in CollapseConsecutiveAssertThatStatements - Add .contextSensitive() to JavaTemplate builders in HamcrestMatcherToAssertJ, HamcrestNotMatcherToAssertJ, and HamcrestIsMatcherToAssertJ to ensure templates are compiled in proper source context - Improve CollapseConsecutiveAssertThatStatements with fallback for partially resolved SELF return types (e.g., when assertion methods return AbstractIterableAssert instead of ListAssert) - Update test expectations: isNotNull() now collapses with other assertions and is removed by SimplifyRedundantAssertJChains - Add test case for custom types to verify hamcrest-to-AssertJ conversion works Fixes the issue where the AssertJ best practices recipe required multiple runs on Hamcrest test files before seeing chained assertions.
timtebeek
commented
Feb 21, 2026
Comment on lines
+188
to
+190
| assertThat(biscuits).hasSize(3); | ||
| assertThat(biscuits).contains(new Biscuit("Chocolate")); | ||
| assertThat(biscuits).doesNotContain(new Biscuit("Raisin")); |
Member
Author
There was a problem hiding this comment.
Ideally these are collapsed as well.
Use #{any(java.util.List)} instead of #{any()} for Java standard library
types in HamcrestMatcherToAssertJ.typeToIndicator(). This gives the
template parser enough type information to resolve the correct assertThat
overload, producing proper return types even when generic type parameters
reference custom types not on the template parser classpath.
This enables CollapseConsecutiveAssertThatStatements to chain assertions
on custom types (like List<Biscuit>) in a single pass, no longer
requiring TypeValidation.none() in tests.
mergify bot
added a commit
to robfrank/linklift
that referenced
this pull request
Feb 26, 2026
…rom 3.27.0 to 3.28.0 [skip ci] Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.27.0 to 3.28.0. Release notes *Sourced from [org.openrewrite.recipe:rewrite-testing-frameworks's releases](https://github.com/openrewrite/rewrite-testing-frameworks/releases).* > 3.28.0 > ------ > > What's Changed > -------------- > > * Fix 6 issues in AssertJ recipe migrations by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#911](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/911) > * Preserve throws clause when checked exceptions exist outside assertThrows. by [`@motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#899](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/899) > * Pin AssertJ to stable 3.27.7 by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#913](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/913) > * Add .contextSensitive() to Hamcrest conversion templates and improve type matching in `CollapseConsecutiveAssertThatStatements` by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#912](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/912) > * Fix 2 AssertJ migration recipe issues found via large-scale validation by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#914](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/914) > * Add Hamcrest to AssertJ recipes for hasProperty, everyItem, and hasItem(Matcher) by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#916](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/916) > * Add missing Hamcrest not(Matcher) to AssertJ conversions by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#917](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/917) > * Do not incorrectly strip method calls from assertion arguments by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#918](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/918) > > **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.27.0...v3.28.0> Commits * [`c2860b4`](openrewrite/rewrite-testing-frameworks@c2860b4) OpenRewrite recipe best practices * [`c75ba77`](openrewrite/rewrite-testing-frameworks@c75ba77) Do not incorrectly strip method calls from assertion arguments ([#918](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/918)) * [`bf27539`](openrewrite/rewrite-testing-frameworks@bf27539) Add missing Hamcrest `not(Matcher)` to AssertJ conversions ([#866](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/866)) ([#917](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/917)) * [`4f3f340`](openrewrite/rewrite-testing-frameworks@4f3f340) Update Gradle wrapper to 9.3.1 * [`a850e44`](openrewrite/rewrite-testing-frameworks@a850e44) Add Hamcrest to AssertJ recipes for hasProperty, everyItem, and hasItem(Match... * [`16f1501`](openrewrite/rewrite-testing-frameworks@16f1501) Fix 2 AssertJ migration recipe issues found via large-scale validation ([#914](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/914)) * [`c270c74`](openrewrite/rewrite-testing-frameworks@c270c74) Add .contextSensitive() to Hamcrest conversion templates and improve type mat... * [`00bc57f`](openrewrite/rewrite-testing-frameworks@00bc57f) Pin AssertJ to stable 3.27.7 ([#913](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/913)) * [`36ebbba`](openrewrite/rewrite-testing-frameworks@36ebbba) Preserve throws clause when checked exceptions exist outside assertThrows. (#... * [`58d2238`](openrewrite/rewrite-testing-frameworks@58d2238) OpenRewrite recipe best practices * Additional commits viewable in [compare view](openrewrite/rewrite-testing-frameworks@v3.27.0...v3.28.0) [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the issue where the AssertJ best practices recipe required multiple runs on Hamcrest test files before seeing chained assertions.