Skip to content

Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks#904

Merged
Jenson3210 merged 6 commits intomainfrom
dsgrieve/remove-openmocks-with-mockito-extension
Feb 6, 2026
Merged

Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks#904
Jenson3210 merged 6 commits intomainfrom
dsgrieve/remove-openmocks-with-mockito-extension

Conversation

@dsgrieve
Copy link
Copy Markdown
Contributor

@dsgrieve dsgrieve commented Jan 29, 2026 •
edited by moderne-meeseeks bot
Loading

Summary

  • Extends RemoveInitMocksIfRunnersSpecified recipe to handle MockitoAnnotations.openMocks(this) in addition to initMocks

  • When @ExtendWith(MockitoExtension.class) or @RunWith(MockitoJUnitRunner.class) is present, the recipe now removes the complete openMocks lifecycle:

    • The AutoCloseable field declaration
    • The assignment statement (mocks = MockitoAnnotations.openMocks(this))
    • The close() call in @AfterEach/@After methods
    • Empty setup/teardown methods after removal

  • Closes moderneinc/customer-requests#1775

Test plan

  • Added test for removing openMocks(this) simple case
  • Added test for removing openMocks with static import
  • Added test for NOT removing openMocks without runners (no change expected)
  • Added test for complete openMocks lifecycle (field + assignment + close() + AfterEach)
  • Verified existing initMocks tests still pass

@dsgrieve
Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks
0ebfe5e 
When `@ExtendWith(MockitoExtension.class)` or `@RunWith(MockitoJUnitRunner.class)`
is present, this recipe now removes both:
- `MockitoAnnotations.initMocks(this)`
- `MockitoAnnotations.openMocks(this)`

For the openMocks case, the recipe also handles:
- Field declarations (e.g., `private AutoCloseable mocks`)
- Assignment statements (e.g., `mocks = MockitoAnnotations.openMocks(this)`)
- close() calls on the AutoCloseable field
- Empty @AfterEach/@after methods after removing close() calls

Closes moderneinc/customer-requests#1775
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Jan 29, 2026
github-actions[bot]
github-actions bot reviewed Jan 30, 2026
View reviewed changes
@dsgrieve dsgrieve requested a review from timtebeek January 30, 2026 19:16
github-actions[bot]
github-actions bot reviewed Jan 30, 2026
View reviewed changes
github-actions[bot]
github-actions bot reviewed Jan 30, 2026
View reviewed changes
@dsgrieve @github-actions
Apply suggestions from code review
61f1b7f 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Jenson3210
Jenson3210 reviewed Feb 4, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@Jenson3210 Jenson3210 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left 1 comment with "readability" question and updateCursor usage, but other than that this looks okay to me

