Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openrewrite/rewrite-testing-frameworks
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.33.0
Choose a base ref
...
head repository: openrewrite/rewrite-testing-frameworks
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.34.0
Choose a head ref
  • 13 commits
  • 29 files changed
  • 4 contributors

Commits on Mar 31, 2026

  1. Configuration menu
    Copy the full SHA
    54df3a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2026

  1. Configuration menu
    Copy the full SHA
    9fa909f View commit details
    Browse the repository at this point in the history
  2. Extend SimplifyMockitoVerifyWhenGiven for more S6068 cases (#953)

    Handle additional Mockito patterns where unnecessary eq() matchers
    should be removed: InOrder.verify(), BDDMockito.then().should(),
    BDDMockito.willXxx().given(), and MockedStatic.when()/verify()
    with lambda bodies.
    timtebeek authored Apr 2, 2026
    Configuration menu
    Copy the full SHA
    f47e7d8 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2026

  1. Add RemoveDoNothingForDefaultMocks to Mockito1to3Migration (#956)

    The recipe existed but was only included in MockitoBestPractices,
    not in the migration chain. This caused UnnecessaryStubbingException
    at runtime since Mockito 3.x enables strict stubbing by default.
    bmuschko authored Apr 3, 2026
    Configuration menu
    Copy the full SHA
    f044f96 View commit details
    Browse the repository at this point in the history
  2. Skip private method stubbing in PowerMockitoDoStubbingToMockito (#957)

    PowerMock's string-based `when(instance, "methodName")` API supports
    stubbing private methods, but standard Mockito cannot. The recipe was
    incorrectly rewriting these to `when(instance).methodName()`, producing
    uncompilable code. Now detects private methods and leaves the call
    unchanged with a comment guiding the user to refactor.
    bmuschko authored Apr 3, 2026
    Configuration menu
    Copy the full SHA
    36b3640 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2026

  1. Configuration menu
    Copy the full SHA
    a5c1ffd View commit details
    Browse the repository at this point in the history
  2. Add ThenThrowCheckedExceptionToRuntimeException recipe (#954)

    * Add ThenThrowCheckedExceptionToRuntimeException recipe
    
    Mockito 3+ validates that checked exceptions passed to `thenThrow()`
    are declared in the mocked method's `throws` clause. This recipe
    replaces undeclared checked exception class literals with
    `RuntimeException.class` and cleans up unused imports.
    
    * Regenerate recipes.csv
    
    * Simplify ThenThrowCheckedExceptionToRuntimeException
    
    - Replace manual method name/type checks with MethodMatcher
    - Use ListUtils.map instead of boolean changed + manual loop
    - Inline local variables and combine nested conditionals
    
    * Remove unnecessary PowerMockRunner stubs in ReplacePowerMockitoIntegrationTest
    
    The inline stub classes didn't extend Runner, causing compilation
    errors on CI. The real PowerMockRunner is already on the classpath
    via classpathFromResources, so the stubs are unnecessary.
    
    ---------
    
    Co-authored-by: Tim te Beek <[email protected]>
    bmuschko and timtebeek authored Apr 7, 2026
    Configuration menu
    Copy the full SHA
    c33bba2 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2026

  1. Configuration menu
    Copy the full SHA
    144f337 View commit details
    Browse the repository at this point in the history
  2. Fix AnyToNullable removing any() import when untyped any() is still u…

    …sed (#354) (#960)
    
    Also migrate no-arg any() from Mockito to ArgumentMatchers to prevent
    the import from being dropped when typed any(Class) is converted to
    nullable(Class).
    timtebeek authored Apr 8, 2026
    Configuration menu
    Copy the full SHA
    168f433 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dbdd9d1 View commit details
    Browse the repository at this point in the history
  4. Add UpgradeWiremockDependencyVersion recipe (#427) (#963)

    Migrate WireMock dependencies from old com.github.tomakehurst coordinates
    to new org.wiremock coordinates at version 3.x. Handles wiremock,
    wiremock-jre8, wiremock-standalone, and wiremock-jre8-standalone variants.
    Also hooks into JUnit5to6Migration since it already requires Java 17.
    timtebeek authored Apr 8, 2026
    Configuration menu
    Copy the full SHA
    03beae5 View commit details
    Browse the repository at this point in the history
  5. Support intermediate methods in SimplifyChainedAssertJAssertion (#812) (

    #962)
    
    Walk past .as(), .describedAs(), .withFailMessage(), and
    .overridingErrorMessage() when matching chained assertions, then splice
    them back into the transformed result.
    
    Closes #812
    timtebeek authored Apr 8, 2026
    Configuration menu
    Copy the full SHA
    d08715b View commit details
    Browse the repository at this point in the history
  6. Add MigrateToOracleFree recipe for Testcontainers (#964)

    * Add MigrateToOracleFree recipe for Testcontainers (#435)
    
    Migrate from `org.testcontainers:oracle-xe` to `org.testcontainers:oracle-free`,
    changing the type from `org.testcontainers.containers.OracleContainer` to
    `org.testcontainers.oracle.OracleContainer`.
    
    * Use dependsOn stubs instead of classpath.tsv.gz entries
    timtebeek authored Apr 8, 2026
    Configuration menu
    Copy the full SHA
    d650cdb View commit details
    Browse the repository at this point in the history
Loading