From 9ddeeedd64bc546258d08cee5aa463a1f080c794 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 31 Jan 2017 08:15:02 +0300
Subject: [PATCH] testng: prepare to the failure without exception
 (IDEA-167298)

---
 .../org/testng/IDEATestNGRemoteListener.java    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java b/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java
index f693cc13ea8a..6128dd2e2813 100644
--- a/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java
+++ b/plugins/testng_rt/src/org/testng/IDEATestNGRemoteListener.java
@@ -210,14 +210,19 @@ public class IDEATestNGRemoteListener {
     final Map<String, String> attrs = new LinkedHashMap<String, String>();
     attrs.put("name", methodName);
     final String failureMessage = ex.getMessage();
-    ComparisonFailureData notification;
-    try {
-      notification = TestNGExpectedPatterns.createExceptionNotification(failureMessage);
+    if (failureMessage != null) {
+      ComparisonFailureData notification;
+      try {
+        notification = TestNGExpectedPatterns.createExceptionNotification(failureMessage);
+      }
+      catch (Throwable e) {
+        notification = null;
+      }
+      ComparisonFailureData.registerSMAttributes(notification, getTrace(ex), failureMessage, attrs, ex);
     }
-    catch (Throwable e) {
-      notification = null;
+    else {
+      attrs.put("message", "");
     }
-    ComparisonFailureData.registerSMAttributes(notification, getTrace(ex), failureMessage, attrs, ex);
     myPrintStream.println();
     myPrintStream.println(MapSerializerUtil.asString("testFailed", attrs));
     onTestFinished(result);