TestNgToAssertj: emit a static import for assertThat#1033
Merged
Conversation
Normalize the AssertJ entry points introduced by TestNgToAssertj to a static import via UseStaticImport, so qualified Assert.assertX(...) calls become static-imported assertThat(...) instead of mirroring the source qualification as Assertions.assertThat(...). Fixes #1029
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TestNgToAssertjpreviously mirrored the source's qualification style: qualifiedAssert.assertX(...)calls became qualifiedAssertions.assertThat(...), while statically-imported calls stayed static-imported. A class that mixed both styles ended up with a mixed import form (import static ...assertThatandimport ...Assertions).This composes
org.openrewrite.java.UseStaticImportfororg.assertj.core.api.Assertions *(..)as a cleanup step, normalizing every AssertJ entry point the recipe introduces (assertThat,assertThatThrownBy,assertThatExceptionOfType,fail, …) to a static import — AssertJ's documented convention — regardless of the original TestNG qualification.The broad
Assertjrecipe already ranStaticImportsafterTestNgToAssertj, so this only changes behavior whenTestNgToAssertjruns standalone, which is what the issue reports.Added a test exercising the standalone recipe on qualified
Assert.calls.