@dsgrieve dsgrieve requested a review from Jenson3210 February 5, 2026 16:30
@github-project-automation github-project-automation bot moved this from In Progress to Ready to Review in OpenRewrite Feb 6, 2026
@Jenson3210 Jenson3210 merged commit cf78c5a into main Feb 6, 2026
2 checks passed
@Jenson3210 Jenson3210 deleted the dsgrieve/remove-openmocks-with-mockito-extension branch February 6, 2026 11:23
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Feb 6, 2026
timtebeek
timtebeek reviewed Feb 9, 2026
View reviewed changes
src/main/java/org/openrewrite/java/testing/mockito/RemoveInitMocksIfRunnersSpecified.java
private static final MethodMatcher INIT_MOCKS_MATCHER = new MethodMatcher("org.mockito.MockitoAnnotations initMocks(..)", false);
private static final MethodMatcher OPEN_MOCKS_MATCHER = new MethodMatcher("org.mockito.MockitoAnnotations openMocks(..)", false);
private static final MethodMatcher CLOSEABLE_MATCHER = new MethodMatcher("java.lang.AutoCloseable close()", false);
private static List<AnnotationMatcher> BEFORE_AND_AFTER_MATCHERS = Arrays.asList(
Copy link
Copy Markdown
Member

@timtebeek timtebeek Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
private static List<AnnotationMatcher> BEFORE_AND_AFTER_MATCHERS = Arrays.asList(
private static final List<AnnotationMatcher> BEFORE_AND_AFTER_MATCHERS = Arrays.asList(

mergify bot added a commit to robfrank/linklift that referenced this pull request Feb 14, 2026
@mergify
chore(deps): bump org.openrewrite.recipe:rewrite-testing-frameworks f…
e052594 
…rom 3.26.0 to 3.27.0 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-testing-frameworks](https://github.com/openrewrite/rewrite-testing-frameworks) from 3.26.0 to 3.27.0.
Release notes

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

> 3.27.0
> ------
>
> What's Changed
> --------------
>
> * Correcting MockWebServer migration for OkHttp by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-testing-frameworks#849](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/849)
> * Add `ReturnActual` recipe for AssertJ by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#891](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/891)
> * Add `MockConstructionToTryWithResources` recipe by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#892](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/892)
> * Add CleanupKotlinJUnit5AssertionImports recipe by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#893](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/893)
> * Skip Kotlin files in PowerMockitoMockStaticToMockito by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#894](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/894)
> * Add test cases for `MockedConstruction` pattern by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-testing-frameworks#895](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/895)
> * Update byte buddy to a Java 25 compatible version by [`@​Laurens-W`](https://github.com/Laurens-W) in [openrewrite/rewrite-testing-frameworks#897](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/897)
> * Followup after the formatting merge by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#900](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/900)
> * Skip TemporaryFolder conversion when used in RuleChain. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#898](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/898)
> * Add JUnit 4 to JUnit 5 exception class migrations. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#902](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/902)
> * Make declarative recipes singletons by [`@​sambsnyd`](https://github.com/sambsnyd) in [openrewrite/rewrite-testing-frameworks#905](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/905)
> * Handle method references in JUnit Assert to Assertions migration. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#901](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/901)
> * Add explicit test scope to AssertJ dependency additions by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/903)
> * Skip SimplifyChainedAssertJAssertion when actual type has wildcard type parameters by [`@​knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#906](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/906)
> * Revert "Add explicit test scope to AssertJ dependency additions ([#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/903))" by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#907](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/907)
> * Fix AssertThrowsOnLastStatement to preserve parameterized types when extracting arguments. by [`@​motlin`](https://github.com/motlin) in [openrewrite/rewrite-testing-frameworks#908](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/908)
> * Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks by [`@​dsgrieve`](https://github.com/dsgrieve) in [openrewrite/rewrite-testing-frameworks#904](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/904)
> * `RemoveInitMocksIfRunnersSpecified` (or any recipe) should not have a mutable static field by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#910](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/910)
>
> New Contributors
> ----------------
>
> * [`@​motlin`](https://github.com/motlin) made their first contribution in [openrewrite/rewrite-testing-frameworks#898](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/898)
> * [`@​dsgrieve`](https://github.com/dsgrieve) made their first contribution in [openrewrite/rewrite-testing-frameworks#904](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/904)
>
> **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.26.0...v3.27.0>


Commits

* [`41e6b42`](openrewrite/rewrite-testing-frameworks@41e6b42) Extract documentation examples from tests
* [`403dd48`](openrewrite/rewrite-testing-frameworks@403dd48) review comment ([#910](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/910))
* [`e6c383b`](openrewrite/rewrite-testing-frameworks@e6c383b) Delete files
* [`cf78c5a`](openrewrite/rewrite-testing-frameworks@cf78c5a) Enhance RemoveInitMocksIfRunnersSpecified to also remove openMocks ([#904](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/904))
* [`75c12cd`](openrewrite/rewrite-testing-frameworks@75c12cd) Fix AssertThrowsOnLastStatement to preserve parameterized types when extracti...
* [`07b43cd`](openrewrite/rewrite-testing-frameworks@07b43cd) Revert "Add explicit test scope to AssertJ dependency additions ([#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/903))" ([#907](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/907))
* [`3a67bb9`](openrewrite/rewrite-testing-frameworks@3a67bb9) Skip SimplifyChainedAssertJAssertion when actual type has wildcard type param...
* [`02eba0f`](openrewrite/rewrite-testing-frameworks@02eba0f) Add explicit test scope to AssertJ dependency additions ([#903](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/903))
* [`4e79908`](openrewrite/rewrite-testing-frameworks@4e79908) Handle method references in JUnit Assert to Assertions migration. ([#901](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/901))
* [`35409b0`](openrewrite/rewrite-testing-frameworks@35409b0) Make declarative recipes singletons ([#905](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/905))
* Additional commits viewable in [compare view](openrewrite/rewrite-testing-frameworks@v3.26.0...v3.27.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.26.0&new-version=3.27.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

Reviewers

@timtebeek timtebeek timtebeek left review comments

@github-actions github-actions[bot] github-actions[bot] left review comments

@Jenson3210 Jenson3210 Jenson3210 approved these changes

Assignees

@dsgrieve dsgrieve

Labels

None yet

Projects

OpenRewrite
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dsgrieve @timtebeek @Jenson3210