add tests for AssertExceptionMatches

Author: stoty

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestGenericTestUtils.java

@@ -25,6 +25,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.function.Supplier;
+import java.util.regex.Pattern;
+
 import org.slf4j.event.Level;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -38,6 +40,7 @@ public void testAssertExceptionContainsNullEx() throws Throwable {
     try {
       assertExceptionContains("", null);
     } catch (AssertionError e) {
+      // AssertionError not actually thrown
       if (!e.toString().contains(E_NULL_THROWABLE)) {
         throw e;
       }
@@ -49,6 +52,7 @@ public void testAssertExceptionContainsNullString() throws Throwable {
     try {
       assertExceptionContains("", new BrokenException());
     } catch (AssertionError e) {
+      // AssertionError not actually thrown
       if (!e.toString().contains(E_NULL_THROWABLE_STRING)) {
         throw e;
       }
@@ -76,6 +80,51 @@ public void testAssertExceptionContainsWorking() throws Throwable {
     assertExceptionContains("Expected", new Exception("Expected"));
   }
 
+  @Test
+  public void testAssertExceptionMatchesNullEx() throws Throwable {
+    try {
+      assertExceptionMatches(Pattern.compile(""), null);
+    } catch (AssertionError e) {
+      // AssertionError not actually thrown
+      if (!e.toString().contains(E_NULL_THROWABLE)) {
+        throw e;
+      }
+    }
+  }
+
+  @Test
+  public void testAssertExceptionMatchesNullString() throws Throwable {
+    try {
+      assertExceptionMatches(Pattern.compile(""), new BrokenException());
+    } catch (AssertionError e) {
+      // AssertionError not actually thrown
+      if (!e.toString().contains(E_NULL_THROWABLE_STRING)) {
+        throw e;
+      }
+    }
+  }
+
+  @Test
+  public void testAssertExceptionMatchesWrongText() throws Throwable {
+    try {
+      assertExceptionMatches(Pattern.compile(".*Expected.*"), new Exception("(actual)"));
+    } catch (AssertionError e) {
+      String s = e.toString();
+      if (!s.contains(E_UNEXPECTED_EXCEPTION)
+          || !s.contains("(actual)") ) {
+        throw e;
+      }
+      if (e.getCause() == null) {
+        throw new AssertionError("No nested cause in assertion", e);
+      }
+    }
+  }
+
+  @Test
+  public void testAssertExceptionMatchesWorking() throws Throwable {
+    assertExceptionMatches(Pattern.compile(".*Expected.*"), new Exception("Expected"));
+  }
+
   private static class BrokenException extends Exception {
     public BrokenException() {
     }