Skip to content

Detect JUnit version in PowerMockitoMockStaticToMockito#919

Merged
timtebeek merged 2 commits intomainfrom
mboegers/powermockito-junit4
Feb 27, 2026
Merged

Detect JUnit version in PowerMockitoMockStaticToMockito#919
timtebeek merged 2 commits intomainfrom
mboegers/powermockito-junit4

Conversation

@MBoegers
Copy link
Collaborator

@MBoegers MBoegers commented Feb 27, 2026

Summary

  • PowerMockitoMockStaticToMockito now detects the JUnit version and uses @Before/@After from org.junit for JUnit 4 projects instead of always defaulting to @BeforeEach/@AfterEach from JUnit Jupiter

  • Fixes the three-way detection: TestNG → @BeforeMethod/@AfterMethod, JUnit 4 → @Before/@After, Jupiter → @BeforeEach/@AfterEach

  • Also resets tearDownMethodAnnotationParameters in non-TestNG branches to prevent stale state if the visitor processes a TestNG file before a JUnit file

  • Fixes moderneinc/customer-requests#1925

Test plan

  • Added junit4PrepareForTestUsesBeforeAndAfter test confirming JUnit 4 input produces @Before/@After
  • Updated shouldNotDuplicateVarsAndMethods which had JUnit 4 input but expected Jupiter output (the bug)
  • All 19 PowerMockitoMockStaticToMockitoTest tests pass
  • All ReplacePowerMockitoIntegrationTest integration tests pass
  • Full test suite passes

Reproduces moderneinc/customer-requests#1925: when a test class uses
JUnit 4 (@org.junit.Test), ReplacePowerMockito should use @Before/@after
instead of @BeforeEach/@AfterEach.
When a test class uses JUnit 4 (@org.junit.Test), the recipe now
uses @Before/@after from org.junit instead of always defaulting to
@BeforeEach/@AfterEach from JUnit Jupiter.

Fixes moderneinc/customer-requests#1925
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Feb 27, 2026
@MBoegers MBoegers marked this pull request as ready for review February 27, 2026 10:48
@MBoegers MBoegers requested a review from bmuschko February 27, 2026 10:48
@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 af19fad into main Feb 27, 2026
1 check passed
@timtebeek timtebeek deleted the mboegers/powermockito-junit4 branch February 27, 2026 12:26
@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