Skip to content

Use FindImports and dependency-aware framework detection in ReplaceMockitoTestExecutionListener#925

Merged
timtebeek merged 6 commits intomainfrom
find-imports-refactor
Mar 9, 2026
Merged

Use FindImports and dependency-aware framework detection in ReplaceMockitoTestExecutionListener#925
timtebeek merged 6 commits intomainfrom
find-imports-refactor

Conversation

@steve-aom-elliott
Copy link
Contributor

@steve-aom-elliott steve-aom-elliott commented Mar 4, 2026

Summary

  • Replace manual import iteration in detectFramework() with FindImports search visitors
  • Add targetFramework option for dependency-based framework detection when no imports are present
  • Add three YAML wrapper recipes (...ForJUnit5, ...ForJUnit4, ...ForTestNG) gated by ModuleHasDependency preconditions
  • Update Mockito1to3Migration to use the wrapper recipes in priority order

When a file has @TestExecutionListeners(MockitoTestExecutionListener.class) but no JUnit/TestNG imports (e.g., an abstract base class with only @Mock fields), the recipe previously defaulted to JUnit 5 blindly. Now the YAML wrappers check project dependencies to determine the correct framework.

Import detection still takes priority over targetFramework, so a TestNG file in a JUnit 5 project still gets TestNG treatment.

Test plan

  • All existing tests pass (16 tests)
  • New test: targetFramework fallback when file has no framework imports
  • New test: import detection overrides targetFramework

@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Mar 4, 2026
@steve-aom-elliott steve-aom-elliott moved this from In Progress to Ready to Review in OpenRewrite Mar 4, 2026
@steve-aom-elliott steve-aom-elliott moved this from Ready to Review to In Progress in OpenRewrite Mar 4, 2026
@steve-aom-elliott steve-aom-elliott marked this pull request as draft March 4, 2026 15:27
@steve-aom-elliott
Copy link
Contributor Author

I want to check over one other thing regarding making sure it can detect correctly when we don't actually have any JUnit or TestNG annotations in the current class.

@steve-aom-elliott steve-aom-elliott changed the title Use FindImports for framework detection in ReplaceMockitoTestExecutionListener Use FindImports and dependency-aware framework detection in ReplaceMockitoTestExecutionListener Mar 4, 2026
@steve-aom-elliott steve-aom-elliott marked this pull request as ready for review March 4, 2026 16:08
@steve-aom-elliott steve-aom-elliott moved this from In Progress to Ready to Review in OpenRewrite Mar 4, 2026
…cutionListener

Replace manual import loop in detectFramework() with FindImports
search visitors for cleaner, more idiomatic framework detection.
Add a targetFramework @option that YAML wrapper recipes set based on
ModuleHasDependency preconditions. Import-based detection still takes
priority; the option is a fallback for files with no framework imports.

Three YAML wrapper recipes gate on JUnit 5, JUnit 4, and TestNG
dependencies respectively, replacing the single bare reference in
Mockito1to3Migration.
Since JUnit 5 (org.junit.jupiter..*) is matched first, any remaining
org.junit..* import is necessarily JUnit 4.
@timtebeek timtebeek changed the title Use FindImports and dependency-aware framework detection in ReplaceMockitoTestExecutionListener Use FindImports and dependency-aware framework detection in ReplaceMockitoTestExecutionListener Mar 9, 2026
@timtebeek timtebeek merged commit 8654451 into main Mar 9, 2026
1 check passed
@timtebeek timtebeek deleted the find-imports-refactor branch March 9, 2026 18:33
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Mar 9, 2026
@steve-aom-elliott
Copy link
Contributor Author

Going to put in another small PR because when the targetFramework changed from junit5 to jupiter, the switch statement didn't get updated. I'll just merge that once that's passing

mergify bot added a commit to robfrank/linklift that referenced this pull request Mar 19, 2026
…rom 3.29.0 to 3.30.0 [skip ci]

[//]: # (dependabot-start)
⚠️ \*\*Dependabot is rebasing this PR\*\* ⚠️
Rebasing might not happen immediately, so don't worry if this takes some time.
Note: if you make any changes to this PR yourself, they will take precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.29.0 to 3.30.0.
Release notes

*Sourced from [org.openrewrite.recipe:rewrite-testing-frameworks's releases](https://github.com/openrewrite/rewrite-testing-frameworks/releases).*

> 3.30.0
> ------
>
> What's Changed
> --------------
>
> * Use `FindImports` and dependency-aware framework detection in `ReplaceMockitoTestExecutionListener` by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-testing-frameworks#925](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/925)
> * Align targetFramework switch value with [`@​Option`](https://github.com/Option) valid values by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-testing-frameworks#928](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/928)
> * Add JSpecify to type table for `JUnitToAssertJRulesRecipes` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#929](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/929)
> * Fix CI failure from upstream AddDependency changes by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#931](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/931)
>
> **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.29.0...v3.30.0>


Commits

* [`5a24e73`](openrewrite/rewrite-testing-frameworks@5a24e73) Fix JUnit5MigrationTest.addMockitoJupiterDependencyIfExtendWithPresent ([#931](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/931))
* [`c789ee8`](openrewrite/rewrite-testing-frameworks@c789ee8) Lombok Best Practices
* [`08296c5`](openrewrite/rewrite-testing-frameworks@08296c5) Rename `MockWebServer shutdown()` to `close`
* [`40bd3da`](openrewrite/rewrite-testing-frameworks@40bd3da) OpenRewrite recipe best practices
* [`467ab04`](openrewrite/rewrite-testing-frameworks@467ab04) Add JSpecify to type table for `JUnitToAssertJRulesRecipes` ([#929](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/929))
* [`92a9ca4`](openrewrite/rewrite-testing-frameworks@92a9ca4) Align targetFramework switch case with [`@​Option`](https://github.com/Option) valid values ([#928](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/928))
* [`8654451`](openrewrite/rewrite-testing-frameworks@8654451) Use `FindImports` and dependency-aware framework detection in `ReplaceMockito...
* [`6d5852e`](openrewrite/rewrite-testing-frameworks@6d5852e) OpenRewrite recipe best practices
* See full diff in [compare view](openrewrite/rewrite-testing-frameworks@v3.29.0...v3.30.0)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-testing-frameworks&package-manager=maven&previous-version=3.29.0&new-version=3.30.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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request junit mockito

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants