Rewrite another `ThrowableAssertAlternative#withMessage(String, Objec…

…t...)` expression (#190)
PicnicSupermarket · Aug 17, 2022 · c39d125 · c39d125
1 parent 9bc732b
commit c39d125
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/.../main/java/tech/picnic/errorprone/refastertemplates/AssertJThrowingCallableTemplates.java b/.../main/java/tech/picnic/errorprone/refastertemplates/AssertJThrowingCallableTemplates.java
@@ -403,6 +403,32 @@ static final class AssertThatThrownByHasMessage {
     }
   }
 
+  static final class AssertThatThrownByHasMessageParameters {
+    @BeforeTemplate
+    @SuppressWarnings("AssertThatThrownBy" /* Matches strictly more specific expressions. */)
+    AbstractObjectAssert<?, ?> before(
+        Class<? extends Throwable> exceptionType,
+        ThrowingCallable throwingCallable,
+        String message,
+        @Repeated Object parameters) {
+      return assertThatExceptionOfType(exceptionType)
+          .isThrownBy(throwingCallable)
+          .withMessage(message, parameters);
+    }
+
+    @AfterTemplate
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    AbstractObjectAssert<?, ?> after(
+        Class<? extends Throwable> exceptionType,
+        ThrowingCallable throwingCallable,
+        String message,
+        @Repeated Object parameters) {
+      return assertThatThrownBy(throwingCallable)
+          .isInstanceOf(exceptionType)
+          .hasMessage(message, parameters);
+    }
+  }
+
   // XXX: Drop this template in favour of a generic Error Prone check which flags
   // `String.format(...)` arguments to a wide range of format methods.
   static final class AbstractThrowableAssertHasMessage {

diff --git a/...s/tech/picnic/errorprone/refastertemplates/AssertJThrowingCallableTemplatesTestInput.java b/...s/tech/picnic/errorprone/refastertemplates/AssertJThrowingCallableTemplatesTestInput.java
@@ -99,7 +99,6 @@ public ImmutableSet<?> elidedTypesAndStaticImports() {
     return assertThatIOException().isThrownBy(() -> {}).withMessage("foo");
   }
 
-  @SuppressWarnings("AssertThatThrownByIOException")
   AbstractObjectAssert<?, ?> testAssertThatThrownByIOExceptionHasMessageParameters() {
     return assertThatIOException().isThrownBy(() -> {}).withMessage("foo %s", "bar");
   }
@@ -114,6 +113,12 @@ public ImmutableSet<?> elidedTypesAndStaticImports() {
         .withMessage("foo");
   }
 
+  AbstractObjectAssert<?, ?> testAssertThatThrownByHasMessageParameters() {
+    return assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> {})
+        .withMessage("foo %s", "bar");
+  }
+
   ImmutableSet<AbstractThrowableAssert<?, ? extends Throwable>>
       testAbstractThrowableAssertHasMessage() {
     return ImmutableSet.of(

diff --git a/.../tech/picnic/errorprone/refastertemplates/AssertJThrowingCallableTemplatesTestOutput.java b/.../tech/picnic/errorprone/refastertemplates/AssertJThrowingCallableTemplatesTestOutput.java
@@ -120,7 +120,6 @@ public ImmutableSet<?> elidedTypesAndStaticImports() {
     return assertThatThrownBy(() -> {}).isInstanceOf(IOException.class).hasMessage("foo");
   }
 
-  @SuppressWarnings("AssertThatThrownByIOException")
   AbstractObjectAssert<?, ?> testAssertThatThrownByIOExceptionHasMessageParameters() {
     return assertThatThrownBy(() -> {}).isInstanceOf(IOException.class).hasMessage("foo %s", "bar");
   }
@@ -135,6 +134,12 @@ public ImmutableSet<?> elidedTypesAndStaticImports() {
         .hasMessage("foo");
   }
 
+  AbstractObjectAssert<?, ?> testAssertThatThrownByHasMessageParameters() {
+    return assertThatThrownBy(() -> {})
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("foo %s", "bar");
+  }
+
   ImmutableSet<AbstractThrowableAssert<?, ? extends Throwable>>
       testAbstractThrowableAssertHasMessage() {
     return ImmutableSet.of(