Refaster assertj migrations support descriptions with format args (#926)

Refaster assertj migrations support descriptions with format args
palantir · Oct 2, 2019 · 70855ac · 70855ac
1 parent 5d85979
commit 70855ac
Show file tree

Hide file tree

Showing 18 changed files with 215 additions and 125 deletions.
diff --git a/...n/java/com/palantir/baseline/refaster/AssertjCollectionHasSizeExactlyWithDescription.java b/...n/java/com/palantir/baseline/refaster/AssertjCollectionHasSizeExactlyWithDescription.java
@@ -21,24 +21,25 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Collection;
 
 public final class AssertjCollectionHasSizeExactlyWithDescription<T> {
 
     @BeforeTemplate
-    void bad1(Collection<T> things, int size, String description) {
-        assertThat(things.size() == size).describedAs(description).isTrue();
+    void bad1(Collection<T> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() == size).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void bad2(Collection<T> things, int size, String description) {
-        assertThat(things.size()).describedAs(description).isEqualTo(size);
+    void bad2(Collection<T> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isEqualTo(size);
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(Collection<T> things, int size, String description) {
-        assertThat(things).describedAs(description).hasSize(size);
+    void after(Collection<T> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).hasSize(size);
     }
 }
diff --git a/...va/com/palantir/baseline/refaster/AssertjCollectionHasSizeGreaterThanWithDescription.java b/...va/com/palantir/baseline/refaster/AssertjCollectionHasSizeGreaterThanWithDescription.java
@@ -21,24 +21,25 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Collection;
 
 public final class AssertjCollectionHasSizeGreaterThanWithDescription<T> {
 
     @BeforeTemplate
-    void before1(Collection<T> things, int size, String description) {
-        assertThat(things.size() > size).describedAs(description).isTrue();
+    void before1(Collection<T> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() > size).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before2(Collection<T> things, int size, String description) {
-        assertThat(things.size()).describedAs(description).isGreaterThan(size);
+    void before2(Collection<T> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isGreaterThan(size);
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(Collection<T> things, int size, String description) {
-        assertThat(things).describedAs(description).hasSizeGreaterThan(size);
+    void after(Collection<T> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).hasSizeGreaterThan(size);
     }
 }
diff --git a/...src/main/java/com/palantir/baseline/refaster/AssertjCollectionIsEmptyWithDescription.java b/...src/main/java/com/palantir/baseline/refaster/AssertjCollectionIsEmptyWithDescription.java
@@ -21,34 +21,35 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Collection;
 
 public final class AssertjCollectionIsEmptyWithDescription<T> {
 
     @BeforeTemplate
-    void bad1(Collection<T> things, String description) {
-        assertThat(things.size() == 0).describedAs(description).isTrue();
+    void bad1(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() == 0).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void bad2(Collection<T> things, String description) {
-        assertThat(things.isEmpty()).describedAs(description).isTrue();
+    void bad2(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.isEmpty()).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void bad3(Collection<T> things, String description) {
-        assertThat(things.size()).describedAs(description).isZero();
+    void bad3(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isZero();
     }
 
     @BeforeTemplate
-    void bad4(Collection<T> things, String description) {
-        assertThat(things.size()).describedAs(description).isEqualTo(0);
+    void bad4(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isEqualTo(0);
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(Iterable<T> things, String description) {
-        assertThat(things).describedAs(description).isEmpty();
+    void after(Iterable<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isEmpty();
     }
 }
diff --git a/.../main/java/com/palantir/baseline/refaster/AssertjCollectionIsNotEmptyWithDescription.java b/.../main/java/com/palantir/baseline/refaster/AssertjCollectionIsNotEmptyWithDescription.java
@@ -23,60 +23,61 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Collection;
 import java.util.Collections;
 
 public final class AssertjCollectionIsNotEmptyWithDescription<T> {
 
     @BeforeTemplate
-    void bad1(Collection<T> things, String description) {
-        assertThat(things.size() != 0).describedAs(description).isTrue();
+    void bad1(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() != 0).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void bad2(Collection<T> things, String description) {
-        assertThat(things.size() == 0).describedAs(description).isFalse();
+    void bad2(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() == 0).describedAs(description, descriptionArgs).isFalse();
     }
 
     @BeforeTemplate
-    void bad3(Collection<T> things, String description) {
-        assertThat(things.size()).describedAs(description).isNotEqualTo(0);
+    void bad3(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isNotEqualTo(0);
     }
 
     @BeforeTemplate
-    void bad4(Collection<T> things, String description) {
-        assertThat(things.isEmpty()).describedAs(description).isFalse();
+    void bad4(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.isEmpty()).describedAs(description, descriptionArgs).isFalse();
     }
 
     @BeforeTemplate
-    void bad5(Collection<T> things, String description) {
-        assertThat(!things.isEmpty()).describedAs(description).isTrue();
+    void bad5(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(!things.isEmpty()).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void bad6(Collection<T> things, String description) {
-        assertThat(things).describedAs(description).isNotEqualTo(Collections.emptyList());
+    void bad6(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isNotEqualTo(Collections.emptyList());
     }
 
     @BeforeTemplate
-    void bad7(Collection<T> things, String description) {
-        assertThat(things).describedAs(description).isNotEqualTo(Collections.emptySet());
+    void bad7(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isNotEqualTo(Collections.emptySet());
     }
 
     @BeforeTemplate
-    void bad8(Collection<T> things, String description) {
-        assertThat(things).describedAs(description).isNotEqualTo(ImmutableList.of());
+    void bad8(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isNotEqualTo(ImmutableList.of());
     }
 
     @BeforeTemplate
-    void bad9(Collection<T> things, String description) {
-        assertThat(things).describedAs(description).isNotEqualTo(ImmutableSet.of());
+    void bad9(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isNotEqualTo(ImmutableSet.of());
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(Collection<T> things, String description) {
-        assertThat(things).describedAs(description).isNotEmpty();
+    void after(Collection<T> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isNotEmpty();
     }
 }
diff --git a/...ster-rules/src/main/java/com/palantir/baseline/refaster/AssertjEqualsWithDescription.java b/...ster-rules/src/main/java/com/palantir/baseline/refaster/AssertjEqualsWithDescription.java
@@ -21,6 +21,7 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Objects;
 
@@ -31,28 +32,28 @@
 public final class AssertjEqualsWithDescription<T> {
 
     @BeforeTemplate
-    void before1(T expected, T actual, String description) {
-        assertThat(actual.equals(expected)).describedAs(description).isTrue();
+    void before1(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(actual.equals(expected)).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before2(T expected, T actual, String description) {
-        assertThat(Objects.equals(actual, expected)).describedAs(description).isTrue();
+    void before2(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(Objects.equals(actual, expected)).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before3(T expected, T actual, String description) {
-        assertThat(!actual.equals(expected)).describedAs(description).isFalse();
+    void before3(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(!actual.equals(expected)).describedAs(description, descriptionArgs).isFalse();
     }
 
     @BeforeTemplate
-    void before4(T expected, T actual, String description) {
-        assertThat(!Objects.equals(actual, expected)).describedAs(description).isFalse();
+    void before4(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(!Objects.equals(actual, expected)).describedAs(description, descriptionArgs).isFalse();
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(T expected, T actual, String description) {
-        assertThat(actual).describedAs(description).isEqualTo(expected);
+    void after(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(actual).describedAs(description, descriptionArgs).isEqualTo(expected);
     }
 }
diff --git a/...-rules/src/main/java/com/palantir/baseline/refaster/AssertjInstanceOfWithDescription.java b/...-rules/src/main/java/com/palantir/baseline/refaster/AssertjInstanceOfWithDescription.java
@@ -22,18 +22,19 @@
 import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 
 public final class AssertjInstanceOfWithDescription<T, E> {
 
     @BeforeTemplate
-    void before(T input, String description) {
-        assertThat(Refaster.<E>isInstance(input)).describedAs(description).isTrue();
+    void before(T input, String description, @Repeated Object descriptionArgs) {
+        assertThat(Refaster.<E>isInstance(input)).describedAs(description, descriptionArgs).isTrue();
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(T input, String description) {
-        assertThat(input).describedAs(description).isInstanceOf(Refaster.<E>clazz());
+    void after(T input, String description, @Repeated Object descriptionArgs) {
+        assertThat(input).describedAs(description, descriptionArgs).isInstanceOf(Refaster.<E>clazz());
     }
 }
diff --git a/...src/main/java/com/palantir/baseline/refaster/AssertjMapHasSizeExactlyWithDescription.java b/...src/main/java/com/palantir/baseline/refaster/AssertjMapHasSizeExactlyWithDescription.java
@@ -21,24 +21,25 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Map;
 
 public final class AssertjMapHasSizeExactlyWithDescription<K, V> {
 
     @BeforeTemplate
-    void before1(Map<K, V> things, int size, String description) {
-        assertThat(things.size() == size).describedAs(description).isTrue();
+    void before1(Map<K, V> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() == size).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before2(Map<K, V> things, int size, String description) {
-        assertThat(things.size()).describedAs(description).isEqualTo(size);
+    void before2(Map<K, V> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isEqualTo(size);
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(Map<K, V> things, int size, String description) {
-        assertThat(things).describedAs(description).hasSize(size);
+    void after(Map<K, V> things, int size, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).hasSize(size);
     }
 }
diff --git a/...-rules/src/main/java/com/palantir/baseline/refaster/AssertjMapIsEmptyWithDescription.java b/...-rules/src/main/java/com/palantir/baseline/refaster/AssertjMapIsEmptyWithDescription.java
@@ -21,39 +21,40 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Map;
 
 public final class AssertjMapIsEmptyWithDescription<K, V> {
 
     @BeforeTemplate
-    void before1(Map<K, V> things, String description) {
-        assertThat(things.size() == 0).describedAs(description).isTrue();
+    void before1(Map<K, V> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size() == 0).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before2(Map<K, V> things, String description) {
-        assertThat(things.isEmpty()).describedAs(description).isTrue();
+    void before2(Map<K, V> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.isEmpty()).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before3(Map<K, V> things, String description) {
-        assertThat(things.size()).describedAs(description).isZero();
+    void before3(Map<K, V> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isZero();
     }
 
     @BeforeTemplate
-    void before4(Map<K, V> things, String description) {
-        assertThat(things.size()).describedAs(description).isEqualTo(0);
+    void before4(Map<K, V> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things.size()).describedAs(description, descriptionArgs).isEqualTo(0);
     }
 
     @BeforeTemplate
-    void before5(Map<K, V> things, String description) {
-        assertThat(things).describedAs(description).hasSize(0);
+    void before5(Map<K, V> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).hasSize(0);
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(Map<K, V> things, String description) {
-        assertThat(things).describedAs(description).isEmpty();
+    void after(Map<K, V> things, String description, @Repeated Object descriptionArgs) {
+        assertThat(things).describedAs(description, descriptionArgs).isEmpty();
     }
 }
diff --git a/...r-rules/src/main/java/com/palantir/baseline/refaster/AssertjNotEqualsWithDescription.java b/...r-rules/src/main/java/com/palantir/baseline/refaster/AssertjNotEqualsWithDescription.java
@@ -21,6 +21,7 @@
 import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
+import com.google.errorprone.refaster.annotation.Repeated;
 import com.google.errorprone.refaster.annotation.UseImportPolicy;
 import java.util.Objects;
 
@@ -31,28 +32,28 @@
 public final class AssertjNotEqualsWithDescription<T> {
 
     @BeforeTemplate
-    void before1(T expected, T actual, String description) {
-        assertThat(!actual.equals(expected)).describedAs(description).isTrue();
+    void before1(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(!actual.equals(expected)).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before2(T expected, T actual, String description) {
-        assertThat(!Objects.equals(actual, expected)).describedAs(description).isTrue();
+    void before2(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(!Objects.equals(actual, expected)).describedAs(description, descriptionArgs).isTrue();
     }
 
     @BeforeTemplate
-    void before3(T expected, T actual, String description) {
-        assertThat(actual.equals(expected)).describedAs(description).isFalse();
+    void before3(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(actual.equals(expected)).describedAs(description, descriptionArgs).isFalse();
     }
 
     @BeforeTemplate
-    void before4(T expected, T actual, String description) {
-        assertThat(Objects.equals(actual, expected)).describedAs(description).isFalse();
+    void before4(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(Objects.equals(actual, expected)).describedAs(description, descriptionArgs).isFalse();
     }
 
     @AfterTemplate
     @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    void after(T expected, T actual, String description) {
-        assertThat(actual).describedAs(description).isNotEqualTo(expected);
+    void after(T expected, T actual, String description, @Repeated Object descriptionArgs) {
+        assertThat(actual).describedAs(description, descriptionArgs).isNotEqualTo(expected);
     }
 }