From ca76f15df5c4fce4ea9ad62f192e5c743a2d68b4 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 27 Oct 2015 19:18:14 +0100 Subject: [PATCH] junit: don't send one-node tree to avoid confusions ala @Unroll (IDEA-146619) --- .../JUnitTreeByDescriptionHierarchyTest.java | 2 -- .../com/intellij/junit4/JUnit4TestListener.java | 15 +++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java index 2fe6be124fe0..84b8be486876 100644 --- a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java +++ b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java @@ -34,7 +34,6 @@ public class JUnitTreeByDescriptionHierarchyTest { @Test public void testEmptySuite() throws Exception { doTest(Description.createSuiteDescription("empty suite"), "##teamcity[enteredTheMatrix]\n" + - "##teamcity[suiteTreeNode name='empty suite' locationHint='java:test://empty suite.empty suite']\n" + "##teamcity[treeEnded]\n"); } @@ -423,7 +422,6 @@ public class JUnitTreeByDescriptionHierarchyTest { final Description rootDescription = Description.createTestDescription("TestA", "testName"); doTest(rootDescription, Collections.singletonList(rootDescription), "##teamcity[enteredTheMatrix]\n" + - "##teamcity[suiteTreeNode name='TestA.testName' locationHint='java:test://TestA.testName']\n" + "##teamcity[treeEnded]\n", "##teamcity[rootName name = 'TestA' location = 'java:suite://TestA']\n" + "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA.testName']\n" + diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java index 027c7b473d27..ec9eef636dae 100644 --- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java +++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java @@ -325,15 +325,14 @@ public class JUnit4TestListener extends RunListener { String className = JUnit4ReflectionUtil.getClassName(description); if (description.getChildren().isEmpty()) { final String methodName = getFullMethodName((Description)description, parent); - if (methodName != null) { - if (parent != null) { - List parents = (List)myParents.get(description); - if (parents == null) { - parents = new ArrayList(1); - myParents.put(description, parents); - } - parents.add(pParents); + if (methodName != null && parent != null) { + List parents = (List)myParents.get(description); + if (parents == null) { + parents = new ArrayList(1); + myParents.put(description, parents); } + parents.add(pParents); + if (isWarning(methodName, className)) { className = JUnit4ReflectionUtil.getClassName(parent); }