Skip to content

Include additional AssertJ rules/recipes from Error Prone Support #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Include additional AssertJ rules/recipes from Error Prone Support #713

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2cf63c1
Include additional AssertJ rules/recipes from Error Prone Support
timtebeek Apr 26, 2025
72d629a
Drop declarative recipes for Map, Iterator and Object assertions
timtebeek Apr 26, 2025
a729499
Merge branch 'main' into additional-assertj-rules-recipes
timtebeek Apr 26, 2025
23b248f
Merge branch 'main' into additional-assertj-rules-recipes
timtebeek Apr 30, 2025
ad629cd
Merge branch 'main' into additional-assertj-rules-recipes
timtebeek May 3, 2025
4ba13da
Adopt static imports after the refaster recipes have run
timtebeek May 3, 2025
fa31ef6
Merge branch 'main' into additional-assertj-rules-recipes
timtebeek May 4, 2025
dc6d670
Merge branch 'main' into additional-assertj-rules-recipes
timtebeek May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 9 additions & 100 deletions src/main/resources/META-INF/rewrite/assertj.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,35 @@ recipeList:
- org.openrewrite.java.testing.testng.TestNgToAssertj
- org.openrewrite.java.testing.assertj.AdoptAssertJDurationAssertions
- org.openrewrite.java.testing.assertj.IsEqualToIgnoringMillisToIsCloseToRecipe
- org.openrewrite.java.testing.assertj.StaticImports
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertions
- org.openrewrite.java.testing.assertj.SimplifyAssertJAssertions
- org.openrewrite.java.testing.assertj.SimplifyHasSizeAssertion

- tech.picnic.errorprone.refasterrules.AssertJBigDecimalRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJBigIntegerRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJBooleanRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJByteRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJCharSequenceRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJComparableRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJDoubleRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJEnumerableRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJFloatRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJIntegerRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJIterableRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJIteratorRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJLongRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJMapRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJNumberRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJObjectRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJOptionalRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJPrimitiveRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJRulesRecipes
- org.openrewrite.java.testing.assertj.AssertJShortRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJStringRulesRecipes
- tech.picnic.errorprone.refasterrules.AssertJThrowingCallableRulesRecipes

- org.openrewrite.java.testing.assertj.CollapseConsecutiveAssertThatStatements
- org.openrewrite.java.testing.assertj.StaticImports

---
type: specs.openrewrite.org/v1beta/recipe
Expand Down Expand Up @@ -306,105 +314,6 @@ recipeList:
assertToReplace: isTrue
dedicatedAssertion: containsAll
requiredType: java.util.Collection
# Map Assertions
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: size
assertToReplace: isEqualTo
dedicatedAssertion: hasSize
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: containsKey
assertToReplace: isTrue
dedicatedAssertion: containsKey
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: keySet
assertToReplace: contains
dedicatedAssertion: containsKey
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: keySet
assertToReplace: containsOnly
dedicatedAssertion: containsOnlyKeys
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: containsValue
assertToReplace: isTrue
dedicatedAssertion: containsValue
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: values
assertToReplace: contains
dedicatedAssertion: containsValue
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: get
assertToReplace: isEqualTo
dedicatedAssertion: containsEntry
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: isEmpty
assertToReplace: isTrue
dedicatedAssertion: isEmpty
requiredType: java.util.Map
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: isEmpty
assertToReplace: isFalse
dedicatedAssertion: isNotEmpty
requiredType: java.util.Map
# Optional Assertions
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: isPresent
assertToReplace: isTrue
dedicatedAssertion: isPresent
requiredType: java.util.Optional
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: isEmpty
assertToReplace: isTrue
dedicatedAssertion: isEmpty
requiredType: java.util.Optional
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: isPresent
assertToReplace: isFalse
dedicatedAssertion: isNotPresent
requiredType: java.util.Optional
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: isEmpty
assertToReplace: isFalse
dedicatedAssertion: isNotEmpty
requiredType: java.util.Optional
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: get
assertToReplace: isEqualTo
dedicatedAssertion: contains
requiredType: java.util.Optional
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: get
assertToReplace: isSameAs
dedicatedAssertion: containsSame
requiredType: java.util.Optional
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: hasNext
assertToReplace: isTrue
dedicatedAssertion: hasNext
requiredType: java.util.Iterator
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: hasNext
assertToReplace: isFalse
dedicatedAssertion: isExhausted
requiredType: java.util.Iterator
# Object assertions
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: toString
assertToReplace: isEqualTo
dedicatedAssertion: hasToString
requiredType: java.lang.Object
- org.openrewrite.java.testing.assertj.SimplifyChainedAssertJAssertion:
chainedAssertion: equals
assertToReplace: isTrue
dedicatedAssertion: isEqualTo
requiredType: java.lang.Object

---
type: specs.openrewrite.org/v1beta/recipe
name: org.openrewrite.java.testing.assertj.SimplifyAssertJAssertions
Expand Down
Loading