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

do not ignore @Ignore when forked (IDEA-69818)

Browse Source
This commit is contained in:
anna
2011-05-19 21:17:16 +04:00
parent 42e2446d63
commit 06ea6769da
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
+2 -2
View File
@@ -34,7 +34,7 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
public int startRunnerWithArgs(String[] args, ArrayList listeners, boolean sendTree) {
final Request request = JUnit4TestRunnerUtil.buildRequest(args);
final Request request = JUnit4TestRunnerUtil.buildRequest(args, sendTree);
final Runner testRunner = request.getRunner();
try {
Description description = testRunner.getDescription();
@@ -132,7 +132,7 @@ public class JUnit4IdeaTestRunner implements IdeaTestRunner {
}
public Object getTestToStart(String[] args) {
final Request request = JUnit4TestRunnerUtil.buildRequest(args);
final Request request = JUnit4TestRunnerUtil.buildRequest(args, false);
final Runner testRunner = request.getRunner();
Description description = null;
try {
plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
+3 -2
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.junit4;
import com.intellij.rt.execution.junit.JUnitForkedStarter;
import org.junit.Ignore;
import org.junit.internal.AssumptionViolatedException;
import org.junit.internal.requests.ClassRequest;
@@ -41,7 +42,7 @@ public class JUnit4TestRunnerUtil {
*/
private static final ResourceBundle ourBundle = ResourceBundle.getBundle("RuntimeBundle");
public static Request buildRequest(String[] suiteClassNames) {
public static Request buildRequest(String[] suiteClassNames, boolean notForked) {
if (suiteClassNames.length == 0) {
return null;
}
@@ -122,7 +123,7 @@ public class JUnit4TestRunnerUtil {
try {
Class.forName("org.junit.runners.BlockJUnit4ClassRunner"); //ignore IgnoreIgnored for junit4.4 and <
final Method method = clazz.getMethod(methodName, null);
if (method != null && method.getAnnotation(Ignore.class) != null) { //override ignored case only
if (method != null && notForked && method.getAnnotation(Ignore.class) != null) { //override ignored case only
final Request classRequest = new ClassRequest(clazz) {
public Runner getRunner() {
try {