matchers: code throw exception value matcher (#1544)

Author: MykolaGolubyev

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

@@ -293,6 +293,22 @@ public static ThrowExceptionMatcher throwException(String expectedMessage) {
         return new ThrowExceptionMatcher(expectedMessage);
     }
 
+    /**
+     * Throw exception <code>code</code> matcher.
+     * <pre>
+     * code(() -&gt; {
+     *     businessLogic(-10);
+     * }).should(throwException(contain("negatives are not")));
+     * </pre>
+     * @see #code(CodeBlock)
+     *
+     * @param expectedMessageMatcher expected exception message ValueMatcher
+     * @return matcher instance
+     */
+    public static ThrowExceptionMatcher throwException(ValueMatcher expectedMessageMatcher) {
+        return new ThrowExceptionMatcher(expectedMessageMatcher);
+    }
+
     /**
      * Throw exception <code>code</code> matcher.
      * <pre>

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

@@ -17,10 +17,7 @@
 
 package org.testingisdocumenting.webtau.expectation.code;
 
-import org.testingisdocumenting.webtau.expectation.ActualValueAware;
-import org.testingisdocumenting.webtau.expectation.CodeBlock;
-import org.testingisdocumenting.webtau.expectation.CodeMatcher;
-import org.testingisdocumenting.webtau.expectation.ExpectedValuesAware;
+import org.testingisdocumenting.webtau.expectation.*;
 import org.testingisdocumenting.webtau.expectation.equality.CompareToComparator;
 import org.testingisdocumenting.webtau.reporter.TokenizedMessage;
 import org.testingisdocumenting.webtau.reporter.stacktrace.StackTraceUtils;
@@ -34,20 +31,23 @@
 import static org.testingisdocumenting.webtau.WebTauCore.*;
 
 public class ThrowExceptionMatcher implements CodeMatcher, ExpectedValuesAware, ActualValueAware {
-    private String expectedMessage;
-    private Pattern expectedMessageRegexp;
+    private Object expectedMessageMatcherOrValue;
     private Class<?> expectedClass;
     private String thrownMessage;
     private Class<?> thrownClass;
     private CompareToComparator comparator;
     private String thrownExceptionStackTrace;
 
     public ThrowExceptionMatcher(String expectedMessage) {
-        this.expectedMessage = expectedMessage;
+        this.expectedMessageMatcherOrValue = expectedMessage;
+    }
+
+    public ThrowExceptionMatcher(ValueMatcher expectedMessageMatcher) {
+        this.expectedMessageMatcherOrValue = expectedMessageMatcher;
     }
 
     public ThrowExceptionMatcher(Pattern expectedMessageRegexp) {
-        this.expectedMessageRegexp = expectedMessageRegexp;
+        this.expectedMessageMatcherOrValue = expectedMessageRegexp;
     }
 
     public ThrowExceptionMatcher(Class<?> expectedClass) {
@@ -56,12 +56,12 @@ public ThrowExceptionMatcher(Class<?> expectedClass) {
 
     public ThrowExceptionMatcher(Class<?> expectedClass, Pattern expectedMessageRegexp) {
         this.expectedClass = expectedClass;
-        this.expectedMessageRegexp = expectedMessageRegexp;
+        this.expectedMessageMatcherOrValue = expectedMessageRegexp;
     }
 
     public ThrowExceptionMatcher(Class<?> expectedClass, String expectedMessage) {
         this.expectedClass = expectedClass;
-        this.expectedMessage = expectedMessage;
+        this.expectedMessageMatcherOrValue = expectedMessage;
     }
 
     @Override
@@ -90,19 +90,15 @@ public TokenizedMessage mismatchedTokenizedMessage(CodeBlock codeBlock) {
 
     @Override
     public Stream<Object> expectedValues() {
-        if (expectedMessage != null && expectedClass != null) {
-            return Stream.of(expectedClass, expectedMessage);
+        if (expectedMessageMatcherOrValue != null && expectedClass != null) {
+            return Stream.of(expectedClass, expectedMessageMatcherOrValue);
         }
 
         if (expectedClass != null) {
             return Stream.of(expectedClass);
         }
 
-        if (expectedMessage != null) {
-            return Stream.of(expectedMessage);
-        }
-
-        return Stream.empty();
+        return Stream.ofNullable(expectedMessageMatcherOrValue);
     }
 
     @Override
@@ -128,7 +124,7 @@ public boolean matches(CodeBlock codeBlock) {
 
     private Map<String, Object> buildThrownToUseForCompare() {
         Map<String, Object> result = new HashMap<>();
-        if (expectedMessage != null || expectedMessageRegexp != null) {
+        if (expectedMessageMatcherOrValue != null) {
             result.put("message", thrownMessage);
         }
 
@@ -141,12 +137,8 @@ private Map<String, Object> buildThrownToUseForCompare() {
 
     private Map<String, Object> buildExpectedMapToUseForCompare() {
         Map<String, Object> result = new HashMap<>();
-        if (expectedMessage != null) {
-            result.put("message", expectedMessage);
-        }
-
-        if (expectedMessageRegexp != null) {
-            result.put("message", expectedMessageRegexp);
+        if (expectedMessageMatcherOrValue != null) {
+            result.put("message", expectedMessageMatcherOrValue);
         }
 
         if (expectedClass != null) {

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

@@ -48,6 +48,27 @@ class ThrowExceptionMatcherGroovyTest {
         }
     }
 
+    @Test
+    void "should validate exception using contain matcher mismatch case"() {
+        runExpectExceptionAndValidateOutput(AssertionError, contain('> expecting code to throw exception <contain "message1">\n' +
+                'X failed expecting code to throw exception <contain "message1">:\n' +
+                '    exception.message: no match found')) {
+            code {
+                throw new RuntimeException('error message')
+            } should throwException(contain('message1'))
+        }
+    }
+
+    @Test
+    void "should validate exception using contain matcher match case"() {
+        runAndValidateOutput('> expecting code to throw exception <contain "message">\n' +
+                '. code thrown <contain "message"> (Xms)') {
+            code {
+                throw new RuntimeException('error message')
+            } should throwException(contain('message'))
+        }
+    }
+
     @Test
     void "should validate exception class"() {
         runExpectExceptionAndValidateOutput(AssertionError, contain('X failed expecting code to throw exception java.lang.UnsupportedOperationException:\n' +