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

RunDashboard: JUnit: improve test summary

Browse Source
This commit is contained in:
Konstantin Aleev
2017-11-07 11:04:37 +01:00
parent 46616b527a
commit 69cbff6481
2 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
+3 -3
View File
@@ -544,11 +544,11 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
}
}
protected int getTotalTestCount() {
public int getTotalTestCount() {
return myTotalTestCount;
}
protected int getStartedTestCount() {
public int getStartedTestCount() {
return myStartedTestCount;
}
@@ -560,7 +560,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
return myFailedTestCount;
}
protected int getIgnoredTestCount() {
public int getIgnoredTestCount() {
return myIgnoredTestCount;
}
plugins/junit/src/com/intellij/execution/junit/JUnitRunDashboardContributor.java
+44 -10
View File
@@ -3,7 +3,6 @@ package com.intellij.execution.junit;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.dashboard.*;
import com.intellij.execution.testframework.TestsUIUtil;
import com.intellij.execution.testframework.sm.runner.SMTestProxy;
import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerConsoleView;
import com.intellij.execution.testframework.sm.runner.ui.SMTestRunnerResultsForm;
@@ -12,8 +11,7 @@ import com.intellij.execution.testframework.sm.runner.ui.TestsPresentationUtil;
import com.intellij.execution.ui.ExecutionConsole;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.ide.projectView.PresentationData;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.progress.util.ColorProgressBar;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
@@ -25,6 +23,11 @@ import org.jetbrains.annotations.NotNull;
* @author Konstantin Aleev
*/
public class JUnitRunDashboardContributor extends RunDashboardContributor {
private static final SimpleTextAttributes IGNORE_ATTRIBUTES =
new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, ColorProgressBar.YELLOW);
private static final SimpleTextAttributes ERROR_ATTRIBUTES =
new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, ColorProgressBar.RED_TEXT);
public JUnitRunDashboardContributor() {
super(JUnitConfigurationType.getInstance());
}
@@ -55,13 +58,7 @@ public class JUnitRunDashboardContributor extends RunDashboardContributor {
presentation.setIcon(renderer.getIcon());
}
String shortSummary = TestsUIUtil.getTestShortSummary(rootNode);
if (!StringUtil.isEmpty(shortSummary)) {
presentation.addText(" [" + shortSummary + "]",
resultsViewer.getFailedTestCount() > 0 ?
new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, MessageType.ERROR.getTitleForeground()) :
SimpleTextAttributes.GRAY_ATTRIBUTES);
}
addTestSummary(presentation, resultsViewer);
}
finally {
RunDashboardAnimator animator = RunDashboardManager.getInstance(node.getProject()).getAnimator();
@@ -76,6 +73,43 @@ public class JUnitRunDashboardContributor extends RunDashboardContributor {
}
}
private static void addTestSummary(@NotNull PresentationData presentation, @NotNull SMTestRunnerResultsForm resultsViewer) {
int total = resultsViewer.getTotalTestCount();
int finished = resultsViewer.getFinishedTestCount();
int failed = resultsViewer.getFailedTestCount();
int ignored = resultsViewer.getIgnoredTestCount();
if (total == 0) {
total = finished + failed + ignored;
if (total == 0) return;
}
int passed = Math.max(0, finished - failed - ignored);
presentation.addText(" [", SimpleTextAttributes.GRAY_ATTRIBUTES);
boolean addSeparator = false;
if (failed > 0) {
presentation.addText("failed: " + failed, ERROR_ATTRIBUTES);
addSeparator = true;
}
if (passed > 0 || ignored + failed == 0) {
if (addSeparator) {
presentation.addText(", ", SimpleTextAttributes.GRAY_ATTRIBUTES);
}
presentation.addText("passed: " + passed, SimpleTextAttributes.REGULAR_ATTRIBUTES);
addSeparator = true;
}
if (ignored > 0) {
if (addSeparator) {
presentation.addText(", ", SimpleTextAttributes.GRAY_ATTRIBUTES);
}
presentation.addText("ignored: " + ignored, IGNORE_ATTRIBUTES);
}
presentation.addText(" of " + total +"]", SimpleTextAttributes.GRAYED_ATTRIBUTES);
}
@Override
public boolean handleDoubleClick(@NotNull RunConfiguration runConfiguration) {
if (!(runConfiguration instanceof JUnitConfiguration)) return false;