Upgrade AssertJ Core 3.20.2 -> 3.21.0

See: - https://assertj.github.io/doc/#assertj-core-release-notes - assertj/assertj@assertj-core-3.20.2...assertj-core-3.21.0
PicnicSupermarket · Sep 25, 2021 · e1bdb09 · e1bdb09
1 parent 0be162c
commit e1bdb09
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...rone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJTemplates.java b/...rone-contrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJTemplates.java
@@ -39,6 +39,7 @@
 import java.util.stream.Stream;
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.AbstractBooleanAssert;
+import org.assertj.core.api.AbstractCollectionAssert;
 import org.assertj.core.api.AbstractComparableAssert;
 import org.assertj.core.api.AbstractDoubleAssert;
 import org.assertj.core.api.AbstractIntegerAssert;
@@ -529,15 +530,15 @@ ListAssert<S> after(List<S> list1, List<T> list2) {
 
   static final class AssertThatSetsAreEqual<S, T extends S> {
     @BeforeTemplate
-    IterableAssert<S> before(Set<S> set1, Set<T> set2) {
+    AbstractCollectionAssert<?, ?, S, ?> before(Set<S> set1, Set<T> set2) {
       return Refaster.anyOf(
           assertThat(set1).isEqualTo(set2),
           assertThat(set1).containsExactlyInAnyOrderElementsOf(set2));
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    IterableAssert<S> after(Set<S> set1, Set<T> set2) {
+    AbstractCollectionAssert<?, ?, S, ?> after(Set<S> set1, Set<T> set2) {
       return assertThat(set1).hasSameElementsAs(set2);
     }
   }
@@ -548,13 +549,13 @@ IterableAssert<S> after(Set<S> set1, Set<T> set2) {
 
   static final class AssertThatMultisetsAreEqual<S, T extends S> {
     @BeforeTemplate
-    IterableAssert<S> before(Multiset<S> multiset1, Multiset<T> multiset2) {
+    AbstractCollectionAssert<?, ?, S, ?> before(Multiset<S> multiset1, Multiset<T> multiset2) {
       return assertThat(multiset1).isEqualTo(multiset2);
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    IterableAssert<S> after(Multiset<S> multiset1, Multiset<T> multiset2) {
+    AbstractCollectionAssert<?, ?, S, ?> after(Multiset<S> multiset1, Multiset<T> multiset2) {
       return assertThat(multiset1).containsExactlyInAnyOrderElementsOf(multiset2);
     }
   }
@@ -934,7 +935,7 @@ ListAssert<T> before(
     }
 
     @BeforeTemplate
-    IterableAssert<T> before2(
+    AbstractCollectionAssert<?, ?, T, ?> before2(
         Stream<S> stream, Collector<S, ?, ? extends Multiset<T>> collector, Iterable<U> iterable) {
       return assertThat(stream.collect(collector)).containsExactlyInAnyOrderElementsOf(iterable);
     }
@@ -955,7 +956,7 @@ ListAssert<T> before(
     }
 
     @BeforeTemplate
-    IterableAssert<T> before2(
+    AbstractCollectionAssert<?, ?, T, ?> before2(
         Stream<S> stream, Collector<S, ?, ? extends Multiset<T>> collector, U[] array) {
       return assertThat(stream.collect(collector)).containsExactlyInAnyOrder(array);
     }
@@ -979,7 +980,7 @@ ListAssert<T> before(
 
     @BeforeTemplate
     @SuppressWarnings("AssertThatStreamContainsExactlyInAnyOrder" /* Varargs converted to array. */)
-    IterableAssert<T> before2(
+    AbstractCollectionAssert<?, ?, T, ?> before2(
         Stream<S> stream, Collector<S, ?, ? extends Multiset<T>> collector, @Repeated U elements) {
       return assertThat(stream.collect(collector))
           .containsExactlyInAnyOrder(Refaster.asVarargs(elements));

diff --git a/pom.xml b/pom.xml
@@ -330,7 +330,7 @@
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>3.20.2</version>
+                <version>3.21.0</version>
             </dependency>
             <dependency>
                 <groupId>org.checkerframework</groupId>