From fc1bb60d272a63bbb56455d139ff16f305aa06cc Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 18 Aug 2015 17:59:28 +0200
Subject: [PATCH] test discovery: use data from test failed with comparison
 errors

---
 .../com/intellij/junit4/JUnit4IdeaTestRunner.java   |  3 ++-
 .../src/org/testng/TestNGTestDiscoveryListener.java | 13 ++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
index 01c70c0d5cc9..9390beea6596 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
@@ -18,6 +18,7 @@ package com.intellij.junit4;
 import com.intellij.rt.execution.junit.*;
 import com.intellij.rt.execution.junit.segments.OutputObjectRegistry;
 import com.intellij.rt.execution.junit.segments.PacketProcessor;
+import org.junit.ComparisonFailure;
 import org.junit.internal.requests.ClassRequest;
 import org.junit.internal.requests.FilterRequest;
 import org.junit.runner.*;
@@ -76,7 +77,7 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
           }
 
           public void testFailure(Failure failure) throws Exception {
-            mySuccess = false;
+            mySuccess = ComparisonFailureData.isAssertionError(failure.getException().getClass());
           }
 
           public void testAssumptionFailure(Failure failure) {
diff --git a/plugins/testng_rt/src/org/testng/TestNGTestDiscoveryListener.java b/plugins/testng_rt/src/org/testng/TestNGTestDiscoveryListener.java
index 8c9e0dbd68ed..1596b1695600 100644
--- a/plugins/testng_rt/src/org/testng/TestNGTestDiscoveryListener.java
+++ b/plugins/testng_rt/src/org/testng/TestNGTestDiscoveryListener.java
@@ -16,6 +16,7 @@
 package org.testng;
 
 import com.intellij.execution.TestDiscoveryListener;
+import com.intellij.rt.execution.junit.ComparisonFailureData;
 
 public class TestNGTestDiscoveryListener extends TestDiscoveryListener implements IDEATestNGListener, ISuiteListener {
   public void onTestStart(ITestResult result) {
@@ -26,9 +27,15 @@ public class TestNGTestDiscoveryListener extends TestDiscoveryListener implement
     testFinished(result.getTestClass().getName(), result.getName(), true);
   }
 
-  public void onTestFailure(ITestResult result) {}
-  public void onTestSkipped(ITestResult result) {}
-  public void onTestFailedButWithinSuccessPercentage(ITestResult result) {}
+  public void onTestFailure(ITestResult result) {
+    testFinished(result.getTestClass().getName(), result.getName(), ComparisonFailureData.isAssertionError(result.getThrowable().getClass()));
+  }
+  public void onTestSkipped(ITestResult result) {
+    testFinished(result.getTestClass().getName(), result.getName(), false);
+  }
+  public void onTestFailedButWithinSuccessPercentage(ITestResult result) {
+    testFinished(result.getTestClass().getName(), result.getName(), true);
+  }
 
   public void onStart(ITestContext context) {}