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

tests: delegate rerunFailed creation to console properties

Browse Source
This commit is contained in:
Anna Kozlova
2015-06-23 12:04:58 +03:00
parent ed6f5ff17b
commit 96c1dff0f0
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+3 -4
View File
@@ -84,8 +84,6 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
protected abstract void passTempFile(ParametersList parametersList, String tempFilePath);
@NotNull protected abstract AbstractRerunFailedTestsAction createRerunFailedTestsAction(TestConsoleProperties testConsoleProperties, ConsoleView consoleView);
@NotNull protected abstract T getConfiguration();
@Nullable protected abstract TestSearchScope getScope();
@@ -112,7 +110,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
final RunnerSettings runnerSettings = getRunnerSettings();
final TestConsoleProperties testConsoleProperties = createTestConsoleProperties(executor);
final SMTRunnerConsoleProperties testConsoleProperties = createTestConsoleProperties(executor);
testConsoleProperties.setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false);
final BaseTestsOutputConsoleView consoleView = SMTestRunnerConnectionUtil.createConsole(getFrameworkName(), testConsoleProperties, getEnvironment());
@@ -143,7 +141,8 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
}
});
AbstractRerunFailedTestsAction rerunFailedTestsAction = createRerunFailedTestsAction(testConsoleProperties, consoleView);
AbstractRerunFailedTestsAction rerunFailedTestsAction = testConsoleProperties.createRerunFailedTestsAction(consoleView);
LOG.assertTrue(rerunFailedTestsAction != null);
rerunFailedTestsAction.setModelProvider(new Getter<TestFrameworkRunningModel>() {
@Override
public TestFrameworkRunningModel get() {
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleProperties.java
+7
View File
@@ -23,7 +23,9 @@ import com.intellij.execution.filters.FileHyperlinkInfo;
import com.intellij.execution.filters.Filter;
import com.intellij.execution.filters.HyperlinkInfo;
import com.intellij.execution.testframework.TestConsoleProperties;
import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
import com.intellij.execution.testframework.sm.SMStacktraceParserEx;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.ide.util.PropertiesComponent;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -190,4 +192,9 @@ public class SMTRunnerConsoleProperties extends TestConsoleProperties implements
public TestProxyFilterProvider getFilterProvider() {
return null;
}
@Nullable
public AbstractRerunFailedTestsAction createRerunFailedTestsAction(ConsoleView consoleView) {
return null;
}
}
plugins/junit/src/com/intellij/execution/junit/TestObject.java
-8
View File
@@ -34,9 +34,7 @@ import com.intellij.execution.process.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.testframework.*;
import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.execution.util.JavaParametersUtil;
import com.intellij.execution.util.ProgramParametersUtil;
@@ -452,12 +450,6 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
return JUNIT_TEST_FRAMEWORK_NAME;
}
@NotNull
protected AbstractRerunFailedTestsAction createRerunFailedTestsAction(TestConsoleProperties testConsoleProperties,
ConsoleView consoleView) {
return new RerunFailedTestsAction(consoleView, testConsoleProperties);
}
@NotNull
protected String getFrameworkId() {
return "junit";
plugins/junit/src/com/intellij/execution/junit2/ui/properties/JUnitConsoleProperties.java
+10
View File
@@ -17,14 +17,18 @@ 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;
import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
import com.intellij.execution.testframework.sm.runner.SMTestLocator;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -65,4 +69,10 @@ public class JUnitConsoleProperties extends JavaAwareTestConsoleProperties<JUnit
public SMTestLocator getTestLocator() {
return JavaTestLocator.INSTANCE;
}
@Nullable
@Override
public AbstractRerunFailedTestsAction createRerunFailedTestsAction(ConsoleView consoleView) {
return new RerunFailedTestsAction(consoleView, this);
}
}
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
-9
View File
@@ -22,9 +22,7 @@ import com.intellij.execution.process.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.execution.testframework.*;
import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
@@ -169,13 +167,6 @@ public class TestNGRunnableState extends JavaTestFrameworkRunnableState<TestNGCo
return TESTNG_TEST_FRAMEWORK_NAME;
}
@NotNull
@Override
protected AbstractRerunFailedTestsAction createRerunFailedTestsAction(TestConsoleProperties testConsoleProperties,
ConsoleView consoleView) {
return new RerunFailedTestsAction(consoleView, testConsoleProperties);
}
@Override
protected boolean configureByModule(Module module) {
return module != null && getConfiguration().getPersistantData().getScope() != TestSearchScope.WHOLE_PROJECT;
plugins/testng/src/com/theoryinpractice/testng/model/TestNGConsoleProperties.java
+9
View File
@@ -20,10 +20,13 @@ import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.testframework.JavaAwareTestConsoleProperties;
import com.intellij.execution.testframework.JavaTestLocator;
import com.intellij.execution.testframework.SourceScope;
import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
import com.intellij.execution.testframework.sm.runner.SMTestLocator;
import com.intellij.execution.ui.ConsoleView;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.psi.search.GlobalSearchScope;
import com.theoryinpractice.testng.configuration.TestNGConfiguration;
import com.theoryinpractice.testng.ui.actions.RerunFailedTestsAction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -62,4 +65,10 @@ public class TestNGConsoleProperties extends JavaAwareTestConsoleProperties<Test
public SMTestLocator getTestLocator() {
return JavaTestLocator.INSTANCE;
}
@Nullable
@Override
public AbstractRerunFailedTestsAction createRerunFailedTestsAction(ConsoleView consoleView) {
return new RerunFailedTestsAction(consoleView, this);
}
}