safe delete unused environment + deprecations

This commit is contained in:
Anna Kozlova
2015-06-23 12:05:03 +03:00
parent 648c803b20
commit 63cae114ef
21 changed files with 67 additions and 63 deletions
@@ -113,7 +113,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
final SMTRunnerConsoleProperties testConsoleProperties = createTestConsoleProperties(executor);
testConsoleProperties.setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false);
final BaseTestsOutputConsoleView consoleView = SMTestRunnerConnectionUtil.createConsole(getFrameworkName(), testConsoleProperties, getEnvironment());
final BaseTestsOutputConsoleView consoleView = SMTestRunnerConnectionUtil.createConsole(getFrameworkName(), testConsoleProperties);
final SMTestRunnerResultsForm viewer = ((SMTRunnerConsoleView)consoleView).getResultsViewer();
Disposer.register(getConfiguration().getProject(), consoleView);
@@ -95,17 +95,27 @@ public class SMTestRunnerConnectionUtil {
@NotNull ProcessHandler processHandler,
@NotNull TestConsoleProperties consoleProperties,
ExecutionEnvironment environment) throws ExecutionException {
BaseTestsOutputConsoleView console = createConsole(testFrameworkName, consoleProperties, environment);
BaseTestsOutputConsoleView console = createConsole(testFrameworkName, consoleProperties);
console.attachToProcess(processHandler);
return console;
}
@NotNull
public static BaseTestsOutputConsoleView createConsole(@NotNull String testFrameworkName,
@NotNull TestConsoleProperties consoleProperties) {
return createConsole(testFrameworkName, consoleProperties, null);
}
/**
* @deprecated use {@link SMTestRunnerConnectionUtil#createConsole(String, TestConsoleProperties)} instead
* (to be removed in IDEA 16)
*/
@NotNull
public static BaseTestsOutputConsoleView createConsole(@NotNull String testFrameworkName,
@NotNull TestConsoleProperties consoleProperties,
ExecutionEnvironment environment) {
String splitterPropertyName = getSplitterPropertyName(testFrameworkName);
SMTRunnerConsoleView consoleView = new SMTRunnerConsoleView(consoleProperties, environment, splitterPropertyName);
SMTRunnerConsoleView consoleView = new SMTRunnerConsoleView(consoleProperties, splitterPropertyName);
initConsoleView(consoleView, testFrameworkName);
return consoleView;
}
@@ -264,7 +274,7 @@ public class SMTestRunnerConnectionUtil {
}
}
/** @deprecated use {@link #createConsole(String, TestConsoleProperties, ExecutionEnvironment)} (to be removed in IDEA 16) */
/** @deprecated use {@link #createConsole(String, TestConsoleProperties)} (to be removed in IDEA 16) */
@SuppressWarnings({"unused", "deprecation"})
public static BaseTestsOutputConsoleView createConsoleWithCustomLocator(@NotNull String testFrameworkName,
@NotNull TestConsoleProperties consoleProperties,
@@ -273,7 +283,7 @@ public class SMTestRunnerConnectionUtil {
return createConsoleWithCustomLocator(testFrameworkName, consoleProperties, environment, locator, false, null);
}
/** @deprecated use {@link #createConsole(String, TestConsoleProperties, ExecutionEnvironment)} (to be removed in IDEA 16) */
/** @deprecated use {@link #createConsole(String, TestConsoleProperties)} (to be removed in IDEA 16) */
@SuppressWarnings({"unused", "deprecation"})
public static SMTRunnerConsoleView createConsoleWithCustomLocator(@NotNull String testFrameworkName,
@NotNull TestConsoleProperties consoleProperties,
@@ -282,7 +292,7 @@ public class SMTestRunnerConnectionUtil {
boolean idBasedTreeConstruction,
@Nullable TestProxyFilterProvider filterProvider) {
String splitterPropertyName = getSplitterPropertyName(testFrameworkName);
SMTRunnerConsoleView consoleView = new SMTRunnerConsoleView(consoleProperties, environment, splitterPropertyName);
SMTRunnerConsoleView consoleView = new SMTRunnerConsoleView(consoleProperties, splitterPropertyName);
initConsoleView(consoleView, testFrameworkName, locator, idBasedTreeConstruction, filterProvider);
return consoleView;
}
@@ -332,13 +342,13 @@ public class SMTestRunnerConnectionUtil {
return createAndAttachConsole(testFrameworkName, processHandler, consoleProperties, commandLineState.getEnvironment());
}
/** @deprecated use {@link #createConsole(String, TestConsoleProperties, ExecutionEnvironment)} (to be removed in IDEA 16) */
/** @deprecated use {@link #createConsole(String, TestConsoleProperties)} (to be removed in IDEA 16) */
@SuppressWarnings("unused")
public static ConsoleView createConsole(@NotNull String testFrameworkName,
@NotNull CommandLineState commandLineState,
@NotNull ModuleRunConfiguration config,
@NotNull Executor executor) throws ExecutionException {
TestConsoleProperties consoleProperties = new SMTRunnerConsoleProperties(config, testFrameworkName, executor);
return createConsole(testFrameworkName, consoleProperties, commandLineState.getEnvironment());
return createConsole(testFrameworkName, consoleProperties);
}
}
@@ -35,23 +35,39 @@ import java.util.List;
* @author: Roman Chernyatchik
*/
public class SMTRunnerConsoleView extends BaseTestsOutputConsoleView {
private final ExecutionEnvironment myEnvironment;
private SMTestRunnerResultsForm myResultsViewer;
@Nullable private final String mySplitterProperty;
private final List<AttachToProcessListener> myAttachToProcessListeners = ContainerUtil.createLockFreeCopyOnWriteList();
/**
* @deprecated
*/
public SMTRunnerConsoleView(final TestConsoleProperties consoleProperties, final ExecutionEnvironment environment) {
this(consoleProperties, environment, null);
}
/**
* @deprecated
* @param splitterProperty Key to store(project level) latest value of testTree/consoleTab splitter. E.g. "RSpec.Splitter.Proportion"
*/
@SuppressWarnings("UnusedParameters")
public SMTRunnerConsoleView(final TestConsoleProperties consoleProperties,
final ExecutionEnvironment environment,
@Nullable final String splitterProperty) {
super(consoleProperties, null);
mySplitterProperty = splitterProperty;
}
public SMTRunnerConsoleView(final TestConsoleProperties consoleProperties) {
this(consoleProperties, (String)null);
}
/**
* @param splitterProperty Key to store(project level) latest value of testTree/consoleTab splitter. E.g. "RSpec.Splitter.Proportion"
*/
public SMTRunnerConsoleView(final TestConsoleProperties consoleProperties,
final ExecutionEnvironment environment,
@Nullable final String splitterProperty) {
super(consoleProperties, null);
myEnvironment = environment;
mySplitterProperty = splitterProperty;
}
@@ -62,7 +78,6 @@ public class SMTRunnerConsoleView extends BaseTestsOutputConsoleView {
getConsole().getComponent(),
getConsole().createConsoleActions(),
myProperties,
myEnvironment,
mySplitterProperty);
return myResultsViewer;
}
@@ -15,11 +15,9 @@
*/
package com.intellij.execution.testframework.sm.runner.ui;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.TestConsoleProperties;
import com.intellij.execution.testframework.TestFrameworkRunningModel;
import com.intellij.execution.testframework.ToolbarPanel;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import javax.swing.*;
@@ -28,9 +26,8 @@ import javax.swing.*;
*/
public class SMTRunnerToolbarPanel extends ToolbarPanel {
public SMTRunnerToolbarPanel(final TestConsoleProperties properties,
final ExecutionEnvironment environment,
final TestFrameworkRunningModel model, JComponent contentPane) {
super(properties, environment, contentPane);
super(properties, contentPane);
//TODO rerun failed test
//TODO coverage
setModel(model);
@@ -16,7 +16,6 @@
package com.intellij.execution.testframework.sm.runner.ui;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.*;
import com.intellij.execution.testframework.sm.SMRunnerUtil;
import com.intellij.execution.testframework.sm.runner.*;
@@ -28,7 +27,6 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.progress.util.ColorProgressBar;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Pass;
import com.intellij.openapi.util.registry.Registry;
@@ -38,7 +36,6 @@ import com.intellij.ui.JBColor;
import com.intellij.util.Alarm;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.DateFormatUtil;
import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -98,18 +95,16 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
public SMTestRunnerResultsForm(final RunConfiguration runConfiguration,
@NotNull final JComponent console,
final TestConsoleProperties consoleProperties,
final ExecutionEnvironment environment) {
this(runConfiguration, console, AnAction.EMPTY_ARRAY, consoleProperties, environment, null);
final TestConsoleProperties consoleProperties) {
this(runConfiguration, console, AnAction.EMPTY_ARRAY, consoleProperties, null);
}
public SMTestRunnerResultsForm(final RunConfiguration runConfiguration,
@NotNull final JComponent console,
AnAction[] consoleActions,
final TestConsoleProperties consoleProperties,
final ExecutionEnvironment environment,
@Nullable String splitterPropertyName) {
super(console, consoleActions, consoleProperties, environment,
super(console, consoleActions, consoleProperties,
StringUtil.notNullize(splitterPropertyName, DEFAULT_SM_RUNNER_SPLITTER_PROPERTY), 0.2f);
myConsoleProperties = consoleProperties;
@@ -148,7 +143,7 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
}
protected ToolbarPanel createToolbarPanel() {
return new SMTRunnerToolbarPanel(myConsoleProperties, myEnvironment, this, this);
return new SMTRunnerToolbarPanel(myConsoleProperties, this, this);
}
protected JComponent createTestTreeView() {
@@ -49,7 +49,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
private final TestsOutputConsolePrinter myTestsOutputConsolePrinter;
private MyConsoleView(final TestConsoleProperties consoleProperties, final ExecutionEnvironment environment) {
super(consoleProperties, environment);
super(consoleProperties);
myTestsOutputConsolePrinter = new TestsOutputConsolePrinter(MyConsoleView.this, consoleProperties, null) {
@Override
@@ -43,7 +43,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
private final TestsOutputConsolePrinter myTestsOutputConsolePrinter;
private MyConsoleView(final TestConsoleProperties consoleProperties, final ExecutionEnvironment environment) {
super(consoleProperties, environment);
super(consoleProperties);
myTestsOutputConsolePrinter = new TestsOutputConsolePrinter(MyConsoleView.this, consoleProperties, null) {
@Override
@@ -55,12 +55,11 @@ public class SMTRunnerUIActionsHandlerTest extends BaseSMTRunnerTestCase {
TestConsoleProperties.SCROLL_TO_SOURCE.set(myProperties, false);
TestConsoleProperties.SELECT_FIRST_DEFECT.set(myProperties, false);
TestConsoleProperties.TRACK_RUNNING_TEST.set(myProperties, false);
final ExecutionEnvironment environment = new ExecutionEnvironment();
myResultsForm = new SMTestRunnerResultsForm(myProperties.getConfiguration(),
new JLabel(),
myProperties,
environment) {
myProperties
) {
@Override
public void selectAndNotify(AbstractTestProxy testProxy) {
super.selectAndNotify(testProxy);
@@ -57,7 +57,7 @@ public class SMTestRunnerResultsFormTest extends BaseSMTRunnerTestCase {
final ExecutionEnvironment environment = new ExecutionEnvironment();
myConsole = new SMTRunnerConsoleView(myConsoleProperties, environment);
myConsole = new SMTRunnerConsoleView(myConsoleProperties);
myConsole.initUI();
myResultsViewer = myConsole.getResultsViewer();
myTestsRootNode = myResultsViewer.getTestsRootNode();
@@ -50,8 +50,8 @@ public class SMTRunnerStatisticsPanelTest extends BaseSMTRunnerTestCase {
final ExecutionEnvironment environment = new ExecutionEnvironment();
myResultsForm = new SMTestRunnerResultsForm(consoleProperties.getConfiguration(),
new JLabel(),
consoleProperties,
environment);
consoleProperties
);
Disposer.register(myResultsForm, consoleProperties);
myResultsForm.initUI();
myStatisticsPanel = myResultsForm.getStatisticsPane();
@@ -193,7 +193,7 @@ public abstract class TestConsoleProperties extends StoringPropertyContainer imp
myUsePredefinedMessageFilter = usePredefinedMessageFilter;
}
protected void appendAdditionalActions(DefaultActionGroup actionGroup, ExecutionEnvironment environment, JComponent parent) { }
protected void appendAdditionalActions(DefaultActionGroup actionGroup, JComponent parent) { }
@NotNull
protected ToggleBooleanProperty createIncludeNonStartedInRerun() {
@@ -55,7 +55,7 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab
private final ArrayList<ToggleModelAction> myActions = new ArrayList<ToggleModelAction>();
public ToolbarPanel(final TestConsoleProperties properties,
ExecutionEnvironment environment, JComponent parent) {
final JComponent parent) {
super(new BorderLayout());
final DefaultActionGroup actionGroup = new DefaultActionGroup(null, false);
actionGroup.addAction(new ToggleInvertedBooleanProperty(ExecutionBundle.message("junit.run.hide.passed.action.name"),
@@ -144,7 +144,7 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab
secondaryGroup.addSeparator();
secondaryGroup.add(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.select.first.failed.action.name"),
null, null, properties, TestConsoleProperties.SELECT_FIRST_DEFECT));
properties.appendAdditionalActions(secondaryGroup, environment, parent);
properties.appendAdditionalActions(secondaryGroup, parent);
actionGroup.add(secondaryGroup);
add(ActionManager.getInstance().
@@ -53,7 +53,6 @@ public abstract class TestResultsPanel extends JPanel implements Disposable, Dat
private Splitter myStatisticsSplitter;
protected final JComponent myConsole;
protected ToolbarPanel myToolbarPanel;
protected final ExecutionEnvironment myEnvironment;
private final String mySplitterProportionProperty;
private final String myStatisticsSplitterProportionProperty;
private final float mySplitterDefaultProportion;
@@ -63,13 +62,11 @@ public abstract class TestResultsPanel extends JPanel implements Disposable, Dat
private Splitter mySplitter;
protected TestResultsPanel(@NotNull JComponent console, AnAction[] consoleActions, TestConsoleProperties properties,
ExecutionEnvironment environment,
String splitterProportionProperty, float splitterDefaultProportion) {
super(new BorderLayout(0,1));
myConsole = console;
myConsoleActions = consoleActions;
myProperties = properties;
myEnvironment = environment;
mySplitterProportionProperty = splitterProportionProperty;
mySplitterDefaultProportion = splitterDefaultProportion;
myStatisticsSplitterProportionProperty = mySplitterProportionProperty + "_Statistics";
@@ -133,7 +130,7 @@ public abstract class TestResultsPanel extends JPanel implements Disposable, Dat
protected abstract JComponent createStatisticsPanel();
protected ToolbarPanel createToolbarPanel() {
return new ToolbarPanel(myProperties, myEnvironment, this);
return new ToolbarPanel(myProperties, this);
}
protected TestStatusLine createStatusLine() {
@@ -34,7 +34,6 @@ import com.intellij.execution.testframework.ui.TestResultsPanel;
import com.intellij.execution.testframework.ui.TestStatusLine;
import com.intellij.execution.testframework.ui.TestsOutputConsolePrinter;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.ui.SimpleColoredComponent;
@@ -43,7 +42,6 @@ import com.intellij.ui.treeStructure.Tree;
import com.intellij.util.Alarm;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -66,9 +64,8 @@ public class ConsolePanel extends TestResultsPanel {
public ConsolePanel(final JComponent console,
final TestsOutputConsolePrinter printer,
final JUnitConsoleProperties properties,
final ExecutionEnvironment environment,
AnAction[] consoleActions) {
super(console, consoleActions, properties, environment, PROPORTION_PROPERTY, DEFAULT_PROPORTION);
super(console, consoleActions, properties, PROPORTION_PROPERTY, DEFAULT_PROPORTION);
myPrinter = printer;
}
@@ -86,7 +83,7 @@ public class ConsolePanel extends TestResultsPanel {
@Override
protected ToolbarPanel createToolbarPanel() {
return new JUnitToolbarPanel(myProperties, myEnvironment, this);
return new JUnitToolbarPanel(myProperties, this);
}
@Override
@@ -41,7 +41,7 @@ public class JUnitTreeConsoleView extends BaseTestsOutputConsoleView {
@Override
protected TestResultsPanel createTestResultsPanel() {
myConsolePanel = new ConsolePanel(getConsole().getComponent(), getPrinter(), myProperties, myEnvironment,
myConsolePanel = new ConsolePanel(getConsole().getComponent(), getPrinter(), myProperties,
getConsole().createConsoleActions());
return myConsolePanel;
}
@@ -22,7 +22,6 @@ 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.*;
import com.intellij.execution.testframework.actions.ScrollToTestSourceAction;
import com.intellij.openapi.project.Project;
@@ -37,9 +36,8 @@ public class JUnitToolbarPanel extends ToolbarPanel {
@NonNls protected static final String TEST_SUITE_CLASS_NAME = "junit.framework.TestSuite";
public JUnitToolbarPanel(final TestConsoleProperties properties,
final ExecutionEnvironment environment,
final JComponent parentComponent) {
super(properties, environment, parentComponent);
super(properties, parentComponent);
}
@@ -18,7 +18,6 @@ package com.intellij.execution.junit2.ui.properties;
import com.intellij.execution.Executor;
import com.intellij.execution.junit.JUnitConfiguration;
import com.intellij.execution.junit2.ui.actions.RerunFailedTestsAction;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.JavaAwareTestConsoleProperties;
import com.intellij.execution.testframework.JavaTestLocator;
import com.intellij.execution.testframework.SourceScope;
@@ -60,8 +59,8 @@ public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties<JUnit
@Override
protected void appendAdditionalActions(DefaultActionGroup actionGroup,
ExecutionEnvironment environment, JComponent parent) {
super.appendAdditionalActions(actionGroup, environment, parent);
JComponent parent) {
super.appendAdditionalActions(actionGroup, parent);
actionGroup.add(createIncludeNonStartedInRerun());
}
@@ -16,7 +16,6 @@
package com.theoryinpractice.testng.model;
import com.intellij.execution.Executor;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.JavaAwareTestConsoleProperties;
import com.intellij.execution.testframework.JavaTestLocator;
import com.intellij.execution.testframework.SourceScope;
@@ -55,8 +54,8 @@ public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties<Test
}
@Override
protected void appendAdditionalActions(DefaultActionGroup actionGroup, ExecutionEnvironment environment, JComponent parent) {
super.appendAdditionalActions(actionGroup, environment, parent);
protected void appendAdditionalActions(DefaultActionGroup actionGroup, JComponent parent) {
super.appendAdditionalActions(actionGroup, parent);
actionGroup.add(createIncludeNonStartedInRerun());
}
@@ -56,7 +56,7 @@ public class TestNGConsoleView extends BaseTestsOutputConsoleView {
}
protected TestResultsPanel createTestResultsPanel() {
testNGResults = new TestNGResults(getConsole().getComponent(), myConfiguration, this, myEnvironment);
testNGResults = new TestNGResults(getConsole().getComponent(), myConfiguration, this);
return testNGResults;
}
@@ -88,10 +88,9 @@ public class TestNGResults extends TestResultsPanel implements TestFrameworkRunn
public TestNGResults(final JComponent component,
final TestNGConfiguration configuration,
final TestNGConsoleView console,
final ExecutionEnvironment environment) {
final TestNGConsoleView console) {
super(component, console.getConsole().createConsoleActions(), console.getProperties(),
environment, TESTNG_SPLITTER_PROPERTY, 0.5f);
TESTNG_SPLITTER_PROPERTY, 0.5f);
this.configuration = configuration;
this.project = configuration.getProject();
@@ -149,7 +148,7 @@ public class TestNGResults extends TestResultsPanel implements TestFrameworkRunn
@Override
protected ToolbarPanel createToolbarPanel() {
final ToolbarPanel panel = new ToolbarPanel(getProperties(), myEnvironment, this);
final ToolbarPanel panel = new ToolbarPanel(getProperties(), this);
panel.setModel(this);
return panel;
}
@@ -72,8 +72,7 @@ public abstract class PythonTestCommandLineStateBase extends PythonCommandLineSt
if (isDebug()) {
final ConsoleView testsOutputConsoleView = SMTestRunnerConnectionUtil.createConsole(PythonTRunnerConsoleProperties.FRAMEWORK_NAME,
consoleProperties,
getEnvironment());
consoleProperties);
final ConsoleView consoleView =
new PythonDebugLanguageConsoleView(project, PythonSdkType.findSdkByPath(myConfiguration.getInterpreterPath()),
testsOutputConsoleView);