[testng] 271/355: Fix #417 Expected Exceptions Message fails to match multi-line messages

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit 36a896bac213e65f939b12652bdfb9c8b917fc80
Author: Julien Herr <julien.herr at alcatel-lucent.com>
Date:   Thu May 7 13:34:28 2015 +0200

    Fix #417 Expected Exceptions Message fails to match multi-line messages
---
 CHANGES.txt                                                       | 1 +
 src/main/java/org/testng/internal/Invoker.java                    | 2 +-
 src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java | 2 +-
 src/test/java/test/expectedexceptions/SampleExceptions2.java      | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index a170e8a..5ff203d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -30,6 +30,7 @@ New: GITHUB-645: TestNG project on Google Code redirect to GitHub
 Fixed: GITHUB-310: Upgrade Guice (kronar & Julien Herr)
 Fixed: GITHUB-87: @BeforeSuite/@BeforeTest methods happens to be disabled by mistake (romlom & Julien Herr)
 Fixed: GITHUB-425: Wrong invocation order with lastTimeOnly (Rafael Winterhalter & Julien Herr)
+Fixed: GITHUB-417: Expected Exceptions Message fails to match multi-line messages (Michael Diamond)
 
 6.8.21:
 2015/02/02
diff --git a/src/main/java/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java
index f699c5a..30657ba 100644
--- a/src/main/java/org/testng/internal/Invoker.java
+++ b/src/main/java/org/testng/internal/Invoker.java
@@ -1481,7 +1481,7 @@ public class Invoker implements IInvoker {
       return true;
     } else {
       final String message = ite.getMessage();
-      return message != null && Pattern.matches(messageRegExp, message);
+      return message != null && Pattern.compile(messageRegExp, Pattern.DOTALL).matcher(ite.getMessage()).matches();
     }
   }
 
diff --git a/src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java b/src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java
index 90e5fd2..b106364 100644
--- a/src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java
+++ b/src/test/java/test/expectedexceptions/ExpectedExceptionsTest.java
@@ -17,7 +17,7 @@ public class ExpectedExceptionsTest extends BaseTest {
   @Test
   public void expectedExceptions() {
     runTest("test.expectedexceptions.SampleExceptions2",
-        new String[] { "shouldPass", "shouldPass2", "shouldPass3" },
+        new String[] { "shouldPass", "shouldPass2", "shouldPass3", "shouldPass4" },
         new String[] { "shouldFail1", "shouldFail2", "shouldFail3", "shouldFail4" },
         new String[] {});
   }
diff --git a/src/test/java/test/expectedexceptions/SampleExceptions2.java b/src/test/java/test/expectedexceptions/SampleExceptions2.java
index 302cb0d..da47a87 100644
--- a/src/test/java/test/expectedexceptions/SampleExceptions2.java
+++ b/src/test/java/test/expectedexceptions/SampleExceptions2.java
@@ -40,6 +40,11 @@ public class SampleExceptions2 {
     throw new NumberFormatException(null);
   }
 
+  @Test(expectedExceptions = NumberFormatException.class, expectedExceptionsMessageRegExp = "Multiline.*")
+  public void shouldPass4() {
+    throw new NumberFormatException("Multiline\nException");
+  }
+
   @Test(expectedExceptions = RuntimeException.class)
   public void shouldFail4() {
   }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git