Skip to content

ReplacePowerMockito: ensure mockito-core is added when PowerMock is removed#920

Merged
timtebeek merged 4 commits intomainfrom
mboegers/add-mockito-core-on-powermock-removal
Feb 27, 2026
Merged

ReplacePowerMockito: ensure mockito-core is added when PowerMock is removed#920
timtebeek merged 4 commits intomainfrom
mboegers/add-mockito-core-on-powermock-removal

Conversation

@MBoegers
Copy link
Collaborator

@MBoegers MBoegers commented Feb 27, 2026

Summary

  • Replace RemoveDependency for powermock-api-mockito(2) with ChangeDependency to mockito-core:3.x
  • Ensures projects that only had Mockito transitively through PowerMock get an explicit mockito-core dependency
  • Added integration test verifying mockito-core appears in Gradle build files after migration

Problem

When a project declares only PowerMock dependencies (e.g., powermock-api-mockito) and gets Mockito transitively, ReplacePowerMockito removes the PowerMock dependencies but never adds mockito-core. The parent recipes (Mockito1to3Migration, etc.) use ChangeDependency and UpgradeDependencyVersion which only act on existing dependencies, so they can't help either.

Result: code uses Mockito APIs but has no Mockito dependency after the recipe runs.

Solution

Instead of removing powermock-api-mockito / powermock-api-mockito2 and hoping AddDependency fills the gap, use ChangeDependency to directly convert these PowerMock API dependencies into mockito-core:3.x. This avoids the stale resolved-dependency model issue where AddDependency sees mockito-core as still transitively available through the (about-to-be-removed) PowerMock dependency.

RemoveDependency is kept only for powermock-core (which has no Mockito equivalent).

Test plan

  • New integration test addsMockitoCoreWhenOnlyTransitiveThroughPowerMock — fails before fix, passes after

  • All existing *PowerMockito* tests pass

  • All *Mockito1to3*, *Mockito1to4*, *Mockito1to5* migration tests pass

  • Full ./gradlew build passes

  • Fixes moderneinc/customer-requests#1926

When a project only has PowerMock declared and gets Mockito transitively
through powermock-api-mockito, ReplacePowerMockito removes the PowerMock
dependencies but never adds mockito-core.

Reproduces moderneinc/customer-requests#1926
…moving it

When a project gets Mockito only transitively through powermock-api-mockito,
RemoveDependency leaves no Mockito dependency at all. Instead of removing and
then adding (which runs into stale GradleProject marker issues with
AddDependency), use ChangeDependency to convert powermock-api-mockito directly
to mockito-core:3.x.

Handles both powermock-api-mockito (Mockito 1) and powermock-api-mockito2
(Mockito 2) artifact names.

Fixes moderneinc/customer-requests#1926
@MBoegers MBoegers requested a review from bmuschko February 27, 2026 10:47
@MBoegers MBoegers marked this pull request as ready for review February 27, 2026 10:47
@github-project-automation github-project-automation bot moved this from In Progress to Ready to Review in OpenRewrite Feb 27, 2026
@timtebeek timtebeek merged commit 0e3d076 into main Feb 27, 2026
1 check passed
@timtebeek timtebeek deleted the mboegers/add-mockito-core-on-powermock-removal branch February 27, 2026 12:27
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Feb 27, 2026
mergify bot added a commit to robfrank/linklift that referenced this pull request Mar 10, 2026
…rom 3.28.0 to 3.29.0 [skip ci]

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

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

> 3.29.0
> ------
>
> What's Changed
> --------------
>
> * Detect JUnit version in PowerMockitoMockStaticToMockito by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-testing-frameworks#919](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/919)
> * ReplacePowerMockito: ensure mockito-core is added when PowerMock is removed by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-testing-frameworks#920](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/920)
> * Remove all remaining PowerMock dependencies in ReplacePowerMockito recipe by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-testing-frameworks#921](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/921)
> * Add JUnit 4 support to AddMockitoExtensionIfAnnotationsUsed by [`@​bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#922](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/922)
> * Use mockito-inline instead of mockito-core where applicable by [`@​bmuschko`](https://github.com/bmuschko) in [openrewrite/rewrite-testing-frameworks#923](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/923)
> * Add recipe to replace MockitoTestExecutionListener by [`@​steve-aom-elliott`](https://github.com/steve-aom-elliott) in [openrewrite/rewrite-testing-frameworks#924](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/924)
> * Remove empty constructors and suite() methods in MigrateJUnitTestCase by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#926](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/926)
>
> New Contributors
> ----------------
>
> * [`@​bmuschko`](https://github.com/bmuschko) made their first contribution in [openrewrite/rewrite-testing-frameworks#922](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/922)
>
> **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.28.0...v3.29.0>


Commits

* [`7796693`](openrewrite/rewrite-testing-frameworks@7796693) Remove empty constructors and suite() methods in MigrateJUnitTestCase ([#926](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/926))
* [`5c07d95`](openrewrite/rewrite-testing-frameworks@5c07d95) Add recipe to replace MockitoTestExecutionListener ([#924](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/924))
* [`f1b202d`](openrewrite/rewrite-testing-frameworks@f1b202d) Use mockito-inline instead of mockito-core where applicable ([#923](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/923))
* [`63820f4`](openrewrite/rewrite-testing-frameworks@63820f4) Add JUnit 4 support to AddMockitoExtensionIfAnnotationsUsed ([#1932](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/1932)) ([#922](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/922))
* [`e8bbdf0`](openrewrite/rewrite-testing-frameworks@e8bbdf0) Remove all remaining PowerMock dependencies in ReplacePowerMockito recipe ([#921](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/921))
* [`0e3d076`](openrewrite/rewrite-testing-frameworks@0e3d076) ReplacePowerMockito: ensure mockito-core is added when PowerMock is removed (...
* [`af19fad`](openrewrite/rewrite-testing-frameworks@af19fad) Detect JUnit version in PowerMockitoMockStaticToMockito ([#919](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/919))
* See full diff in [compare view](openrewrite/rewrite-testing-frameworks@v3.28.0...v3.29.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.28.0&new-version=3.29.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

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants