From 06ea6769daf7b5ce3a14f1022d49c4a9eb7e0338 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Thu, 19 May 2011 18:20:47 +0400
Subject: [PATCH] do not ignore @Ignore when forked (IDEA-69818)

---
 .../src/com/intellij/junit4/JUnit4IdeaTestRunner.java        | 4 ++--
 .../src/com/intellij/junit4/JUnit4TestRunnerUtil.java        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
index a9d7be453853..49ff51dea24c 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4IdeaTestRunner.java
@@ -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 {
diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
index a7da00999729..a58bc2d06605 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
@@ -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 {