From 73a5a79a22da744cd6622391b604f39dbd76f61e Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 6 May 2015 13:51:59 +0200
Subject: [PATCH] junit sm: compact top node for class/method tests

---
 .../JUnitTreeByDescriptionHierarchyTest.java      |  5 +----
 .../src/com/intellij/junit4/SMTestSender.java     | 15 +++++----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
index 7b5d6a455620..dd6e52cf8f2a 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
@@ -148,12 +148,9 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testFinished(emptyDescription);
     sender.testRunFinished(new Result());
 
-    Assert.assertEquals("output: " + buf, "##teamcity[suiteTreeStarted name='TestA' locationHint='java:suite://TestA']\n" +
-                                          "##teamcity[suiteTreeNode name='warning' locationHint='java:test://junit.framework.TestSuite$1.warning']\n" +
-                                          "##teamcity[suiteTreeEnded name='TestA']\n" +
+    Assert.assertEquals("output: " + buf, "##teamcity[suiteTreeNode name='warning' locationHint='java:test://junit.framework.TestSuite$1.warning']\n" +
                                           "##teamcity[enteredTheMatrix]\n" +
                                           "\n" +
-                                          "##teamcity[testSuiteStarted name ='TestA']\n" +
                                           "##teamcity[testStarted name='warning' locationHint='java:test://junit.framework.TestSuite$1.warning']\n" +
                                           "\n" +
                                           "##teamcity[testFinished name='warning']\n" +
diff --git a/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java b/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java
index baa3303a90d9..f82a6077cc96 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java
@@ -43,8 +43,7 @@ public class SMTestSender extends RunListener {
 
   private String myCurrentClassName;
   private String myParamName;
-  private boolean myIgnoreTopSuite;
-  
+
   private PrintStream myPrintStream = System.out;
 
   public SMTestSender() {}
@@ -58,7 +57,6 @@ public class SMTestSender extends RunListener {
   }
 
   public void testRunStarted(Description description) throws Exception {
-    myCurrentClassName = myIgnoreTopSuite ? getShortName(description.toString()) : null;
     myPrintStream.println("##teamcity[enteredTheMatrix]\n");
   }
 
@@ -197,10 +195,10 @@ public class SMTestSender extends RunListener {
   private final List myEmptyTests = new ArrayList();  
   
   private void sendTree(Description description, Map groups, Description parent) {
+    final String className = JUnit4ReflectionUtil.getClassName(description);
     if (description.getChildren().isEmpty()) {
       final String methodName = JUnit4ReflectionUtil.getMethodName((Description)description);
       if (methodName != null) {
-        final String className = JUnit4ReflectionUtil.getClassName(description);
         myPrintStream.println("##teamcity[suiteTreeNode name=\'" + escapeName(methodName) + "\' " + getTestMethodLocation(methodName, className) + "]");
         if (isWarning(methodName, className)) {
           myEmptyTests.add(getShortName(JUnit4ReflectionUtil.getClassName(parent)));
@@ -220,9 +218,8 @@ public class SMTestSender extends RunListener {
       final Object next = iterator.next();
       final List childTests = ((Description)next).getChildren();
       final Description nextDescription = (Description)next;
-      if ((childTests.isEmpty() && JUnit4ReflectionUtil.getMethodName(nextDescription) != null || isParameter(nextDescription)) && !pass) {
+      if (((myCurrentClassName == null || !myCurrentClassName.equals(getShortName(className))) && childTests.isEmpty() && JUnit4ReflectionUtil.getMethodName(nextDescription) != null || isParameter(nextDescription)) && !pass) {
         pass = true;
-        final String className = JUnit4ReflectionUtil.getClassName((Description)description);
         String locationHint = className;
         if (isParameter((Description)description)) {
           final String displayName = nextDescription.getDisplayName();
@@ -277,16 +274,14 @@ public class SMTestSender extends RunListener {
   }
 
   public void sendTree(Description description) {
-    final List tests = description.getChildren();
-    if (tests.isEmpty()) {
-      myIgnoreTopSuite = true;
-    }
+    myCurrentClassName = getShortName(JUnit4ReflectionUtil.getClassName((Description)description));
     final HashMap group = new HashMap();
     groupTests(description, group);
     sendTree(description, group, null);
   }
 
   private static String getShortName(String fqName) {
+    if (fqName == null) return null;
     if (fqName.startsWith("[")) {
       //param name
       return fqName;