matchers: code throw exception value matcher with class (#1547)

Author: MykolaGolubyev

webtau-core/src/main/java/org/testingisdocumenting/webtau/Matchers.java

@@ -374,4 +374,21 @@ public static ThrowExceptionMatcher throwException(Class<?> expectedClass, Patte
     public static ThrowExceptionMatcher throwException(Class<?> expectedClass, String expectedMessage) {
         return new ThrowExceptionMatcher(expectedClass, expectedMessage);
     }
+
+    /**
+     * Throw exception <code>code</code> matcher.
+     * <pre>
+     * code(() -&gt; {
+     *     businessLogic(-10);
+     * }).should(throwException(IllegalArgumentException.class, contain("negatives are not")));
+     * </pre>
+     * @see #code(CodeBlock)
+     *
+     * @param expectedClass expected exception class
+     * @param expectedMessageMatcher expected exception message ValueMatcher
+     * @return matcher instance
+     */
+    public static ThrowExceptionMatcher throwException(Class<?> expectedClass, ValueMatcher expectedMessageMatcher) {
+        return new ThrowExceptionMatcher(expectedClass, expectedMessageMatcher);
+    }
 }

webtau-core/src/main/java/org/testingisdocumenting/webtau/expectation/code/ThrowExceptionMatcher.java

@@ -64,6 +64,11 @@ public ThrowExceptionMatcher(Class<?> expectedClass, String expectedMessage) {
         this.expectedMessageMatcherOrValue = expectedMessage;
     }
 
+    public ThrowExceptionMatcher(Class<?> expectedClass, ValueMatcher expectedMessageMatcher) {
+        this.expectedClass = expectedClass;
+        this.expectedMessageMatcherOrValue = expectedMessageMatcher;
+    }
+
     @Override
     public TokenizedMessage matchingTokenizedMessage() {
         return tokenizedMessage().matcher("to throw exception").value(buildExpectedValueForMessage());
@@ -123,26 +128,21 @@ public boolean matches(CodeBlock codeBlock) {
     }
 
     private Map<String, Object> buildThrownToUseForCompare() {
-        Map<String, Object> result = new HashMap<>();
-        if (expectedMessageMatcherOrValue != null) {
-            result.put("message", thrownMessage);
-        }
-
-        if (expectedClass != null) {
-            result.put("class", thrownClass);
-        }
-
-        return result;
+        return createMap(thrownMessage, thrownClass);
     }
 
     private Map<String, Object> buildExpectedMapToUseForCompare() {
+        return createMap(expectedMessageMatcherOrValue, expectedClass);
+    }
+
+    private Map<String, Object> createMap(Object message, Class<?> aClass) {
         Map<String, Object> result = new HashMap<>();
         if (expectedMessageMatcherOrValue != null) {
-            result.put("message", expectedMessageMatcherOrValue);
+            result.put("message", message);
         }
 
         if (expectedClass != null) {
-            result.put("class", expectedClass);
+            result.put("class", aClass);
         }
 
         return result;

webtau-core/src/test/groovy/org/testingisdocumenting/webtau/expectation/code/ThrowExceptionMatcherGroovyTest.groovy

@@ -107,6 +107,16 @@ class ThrowExceptionMatcherGroovyTest {
         }
     }
 
+    @Test
+    void "should validate exception using class and contain matcher mismatch case"() {
+        runAndValidateOutput("> expecting code to throw exception {\"message\": <contain \"message\">, \"class\": java.lang.IllegalArgumentException}\n" +
+                ". code thrown {\"message\": <contain \"message\">, \"class\": java.lang.IllegalArgumentException} (Xms)") {
+            code {
+                throw new IllegalArgumentException('error message')
+            } should throwException(IllegalArgumentException.class, contain('message'))
+        }
+    }
+
     @Test
     void "should add exception stack trace when mismatched"() {
         runExpectExceptionAndValidateOutput(AssertionError.class, contain("stack trace:\n" +

webtau-docs/znai/release-notes/2.3/add-2023-11-10-code-throw-matcher.md

@@ -0,0 +1 @@
+* Add: `throwException` `code` matcher accepts `ValueMatchers` in addition to `String` and `Pattern`