MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

junit sm: compact top node for class/method tests

Browse Source
This commit is contained in:
Anna Kozlova
2015-05-06 13:55:03 +02:00
parent 0b90752bb2
commit 73a5a79a22
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
+1 -4
View File
@@ -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" +
plugins/junit_rt/src/com/intellij/junit4/SMTestSender.java
+5 -10
View File
@@ -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;