Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
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: v2.21.0
Choose a base ref
Loading
...
head repository: openrewrite/rewrite-testing-frameworks
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.22.0
Choose a head ref
Loading
  • 20 commits
  • 53 files changed
  • 17 contributors

Commits on Oct 23, 2024

  1. refactor: Kill your Zombie code 

    Use this link to re-run the recipe: https://app.moderne.io/builder/mybR2aHWC?organizationId=T3BlblJld3JpdGU%3D

Co-authored-by: Moderne <team@moderne.io>
    @timtebeek @TeamModerne
    2 people authored and app committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    36074f0 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. refactor: add @nullable to methods who may return null (#621) 

    Use this link to re-run the recipe: https://app.moderne.io/builder/ji8mLIdUI?organizationId=T3BlblJld3JpdGU%3D

Co-authored-by: Moderne <team@moderne.io>
    @nielsdebruin @TeamModerne
    nielsdebruin and TeamModerne authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    386f3d4 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Place binary operator on the same line 

    As seen on #599
    @timtebeek
    timtebeek committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    6ab39a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. Add @MockitoSettings(strictness = ...) based on how Mockito is used… 

    …, not based on version alone (#623)

* The default strictness of Mockito did not change until v4

fixes #622

* Revert "The default strictness of Mockito did not change until v4"

This reverts commit ffdcd85.

* Added the MockitoSettings for MockitoRule strictness or silent method call.

* Repositioned stuff a bit

* Apply formatter to tests

* Demonstrate failure when using static import

* Poll strictness message before updateCursor

* Workaround left over prefix on modifier after adding annotation

* Remove unused import

---------

Co-authored-by: Jente Sondervorst <jente.sondervorst@colruytgroup.com>
Co-authored-by: Tim te Beek <tim@moderne.io>
    @Jenson3210 @timtebeek
    3 people authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4a8792e View commit details
    Browse the repository at this point in the history

  2. Drop RetainStrictnessWarn; replaced with #623 (#625)

    @timtebeek
    timtebeek authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    6820b1b View commit details
    Browse the repository at this point in the history

  3. Added default warn strictness if no strictness modifiers are used. (#626 

    )
    @Jenson3210
    Jenson3210 authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d856596 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. SimplifyChainedAssertJAssertion drops method calls in replacement (#629) 

    * Add test for maintaining method call after replacement

* Only get select when method name matches chained assertion

* Reuse CHAINED_ASSERT_MATCHER to check argument unpack

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
    @jtymes @timtebeek
    jtymes and timtebeek authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    05a917e View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. refactor: Standardize .editorconfig 

    Use this link to re-run the recipe: https://app.moderne.io/builder/N3MJaFjMF?organizationId=T3BlblJld3JpdGU%3D

Co-authored-by: Moderne <team@moderne.io>
    @natedanner @TeamModerne
    natedanner and TeamModerne committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    5f16e85 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2024

  1. Do not print template before use

    @timtebeek
    timtebeek committed Nov 2, 2024
    Configuration menu
    Copy the full SHA
    56fffc0 View commit details
    Browse the repository at this point in the history

  2. Add JMockit's MockUp to Mockito migration (#599) 

    * Add JMockit's MockUp to Mockito migration

* Adopt mockito-core:5.+ through parserClasspath

* Apply bot code suggestions

* Add type check for new class statement

* Fix statement construction

* Remove debug statement

* Fix code format

* Use CallRealMethod for non mock methods

* Update src/test/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockitoTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/test/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockitoTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/test/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockitoTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/test/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockitoTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/test/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockitoTest.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update src/main/java/org/openrewrite/java/testing/jmockit/JMockitMockUpToMockito.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Add description about private methods

* Update JMockitMockUpToMockitoTest.java

* Fix UT to match gralde build order

* Add setUp/tearDown support

* Add MockUp params support

* Remove useless

* Fix JavaTemplate type inference

* Remove unused local variables

* MockUp to try-with-resource

* Add import class test

* Add multiple mockUp test

* Apply bot suggestions

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Remove useless type  cast

* Fix variable naming

* Remove fqn from naming

* Remove unneeded method call

* Shorter var naming

* Update JMockitMockUpToMockitoTest.java

* Refactor mockup migration to resuse existing code and cleanup

* Resolve deprecated print()

* Utilize LambdaBlockToExpression

* Make constants

* Apply bot suggestions

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply formatter and fix compilation

* Place binary operators on the same line

* Add missing language hints

* Adopt AtomicReference instead of array element zero

* Fix workflow build

* Update src/main/java/org/openrewrite/java/testing/mockito/MockitoUtils.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Use mockito-core-3 instead of mockito-core-5

* Inline constants used once; Explicitly name reference var

* Use now public VariableReferences.findRhsReferences

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim te Beek <timtebeek@gmail.com>
Co-authored-by: Shivani Sharma <s.happyrose@gmail.com>
    @SiBorea @timtebeek
    @github-actions @shivanisky
    5 people authored Nov 2, 2024
    Configuration menu
    Copy the full SHA
    72232f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. Initial support for DbRider migration from junit4 to junit5 (#627) 

    * Initial draft of the ExecutionListenerToDbRiderAnnotation ScanningRecipe

fixes #624

* Added missing import

* Ran best practices

* Finishing up on the declarative recipe

* Finishing up on the declarative recipe

* Minimize tests

* Apply formatter

* Review comment refactoring

* Polish to static constructor & reduce visibility

* Final polish: fix header year & only use ridr-junit5 in src/main

---------

Co-authored-by: Jente Sondervorst <jente.sondervorst@colruytgroup.com>
Co-authored-by: Tim te Beek <tim@moderne.io>
    @Jenson3210 @timtebeek
    3 people authored Nov 3, 2024
    Configuration menu
    Copy the full SHA
    c4ab9a5 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. assertInstanceOf not converted from JUnit5 to assertJ (#606) 

    * add test to confirm issue

* Add `AssertInstanceOf` support for JUnitToAssertj recipe

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Add `AssertInstanceOf` support for JUnitToAssertj recipe

* Apply suggestions from code review

Co-authored-by: Tim te Beek <timtebeek@gmail.com>

* Apply suggestions from code review

* Apply suggestions from code review

* Apply suggestions from code review

* Demonstrate that all method invocations are visited, as preconditions apply to file

* Call super.visitMethodInvocation first, as is customary unless explicitly needed in a different order

* Reduce & fix tests

* Update src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertInstanceOfToAssertThat.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Extract constant for ASSERT_INSTANCE_OF_MATCHER

* Add multiple returns

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
Co-authored-by: lingenj <je.lingen@portofrotterdam.com>
Co-authored-by: Tim te Beek <timtebeek@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jacob van Lingen <jacobvanlingen@hotmail.com>
    @timo-abele @timtebeek
    @github-actions @jevanlingen
    6 people authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    da61d95 View commit details
    Browse the repository at this point in the history

  2. Add VerifyZeroToNoMoreInteractions for Mockito 2 (#631) 

    * Add `VerifyZeroToNoMoreInteractions` for Mockito 2

* Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Apply suggestions from code review

* Apply formatter

* Reuse ChangeMethodName, as that also changes the type and additional cases

* Fix casing issue in mockito.yml

---------

Co-authored-by: lingenj <je.lingen@portofrotterdam.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim te Beek <tim@moderne.io>
    @jevanlingen @github-actions @timtebeek
    4 people authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    9118a3c View commit details
    Browse the repository at this point in the history

  3. Do not execute Mockito1to4Migration twice in JUnit4to5Migration

    @timtebeek
    timtebeek committed Nov 5, 2024
    Configuration menu
    Copy the full SHA
    6d665a0 View commit details
    Browse the repository at this point in the history

  4. Added handling of org.mockito.Mockito.eq(..) when simplifying mockito… 

    … matchers (#635)

* Add test case for issue #634

* Add handling of org.mockito.Mockito.eq

* Apply formatter to minimize diff

* Add issue reference to document the change

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
    @adambir @timtebeek
    adambir and timtebeek authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    671addc View commit details
    Browse the repository at this point in the history

  5. Update AssertJ recipes to current recipe code style (#633) 

    * Update AssertJ recipes to current recipe code style

* Apply formatter and remove unused imports

* Apply suggestions from code review

---------

Co-authored-by: Tim te Beek <tim@moderne.io>
    @jevanlingen @timtebeek
    jevanlingen and timtebeek authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    909f0eb View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. refactor: Update Gradle wrapper 

    Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.gradle.UpdateGradleWrapper?organizationId=T3BlblJld3JpdGU%3D#defaults=W3sibmFtZSI6ImFkZElmTWlzc2luZyIsInZhbHVlIjoiRmFsc2UifV0=

Co-authored-by: Moderne <team@moderne.io>
    @shanman190 @TeamModerne
    shanman190 and TeamModerne committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    eb1e066 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Document that the JUnit to AssertJ migration includes Jupiter

    @timtebeek
    timtebeek committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    9a5b444 View commit details
    Browse the repository at this point in the history

  2. Create a mockito upgrade recipe that just does 4 -> 5, so it can be i… 

    …ncluded in Spring 3.1 upgrade.

Both "Migrate to Spring Boot 2.4" and "Mockito 5.x upgrade" include "Mockito 4.x upgrade"
So if we add "Mockito 5.x upgrade" into "Migrate to Spring Boot 3.1" then "Mockito 4.x upgrade", and all its constituent recipes, will be run twice. The performance cost of this is not dire, but the spring boot migration is already a very large recipe with ~2k steps.
    @sambsnyd
    sambsnyd committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    ef62c31 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Drop workaround following upstream fix 

    openrewrite/rewrite@f50e53b
    @timtebeek
    timtebeek committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    a04dd14 View commit details
    Browse the repository at this point in the history
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.