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: inline listeners

Browse Source
This commit is contained in:
Anna Kozlova
2015-04-07 11:26:16 +02:00
parent 6a700ff040
commit b0fe7c151e
2 changed files with 11 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitActions.java
-42
View File
@@ -1,42 +0,0 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.execution.junit2.ui.actions;
import com.intellij.execution.junit2.ui.model.JUnitAdapter;
import com.intellij.execution.junit2.ui.model.JUnitRunningModel;
import com.intellij.execution.junit2.ui.model.StateEvent;
import com.intellij.execution.junit2.ui.properties.JUnitConsoleProperties;
import com.intellij.execution.testframework.AbstractTestProxy;
import com.intellij.execution.testframework.Filter;
import com.intellij.execution.testframework.actions.TestFrameworkActions;
public class JUnitActions extends TestFrameworkActions {
public static void installAutoscrollToFirstDefect(final JUnitRunningModel model) {
model.addListener(new JUnitAdapter() {
public void onRunnerStateChanged(final StateEvent event) {
if (event.isRunning() || !shouldSelect())
return;
final AbstractTestProxy firstDefect = Filter.DEFECTIVE_LEAF.detectIn(model.getRoot().getAllTests());
if (firstDefect != null) model.selectAndNotify(firstDefect);
}
private boolean shouldSelect() {
return JUnitConsoleProperties.SELECT_FIRST_DEFECT.value(model.getProperties());
}
});
}
}
plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java
+11 -5
View File
@@ -21,11 +21,10 @@ import com.intellij.execution.Location;
import com.intellij.execution.junit2.TestProxy;
import com.intellij.execution.junit2.ui.model.JUnitAdapter;
import com.intellij.execution.junit2.ui.model.JUnitRunningModel;
import com.intellij.execution.junit2.ui.model.StateEvent;
import com.intellij.execution.junit2.ui.properties.JUnitConsoleProperties;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.TestConsoleProperties;
import com.intellij.execution.testframework.TestFrameworkRunningModel;
import com.intellij.execution.testframework.TestsUIUtil;
import com.intellij.execution.testframework.ToolbarPanel;
import com.intellij.execution.testframework.*;
import com.intellij.execution.testframework.actions.ScrollToTestSourceAction;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -63,7 +62,14 @@ public class JUnitToolbarPanel extends ToolbarPanel {
public void setModel(final TestFrameworkRunningModel model) {
super.setModel(model);
final JUnitRunningModel jUnitModel = (JUnitRunningModel)model;
JUnitActions.installAutoscrollToFirstDefect(jUnitModel);
jUnitModel.addListener(new JUnitAdapter() {
public void onRunnerStateChanged(final StateEvent event) {
if (event.isRunning() || !JUnitConsoleProperties.SELECT_FIRST_DEFECT.value(jUnitModel.getProperties()))
return;
final AbstractTestProxy firstDefect = Filter.DEFECTIVE_LEAF.detectIn(jUnitModel.getRoot().getAllTests());
if (firstDefect != null) jUnitModel.selectAndNotify(firstDefect);
}
});
RunningTestTracker.install(jUnitModel);
jUnitModel.addListener(new LvcsLabeler(jUnitModel));
jUnitModel.addListener(new JUnitAdapter() {