From 63cae114ef958c70f2c53c45a15d14e4dd8a8b9d Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 19 Jun 2015 23:15:21 +0300 Subject: [PATCH] safe delete unused environment + deprecations --- .../JavaTestFrameworkRunnableState.java | 2 +- .../sm/SMTestRunnerConnectionUtil.java | 24 +++++++++++++------ .../sm/runner/ui/SMTRunnerConsoleView.java | 23 ++++++++++++++---- .../sm/runner/ui/SMTRunnerToolbarPanel.java | 5 +--- .../sm/runner/ui/SMTestRunnerResultsForm.java | 13 ++++------ ...GeneralToSMTRunnerEventsConvertorTest.java | 2 +- .../sm/runner/SMTRunnerConsoleTest.java | 2 +- .../ui/SMTRunnerUIActionsHandlerTest.java | 7 +++--- .../ui/SMTestRunnerResultsFormTest.java | 2 +- .../SMTRunnerStatisticsPanelTest.java | 4 ++-- .../testframework/TestConsoleProperties.java | 2 +- .../execution/testframework/ToolbarPanel.java | 4 ++-- .../testframework/ui/TestResultsPanel.java | 5 +--- .../execution/junit2/ui/ConsolePanel.java | 7 ++---- .../junit2/ui/JUnitTreeConsoleView.java | 2 +- .../junit2/ui/actions/JUnitToolbarPanel.java | 4 +--- .../ui/properties/JUnitConsoleProperties.java | 5 ++-- .../testng/model/TestNGConsoleProperties.java | 5 ++-- .../testng/ui/TestNGConsoleView.java | 2 +- .../testng/ui/TestNGResults.java | 7 +++--- .../PythonTestCommandLineStateBase.java | 3 +-- 21 files changed, 67 insertions(+), 63 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java index f592b4b4fcca..6afe84a393dd 100644 --- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java +++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java @@ -113,7 +113,7 @@ public abstract class JavaTestFrameworkRunnableState 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; } diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java index 9bd252811cd5..be07c78ccc6a 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerToolbarPanel.java @@ -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); diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java index f093105fa42f..952a01c719ce 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java @@ -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() { diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java index aa27dc594a21..9d142a860d9c 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java @@ -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 diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java index 07c82db63f26..3e03256428ec 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java @@ -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 diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandlerTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandlerTest.java index 4dd777587d38..a40a0f645096 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandlerTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTRunnerUIActionsHandlerTest.java @@ -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); diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java index e5edef86fe06..8458f7132a62 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java @@ -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(); diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/statistics/SMTRunnerStatisticsPanelTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/statistics/SMTRunnerStatisticsPanelTest.java index 4480ddbd0034..5f176ed9c10f 100644 --- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/statistics/SMTRunnerStatisticsPanelTest.java +++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/statistics/SMTRunnerStatisticsPanelTest.java @@ -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(); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java index eee5e0004175..0d34fc70f189 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java @@ -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() { diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java index f5f3420bddb5..b15d49424e49 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java @@ -55,7 +55,7 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab private final ArrayList myActions = new ArrayList(); 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(). diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java index d1cdb7d65f48..6618258b6adb 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java @@ -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() { diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java index c47b0b2e783a..e1aa4d70ec02 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java @@ -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 diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/JUnitTreeConsoleView.java b/plugins/junit/src/com/intellij/execution/junit2/ui/JUnitTreeConsoleView.java index 067bb88bcc52..e2c5a658d60b 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/JUnitTreeConsoleView.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/JUnitTreeConsoleView.java @@ -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; } diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java index 9a66b5299d4e..bf61e79c82bd 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/JUnitToolbarPanel.java @@ -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); } diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java index 00e2cd2ac5f0..24fcb2a87aba 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java +++ b/plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java @@ -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