From 428bd97e98ffa83c061fcabca0b1f1884f5dc1c8 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 6 May 2015 20:29:01 +0200
Subject: [PATCH] junit sm runner: simplify send tree condition

---
 .../src/com/intellij/junit3/JUnit3IdeaTestRunner.java |  2 +-
 .../src/com/intellij/junit4/JUnit4IdeaTestRunner.java | 11 ++++++++---
 .../com/intellij/rt/execution/junit/JUnitStarter.java |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java
index 60318a25c2a7..27ada8d3b4b9 100644
--- a/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java
+++ b/plugins/junit_rt/src/com/intellij/junit3/JUnit3IdeaTestRunner.java
@@ -39,7 +39,7 @@ public class JUnit3IdeaTestRunner extends TestRunner implements IdeaTestRunner {
   public int startRunnerWithArgs(String[] args, ArrayList listeners, String name, int count, boolean sendTree) {
     myListeners = listeners;
     mySendTree = sendTree && !(myTestsListener instanceof SMTestListener);
-    if (sendTree) {
+    if (mySendTree) {
       setPrinter(new TimeSender(myRegistry));
     }
     else {
diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
index fcdb82291eba..4f68466cdac3 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
@@ -51,9 +51,14 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
       else if (request instanceof FilterRequest) {
         description = getFilteredDescription(request, description);
       }
-      TreeSender.sendTree(this, description, sendTree);
-      if (myTestsListener instanceof SMTestSender && sendTree) {
-        ((SMTestSender)myTestsListener).sendTree(description);
+
+      if (myTestsListener instanceof SMTestSender) {
+        if (sendTree) {
+          ((SMTestSender)myTestsListener).sendTree(description);
+        }
+        sendTree = false;
+      } else {
+        TreeSender.sendTree(this, description, sendTree);
       }
     }
     catch (Exception e) {
diff --git a/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java b/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java
index 8c5f6a37c553..eee0d2593da0 100644
--- a/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java
+++ b/plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java
@@ -225,7 +225,7 @@ public class JUnitStarter {
         }
       }
       testRunner.setStreams(out, err, 0);
-      return testRunner.startRunnerWithArgs(args, listeners, name, ourCount, !SM_RUNNER);
+      return testRunner.startRunnerWithArgs(args, listeners, name, ourCount, true);
     }
     catch (Exception e) {
       e.printStackTrace(System.err);