Introduce StepVerifierLastStepVerifyErrorMatchesAssertions Refaster…

… rule
PicnicSupermarket · Apr 11, 2024 · 7395f93 · 7395f93
1 parent f4ab9b4
commit 7395f93
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/ReactorRules.java
@@ -1913,6 +1913,22 @@ Duration after(StepVerifier.LastStep step, Predicate<Throwable> predicate) {
     }
   }
 
+  /**
+   * Prefer {@link StepVerifier.LastStep#verifyErrorMatches(Predicate)} over more verbose
+   * alternatives.
+   */
+  static final class StepVerifierLastStepVerifyErrorMatchesAssertions {
+    @BeforeTemplate
+    void before(StepVerifier.LastStep step, Predicate<Throwable> predicate) {
+      step.expectError().verifyThenAssertThat().hasOperatorErrorMatching(predicate);
+    }
+
+    @AfterTemplate
+    void after(StepVerifier.LastStep step, Predicate<Throwable> predicate) {
+      step.verifyErrorMatches(predicate);
+    }
+  }
+
   /**
    * Prefer {@link StepVerifier.LastStep#verifyErrorSatisfies(Consumer)} over more verbose
    * alternatives.

diff --git a/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java b/...ontrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestInput.java
@@ -651,6 +651,14 @@ Duration testStepVerifierLastStepVerifyErrorMatches() {
         .verify();
   }
 
+  void testStepVerifierLastStepVerifyErrorMatchesAssertions() {
+    Mono.empty()
+        .as(StepVerifier::create)
+        .expectError()
+        .verifyThenAssertThat()
+        .hasOperatorErrorMatching(IllegalArgumentException.class::equals);
+  }
+
   Duration testStepVerifierLastStepVerifyErrorSatisfies() {
     return Mono.empty().as(StepVerifier::create).expectErrorSatisfies(t -> {}).verify();
   }

diff --git a/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java b/...ntrib/src/test/resources/tech/picnic/errorprone/refasterrules/ReactorRulesTestOutput.java
@@ -632,6 +632,12 @@ Duration testStepVerifierLastStepVerifyErrorMatches() {
         .verifyErrorMatches(IllegalArgumentException.class::equals);
   }
 
+  void testStepVerifierLastStepVerifyErrorMatchesAssertions() {
+    Mono.empty()
+        .as(StepVerifier::create)
+        .verifyErrorMatches(IllegalArgumentException.class::equals);
+  }
+
   Duration testStepVerifierLastStepVerifyErrorSatisfies() {
     return Mono.empty().as(StepVerifier::create).verifyErrorSatisfies(t -> {});
   }