Skip to content

Fix/850 testcontainers2 migration only springboot4#854

Merged
timtebeek merged 4 commits intoopenrewrite:mainfrom
Thomas-Iapichino:fix/850-testcontainers2-migration-only-springboot4
Nov 26, 2025
Merged

Fix/850 testcontainers2 migration only springboot4#854
timtebeek merged 4 commits intoopenrewrite:mainfrom
Thomas-Iapichino:fix/850-testcontainers2-migration-only-springboot4

Conversation

@Thomas-Iapichino
Copy link
Contributor

@Thomas-Iapichino Thomas-Iapichino commented Nov 26, 2025

What's changed?

Changes:

  • Reverted ExcludeJUnit4UnlessUsingTestcontainers recipe precondition to check for org.testcontainers:*:1.x instead of spring-boot-testcontainers
  • Removed Testcontainers2Migration from the ExcludeJUnit4UnlessUsingTestcontainers recipe list
  • Updated test expectations to verify no changes occur when Testcontainers 1.x is present
  • Added issue Spring Boot upgrades (any version) now causes upgrade to Testcontainers 2 #850 reference to affected tests

What's your motivation?

Anything in particular you'd like reviewers to focus on?

  • The precondition now checks for org.testcontainers:*:1.x specifically. This ensures that:
    • Projects using Testcontainers 1.x keep JUnit 4 (as TC 1.x needs it)
    • Projects using Testcontainers 2.x can still exclude JUnit 4
    • Projects without Testcontainers can exclude JUnit 4

Anyone you would like to review specifically?

Have you considered any alternatives or workarounds?

Any additional context

Checklist

  • I've added unit tests to cover both positive and negative cases
  • I've read and applied the recipe conventions and best practices
  • I've used the IntelliJ IDEA auto-formatter on affected files

@timtebeek timtebeek self-requested a review November 26, 2025 10:33
@timtebeek timtebeek moved this from In Progress to Ready to Review in OpenRewrite Nov 26, 2025
@timtebeek timtebeek merged commit bcdee03 into openrewrite:main Nov 26, 2025
2 checks passed
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Nov 26, 2025
mergify bot added a commit to robfrank/linklift that referenced this pull request Dec 14, 2025
…rom 3.22.0 to 3.23.0 [skip ci]

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

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

> 3.23.0
> ------
>
> What's Changed
> --------------
>
> * Add `@ExtendWith(MockitoExtension.class)` Test using Mockito Annotations by [`@​MBoegers`](https://github.com/MBoegers) in [openrewrite/rewrite-testing-frameworks#848](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/848)
> * Add troubleshooting context info when ParseError encountered in `GradleUseJunitJupiter` by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-testing-frameworks#852](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/852)
> * Fix/850 testcontainers2 migration only springboot4 by [`@​Thomas-Iapichino`](https://github.com/Thomas-Iapichino) in [openrewrite/rewrite-testing-frameworks#854](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/854)
> * Fixed the expectation to be correctly spaced + formatted args by [`@​Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-testing-frameworks#855](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/855)
> * Simplify redundant AssertJ chains of `hasSize` and `containsExactly` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#857](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/857)
> * Simplify AssertJ `stream().map(Function)` to `extracting(Function)` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-testing-frameworks#856](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/856)
> * `AssertThrowsOnLastStatement`: Support calls with lambda parameters by [`@​knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#859](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/859)
> * Fix bugs in `HamcrestMatcherToAssertJ` and `HamcrestIsMatcherToAssertJ` by [`@​knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#863](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/863)
> * `HamcrestMatcherToAssertJ`: `isNull()` and `isNotNull()` take no args by [`@​knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#864](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/864)
> * Fix variable name conflict in JMockit to Mockito migration by [`@​knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-testing-frameworks#865](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/865)
>
> New Contributors
> ----------------
>
> * [`@​Thomas-Iapichino`](https://github.com/Thomas-Iapichino) made their first contribution in [openrewrite/rewrite-testing-frameworks#854](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/pull/854)
>
> **Full Changelog**: <openrewrite/rewrite-testing-frameworks@v3.22.0...v3.23.0>


Commits

* [`fe6c497`](openrewrite/rewrite-testing-frameworks@fe6c497) Update recipe documentation examples
* [`fa95357`](openrewrite/rewrite-testing-frameworks@fa95357) Fix variable name conflict in JMockit to Mockito migration ([#865](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/865))
* [`5869a99`](openrewrite/rewrite-testing-frameworks@5869a99) `HamcrestMatcherToAssertJ`: `isNull()` and `isNotNull()` take no args ([#864](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/864))
* [`6ea4619`](openrewrite/rewrite-testing-frameworks@6ea4619) Fix bugs in `HamcrestMatcherToAssertJ` and `HamcrestIsMatcherToAssertJ` ([#863](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/863))
* [`bd7ec84`](openrewrite/rewrite-testing-frameworks@bd7ec84) `AssertThrowsOnLastStatement`: Support calls with lambda parameters ([#859](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/859))
* [`959c88b`](openrewrite/rewrite-testing-frameworks@959c88b) Fix order of Hamcrest migration recipes
* [`ebb0358`](openrewrite/rewrite-testing-frameworks@ebb0358) `MigrateTruthToAssertJ` should not call `RemoveUnusedImports` unrestricted
* [`df6b865`](openrewrite/rewrite-testing-frameworks@df6b865) Skip `CsvSourceToValueSource` if textBlock attribute is used
* [`d623f54`](openrewrite/rewrite-testing-frameworks@d623f54) Simplify AssertJ `stream().map(Function)` to `extracting(Function)` ([#856](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/856))
* [`a9829fb`](openrewrite/rewrite-testing-frameworks@a9829fb) Simplify redundant AssertJ chains of `hasSize` and `containsExactly` ([#857](https://redirect.github.com/openrewrite/rewrite-testing-frameworks/issues/857))
* Additional commits viewable in [compare view](openrewrite/rewrite-testing-frameworks@v3.22.0...v3.23.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.22.0&new-version=3.23.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 merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@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

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

Spring Boot upgrades (any version) now causes upgrade to Testcontainers 2

3 participants