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

WEB-10741 Turning on Karma Plugin Autotest will highjack editor window upon retest.

Browse Source
This commit is contained in:
Sergey Simonchik
2014-01-28 18:04:08 +04:00
parent 40f3ae8e6e
commit b132ae47ff
1 changed files with 18 additions and 10 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
+18 -10
View File
@@ -86,6 +86,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
// custom progress
private String myCurrentCustomProgressCategory;
private final Set<String> myMentionedCategories = new LinkedHashSet<String>();
private boolean myTestsRunning = true;
public SMTestRunnerResultsForm(final RunConfiguration runConfiguration,
@NotNull final JComponent console,
@@ -247,10 +248,12 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
LvcsHelper.addLabel(this);
SMTestProxy root = getTestsRootNode();
if (root != null) {
selectAndNotify(root);
}
selectAndNotify(myTestsRootNode, new Runnable() {
@Override
public void run() {
myTestsRunning = false;
}
});
fireOnTestingFinished();
}
@@ -334,7 +337,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
}
public boolean isRunning() {
return getRoot().isInProgress();
return myTestsRunning;
}
public TestTreeView getTreeView() {
@@ -365,8 +368,13 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
*
* @param testProxy Test or suite
*/
public void selectAndNotify(@Nullable final AbstractTestProxy testProxy) {
selectWithoutNotify(testProxy);
@Override
public void selectAndNotify(AbstractTestProxy testProxy) {
selectAndNotify(testProxy, null);
}
private void selectAndNotify(@Nullable final AbstractTestProxy testProxy, @Nullable Runnable onDone) {
selectWithoutNotify(testProxy, onDone);
// Is used by Statistic tab to differ use selection in tree
// from manual selection from API (e.g. test runner events)
@@ -474,7 +482,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
}
}
private void selectWithoutNotify(final AbstractTestProxy testProxy) {
private void selectWithoutNotify(final AbstractTestProxy testProxy, @Nullable final Runnable onDone) {
if (testProxy == null) {
return;
}
@@ -484,7 +492,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
if (myTreeBuilder.isDisposed()) {
return;
}
myTreeBuilder.select(testProxy, null);
myTreeBuilder.select(testProxy, onDone);
}
}, ModalityState.NON_MODAL);
}
@@ -547,7 +555,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
final boolean requestFocus) {
SMRunnerUtil.addToInvokeLater(new Runnable() {
public void run() {
selectWithoutNotify(selectedTestProxy);
selectWithoutNotify(selectedTestProxy, null);
// Request focus if necessary
if (requestFocus) {