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

deprecate RuntimeConfiguration and remove most of its remaining usages

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-26 21:17:29 +02:00
parent 70322b9fd8
commit e318819c6a
19 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/execution/BaseConfigurationTestCase.java
+7 -4
View File
@@ -1,13 +1,16 @@
package com.intellij.execution;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.junit.JUnitConfiguration;
import com.intellij.execution.junit.RuntimeConfigurationProducer;
import com.intellij.openapi.actionSystem.DataConstants;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.openapi.module.*;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.module.StdModuleTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.ModuleRootModificationUtil;
@@ -147,11 +150,11 @@ public abstract class BaseConfigurationTestCase extends IdeaTestCase {
return (JUnitConfiguration)settings.getConfiguration();
}
protected final <T extends RuntimeConfiguration> T createConfiguration(PsiElement psiElement) {
protected final <T extends RunConfiguration> T createConfiguration(PsiElement psiElement) {
return (T)createConfiguration(psiElement, new MapDataContext());
}
protected <T extends RuntimeConfiguration> T createConfiguration(PsiElement psiElement, MapDataContext dataContext) {
protected <T extends RunConfiguration> T createConfiguration(PsiElement psiElement, MapDataContext dataContext) {
ConfigurationContext context = createContext(psiElement, dataContext);
RunnerAndConfigurationSettings settings = context.getConfiguration();
return settings == null ? null : (T)settings.getConfiguration();
java/java-tests/testSrc/com/intellij/execution/ConfigurationRefactoringsTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.intellij.execution;
import com.intellij.execution.application.ApplicationConfiguration;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.RuntimeConfigurationException;
import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
import com.intellij.execution.junit.AllInPackageConfigurationProducer;
@@ -222,7 +222,7 @@ public class ConfigurationRefactoringsTest extends BaseConfigurationTestCase {
}
@Override
protected <T extends RuntimeConfiguration> T createConfiguration(PsiElement psiClass, MapDataContext dataContext) {
protected <T extends RunConfiguration> T createConfiguration(PsiElement psiClass, MapDataContext dataContext) {
T configuration = (T)super.createConfiguration(psiClass, dataContext);
RunManagerEx.getInstanceEx(myProject).setTemporaryConfiguration(new RunnerAndConfigurationSettingsImpl(null, configuration, false));
return configuration;
java/java-tests/testSrc/com/intellij/execution/ConfigurationsTest.java
+3 -3
View File
@@ -287,7 +287,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
String output = setCompilerOutput(module, "classes", false);
assertEquals(output, setCompilerOutput(module, "classes", true));
RuntimeConfiguration configuration = createConfiguration(findClass(module, "Application"));
RunConfiguration configuration = createConfiguration(findClass(module, "Application"));
JavaParameters javaParameters = checkCanRun(configuration);
checkContains(javaParameters.getClassPath().getPathsString(), output);
@@ -418,7 +418,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
return outputs;
}
private JavaParameters checkCanRun(RuntimeConfiguration configuration) throws ExecutionException {
private JavaParameters checkCanRun(RunConfiguration configuration) throws ExecutionException {
final RunProfileState state;
state = configuration.getState(MOCK_EXECUTOR, new ExecutionEnvironment(new MockProfile(), MOCK_EXECUTOR, myProject, null));
assertNotNull(state);
@@ -439,7 +439,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase {
return ((JavaCommandLine)state).getJavaParameters();
}
private void checkCantRun(RuntimeConfiguration configuration, String reasonBegining) throws ExecutionException {
private void checkCantRun(RunConfiguration configuration, String reasonBegining) throws ExecutionException {
//MockRunRequest request = new MockRunRequest(myProject);
//CantRunException rejectReason;
//try {
java/java-tests/testSrc/com/intellij/execution/actions/BaseRunConfigurationActionTest.java
+2 -2
View File
@@ -2,7 +2,7 @@ package com.intellij.execution.actions;
import com.intellij.execution.application.ApplicationConfiguration;
import com.intellij.execution.application.ApplicationConfigurationType;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.LocatableConfiguration;
import com.intellij.execution.junit.JUnitConfiguration;
import com.intellij.execution.junit.JUnitConfigurationType;
import com.intellij.testFramework.LightIdeaTestCase;
@@ -47,7 +47,7 @@ public class BaseRunConfigurationActionTest extends LightIdeaTestCase {
checkSuggestedName("123456789012345678...()", configuration);
}
private static void checkSuggestedName(String expectedName, RuntimeConfiguration configuration) {
private static void checkSuggestedName(String expectedName, LocatableConfiguration configuration) {
String suggestedName = BaseRunConfigurationAction.suggestRunActionName(configuration);
assertEquals(expectedName, suggestedName);
}
platform/lang-api/src/com/intellij/execution/actions/ConfigurationContext.java
+6 -6
View File
@@ -22,7 +22,7 @@ import com.intellij.execution.RunManager;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.execution.configurations.ConfigurationTypeUtil;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.junit.RuntimeConfigurationProducer;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.DataContext;
@@ -51,7 +51,7 @@ public class ConfigurationContext {
private RunnerAndConfigurationSettings myConfiguration;
private Ref<RunnerAndConfigurationSettings> myExistingConfiguration;
private final Module myModule;
private final RuntimeConfiguration myRuntimeConfiguration;
private final RunConfiguration myRuntimeConfiguration;
private final Component myContextComponent;
public static Key<ConfigurationContext> SHARED_CONTEXT = Key.create("SHARED_CONTEXT");
@@ -72,7 +72,7 @@ public class ConfigurationContext {
}
private ConfigurationContext(final DataContext dataContext) {
myRuntimeConfiguration = RuntimeConfiguration.DATA_KEY.getData(dataContext);
myRuntimeConfiguration = RunConfiguration.DATA_KEY.getData(dataContext);
myContextComponent = PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext);
myModule = LangDataKeys.MODULE.getData(dataContext);
@SuppressWarnings({"unchecked"})
@@ -190,15 +190,15 @@ public class ConfigurationContext {
}
/**
* Returns original {@link RuntimeConfiguration} from this context.
* Returns original {@link RunConfiguration} from this context.
* For example, it could be some test framework runtime configuration that had been launched
* and that had brought a result test tree on which a right-click action was performed.
*
* @param type {@link ConfigurationType} instance to filter original runtime configuration by its type
* @return {@link RuntimeConfiguration} instance, it could be null
* @return {@link RunConfiguration} instance, it could be null
*/
@Nullable
public RuntimeConfiguration getOriginalConfiguration(@Nullable ConfigurationType type) {
public RunConfiguration getOriginalConfiguration(@Nullable ConfigurationType type) {
if (type == null) {
return myRuntimeConfiguration;
}
platform/lang-api/src/com/intellij/execution/configurations/RunConfiguration.java
+3
View File
@@ -16,6 +16,7 @@
package com.intellij.execution.configurations;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.JDOMExternalizable;
@@ -35,6 +36,8 @@ import org.jetbrains.annotations.Nullable;
* @see RefactoringListenerProvider
*/
public interface RunConfiguration extends RunProfile, JDOMExternalizable, Cloneable {
DataKey<RunConfiguration> DATA_KEY = DataKey.create("runtimeConfiguration");
/**
* Returns the type of the run configuration.
*
platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
+3 -3
View File
@@ -16,15 +16,15 @@
package com.intellij.execution.configurations;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @deprecated
*/
public abstract class RuntimeConfiguration extends LocatableConfigurationBase implements Cloneable, ModuleRunConfiguration {
public static final DataKey<RuntimeConfiguration> DATA_KEY = DataKey.create("runtimeConfiguration");
protected RuntimeConfiguration(final String name, final Project project, final ConfigurationFactory factory) {
super(project, factory, name);
}
platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
+1 -1
View File
@@ -120,7 +120,7 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea
protected RunnerAndConfigurationSettings cloneTemplateConfiguration(final Project project, @Nullable final ConfigurationContext context) {
if (context != null) {
final RuntimeConfiguration original = context.getOriginalConfiguration(myConfigurationFactory.getType());
final RunConfiguration original = context.getOriginalConfiguration(myConfigurationFactory.getType());
if (original != null) {
final RunConfiguration c = original instanceof DelegatingRuntimeConfiguration? ((DelegatingRuntimeConfiguration)original).getPeer() : original;
return RunManager.getInstance(project).createConfiguration(c.clone(), myConfigurationFactory);
platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
+3 -3
View File
@@ -18,7 +18,7 @@ package com.intellij.execution.testframework.sm;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.CommandLineState;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.ModuleRunConfiguration;
import com.intellij.execution.process.ProcessAdapter;
import com.intellij.execution.process.ProcessEvent;
import com.intellij.execution.process.ProcessHandler;
@@ -188,7 +188,7 @@ public class SMTestRunnerConnectionUtil {
*/
public static ConsoleView createAndAttachConsole(@NotNull final String testFrameworkName, @NotNull final ProcessHandler processHandler,
@NotNull final CommandLineState commandLineState,
@NotNull final RuntimeConfiguration config,
@NotNull final ModuleRunConfiguration config,
@NotNull final Executor executor
) throws ExecutionException {
// final String testFrameworkName
@@ -200,7 +200,7 @@ public class SMTestRunnerConnectionUtil {
public static ConsoleView createConsole(@NotNull final String testFrameworkName,
@NotNull final CommandLineState commandLineState,
@NotNull final RuntimeConfiguration config,
@NotNull final ModuleRunConfiguration config,
@NotNull final Executor executor
) throws ExecutionException {
// final String testFrameworkName
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
+4 -4
View File
@@ -16,7 +16,7 @@
package com.intellij.execution.testframework.sm.runner;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.ModuleRunConfiguration;
import com.intellij.execution.filters.CompositeFilter;
import com.intellij.execution.filters.FileHyperlinkInfo;
import com.intellij.execution.filters.Filter;
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
* @author: Roman Chernyatchik
*/
public class SMTRunnerConsoleProperties extends TestConsoleProperties implements SMStacktraceParser {
private final RuntimeConfiguration myConfiguration;
private final ModuleRunConfiguration myConfiguration;
protected final CompositeFilter myCustomFilter;
/**
@@ -51,7 +51,7 @@ public class SMTRunnerConsoleProperties extends TestConsoleProperties implements
* @param testFrameworkName Prefix for storage which keeps runner settings. E.g. "RubyTestUnit"
* @param executor
*/
public SMTRunnerConsoleProperties(@NotNull final RuntimeConfiguration config,
public SMTRunnerConsoleProperties(@NotNull final ModuleRunConfiguration config,
@NotNull final String testFrameworkName,
@NotNull final Executor executor)
{
@@ -62,7 +62,7 @@ public class SMTRunnerConsoleProperties extends TestConsoleProperties implements
myCustomFilter = new CompositeFilter(config.getProject());
}
public RuntimeConfiguration getConfiguration() {
public ModuleRunConfiguration getConfiguration() {
return myConfiguration;
}
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java
+3 -3
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.execution.testframework.sm.runner.ui;
import com.intellij.execution.configurations.RunConfigurationBase;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.*;
import com.intellij.execution.testframework.sm.SMRunnerUtil;
@@ -89,14 +89,14 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
private String myCurrentCustomProgressCategory;
private final Set<String> myMentionedCategories = new LinkedHashSet<String>();
public SMTestRunnerResultsForm(final RunConfigurationBase runConfiguration,
public SMTestRunnerResultsForm(final RunConfiguration runConfiguration,
@NotNull final JComponent console,
final TestConsoleProperties consoleProperties,
final ExecutionEnvironment environment) {
this(runConfiguration, console, AnAction.EMPTY_ARRAY, consoleProperties, environment, null);
}
public SMTestRunnerResultsForm(final RunConfigurationBase runConfiguration,
public SMTestRunnerResultsForm(final RunConfiguration runConfiguration,
@NotNull final JComponent console,
AnAction[] consoleActions,
final TestConsoleProperties consoleProperties,
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/BaseSMTRunnerTestCase.java
+3 -3
View File
@@ -15,7 +15,7 @@
*/
package com.intellij.execution.testframework.sm.runner;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.ModuleRunConfiguration;
import com.intellij.execution.executors.DefaultDebugExecutor;
import com.intellij.execution.testframework.TestConsoleProperties;
import com.intellij.testFramework.LightPlatformTestCase;
@@ -80,12 +80,12 @@ public abstract class BaseSMTRunnerTestCase extends LightPlatformTestCase {
return createSuiteProxy("suite", parentSuite);
}
protected RuntimeConfiguration createRunConfiguration() {
protected ModuleRunConfiguration createRunConfiguration() {
return new MockRuntimeConfiguration(getProject());
}
protected TestConsoleProperties createConsoleProperties() {
final RuntimeConfiguration runConfiguration = createRunConfiguration();
final ModuleRunConfiguration runConfiguration = createRunConfiguration();
final TestConsoleProperties consoleProperties = new SMTRunnerConsoleProperties(runConfiguration, "SMRunnerTests", DefaultDebugExecutor.getDebugExecutorInstance());
TestConsoleProperties.HIDE_PASSED_TESTS.set(consoleProperties, false);
platform/testRunner/src/com/intellij/execution/testframework/TestConsoleProperties.java
+2 -2
View File
@@ -21,7 +21,7 @@
package com.intellij.execution.testframework;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.ModuleRunConfiguration;
import com.intellij.execution.executors.DefaultDebugExecutor;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.execution.ui.ExecutionConsole;
@@ -142,7 +142,7 @@ public abstract class TestConsoleProperties extends StoringPropertyContainer imp
myListeners.clear();
}
public abstract RuntimeConfiguration getConfiguration();
public abstract ModuleRunConfiguration getConfiguration();
/**
* Allows to make console editable and disable/enable input sending in process stdin stream.
platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java
+2 -2
View File
@@ -17,7 +17,7 @@ package com.intellij.execution.testframework;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.Location;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.notification.NotificationGroup;
import com.intellij.openapi.actionSystem.LangDataKeys;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -69,7 +69,7 @@ public class TestsUIUtil {
}
}
if (Location.DATA_KEY.is(dataId)) return testProxy.getLocation(project, properties.getScope());
if (RuntimeConfiguration.DATA_KEY.is(dataId)) return properties.getConfiguration();
if (RunConfiguration.DATA_KEY.is(dataId)) return properties.getConfiguration();
return null;
}
platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java
+4 -4
View File
@@ -16,9 +16,8 @@
package com.intellij.execution.testframework.export;
import com.intellij.diagnostic.LogMessageEx;
import com.intellij.openapi.diagnostic.Attachment;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.testframework.TestFrameworkRunningModel;
import com.intellij.ide.BrowserUtil;
import com.intellij.openapi.actionSystem.ActionManager;
@@ -27,6 +26,7 @@ import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Attachment;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.progress.PerformInBackgroundOption;
@@ -74,9 +74,9 @@ public class ExportTestResultsAction extends DumbAwareAction {
private TestFrameworkRunningModel myModel;
private String myToolWindowId;
private RuntimeConfiguration myRunConfiguration;
private RunConfiguration myRunConfiguration;
public static ExportTestResultsAction create(String toolWindowId, RuntimeConfiguration runtimeConfiguration) {
public static ExportTestResultsAction create(String toolWindowId, RunConfiguration runtimeConfiguration) {
ExportTestResultsAction action = new ExportTestResultsAction();
action.copyFrom(ActionManager.getInstance().getAction(ID));
action.myToolWindowId = toolWindowId;
platform/testRunner/src/com/intellij/execution/testframework/export/TestResultsXmlFormatter.java
+4 -6
View File
@@ -16,7 +16,7 @@
package com.intellij.execution.testframework.export;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.filters.*;
import com.intellij.execution.testframework.AbstractTestProxy;
import com.intellij.execution.testframework.Printable;
@@ -27,13 +27,11 @@ import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.text.DateFormatUtil;
import org.jetbrains.annotations.NotNull;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -52,16 +50,16 @@ public class TestResultsXmlFormatter {
private static final String TOTAL_STATUS = "total";
private static final String ATTR_FOORTER_TEXT = "footerText";
private final RuntimeConfiguration myRuntimeConfiguration;
private final RunConfiguration myRuntimeConfiguration;
private final ContentHandler myResultHandler;
private final AbstractTestProxy myTestRoot;
public static void execute(AbstractTestProxy root, RuntimeConfiguration runtimeConfiguration, ContentHandler resultHandler)
public static void execute(AbstractTestProxy root, RunConfiguration runtimeConfiguration, ContentHandler resultHandler)
throws SAXException {
new TestResultsXmlFormatter(root, runtimeConfiguration, resultHandler).execute();
}
private TestResultsXmlFormatter(AbstractTestProxy root, RuntimeConfiguration runtimeConfiguration, ContentHandler resultHandler) {
private TestResultsXmlFormatter(AbstractTestProxy root, RunConfiguration runtimeConfiguration, ContentHandler resultHandler) {
myRuntimeConfiguration = runtimeConfiguration;
myTestRoot = root;
myResultHandler = resultHandler;
plugins/junit/src/com/intellij/execution/junit/ExcludeFromRunAction.java
+3 -3
View File
@@ -21,7 +21,7 @@
package com.intellij.execution.junit;
import com.intellij.execution.Location;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.testframework.AbstractTestProxy;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.diagnostic.Logger;
@@ -40,7 +40,7 @@ public class ExcludeFromRunAction extends AnAction{
final DataContext dataContext = e.getDataContext();
final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
LOG.assertTrue(project != null);
final JUnitConfiguration configuration = (JUnitConfiguration)RuntimeConfiguration.DATA_KEY.getData(dataContext);
final JUnitConfiguration configuration = (JUnitConfiguration)RunConfiguration.DATA_KEY.getData(dataContext);
LOG.assertTrue(configuration != null);
final GlobalSearchScope searchScope = configuration.getConfigurationModule().getSearchScope();
final Set<String> patterns = configuration.getPersistentData().getPatterns();
@@ -56,7 +56,7 @@ public class ExcludeFromRunAction extends AnAction{
final DataContext dataContext = e.getDataContext();
final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
if (project != null) {
final RuntimeConfiguration configuration = RuntimeConfiguration.DATA_KEY.getData(dataContext);
final RunConfiguration configuration = RunConfiguration.DATA_KEY.getData(dataContext);
if (configuration instanceof JUnitConfiguration) {
final JUnitConfiguration.Data data = ((JUnitConfiguration)configuration).getPersistentData();
if (data.TEST_OBJECT == JUnitConfiguration.TEST_PATTERN) {
plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
+1 -2
View File
@@ -22,7 +22,6 @@ import com.intellij.execution.RunManagerEx;
import com.intellij.execution.RunnerAndConfigurationSettings;
import com.intellij.execution.actions.ConfigurationContext;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.impl.RunManagerImpl;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.util.Comparing;
@@ -48,7 +47,7 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio
if (PatternConfigurationProducer.isMultipleElementsSelected(context)) {
return null;
}
final RuntimeConfiguration predefinedConfiguration = context.getOriginalConfiguration(JUnitConfigurationType.getInstance());
final RunConfiguration predefinedConfiguration = context.getOriginalConfiguration(JUnitConfigurationType.getInstance());
location = JavaExecutionUtil.stepIntoSingleClass(location);
final PsiElement element = location.getPsiElement();
final PsiClass testClass = JUnitUtil.getTestClass(element);
plugins/junit/src/com/intellij/execution/junit2/ui/actions/LvcsLabeler.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.intellij.execution.junit2.ui.actions;
import com.intellij.execution.configurations.RuntimeConfiguration;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.junit2.ui.model.CompletionEvent;
import com.intellij.execution.junit2.ui.model.JUnitAdapter;
import com.intellij.execution.junit2.ui.model.StateEvent;
@@ -36,7 +36,7 @@ public class LvcsLabeler extends JUnitAdapter {
}
final boolean areTestsFailed = myModel.getRoot().isDefect();
final CompletionEvent completion = (CompletionEvent)event;
final RuntimeConfiguration configuration = myModel.getProperties().getConfiguration();
final RunConfiguration configuration = myModel.getProperties().getConfiguration();
if (configuration == null) {
return;
}