Merge pull request #961 from stefanbirkner/intellij

Restore field names with f prefix. Fixes #960.
junit-team · Jul 24, 2014 · 74b11e0 · 74b11e0
2 parents 817ea24 + ef7b30f
commit 74b11e0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/org/junit/internal/requests/ClassRequest.java b/src/main/java/org/junit/internal/requests/ClassRequest.java
@@ -6,12 +6,18 @@
 
 public class ClassRequest extends Request {
     private final Object runnerLock = new Object();
-    private final Class<?> testClass;
+
+    /*
+     * We have to use the f prefix, because IntelliJ's JUnit4IdeaTestRunner uses
+     * reflection to access this field. See
+     * https://github.com/junit-team/junit/issues/960
+     */
+    private final Class<?> fTestClass;
     private final boolean canUseSuiteMethod;
     private volatile Runner runner;
 
     public ClassRequest(Class<?> testClass, boolean canUseSuiteMethod) {
-        this.testClass = testClass;
+        this.fTestClass = testClass;
         this.canUseSuiteMethod = canUseSuiteMethod;
     }
 
@@ -24,7 +30,7 @@ public Runner getRunner() {
         if (runner == null) {
             synchronized (runnerLock) {
                 if (runner == null) {
-                    runner = new AllDefaultPossibilitiesBuilder(canUseSuiteMethod).safeRunnerForClass(testClass);
+                    runner = new AllDefaultPossibilitiesBuilder(canUseSuiteMethod).safeRunnerForClass(fTestClass);
                 }
             }
         }

diff --git a/src/main/java/org/junit/internal/requests/FilterRequest.java b/src/main/java/org/junit/internal/requests/FilterRequest.java
@@ -11,7 +11,12 @@
  */
 public final class FilterRequest extends Request {
     private final Request request;
-    private final Filter filter;
+    /*
+     * We have to use the f prefix, because IntelliJ's JUnit4IdeaTestRunner uses
+     * reflection to access this field. See
+     * https://github.com/junit-team/junit/issues/960
+     */
+    private final Filter fFilter;
 
     /**
      * Creates a filtered Request
@@ -22,18 +27,18 @@ public final class FilterRequest extends Request {
      */
     public FilterRequest(Request request, Filter filter) {
         this.request = request;
-        this.filter = filter;
+        this.fFilter = filter;
     }
 
     @Override
     public Runner getRunner() {
         try {
             Runner runner = request.getRunner();
-            filter.apply(runner);
+            fFilter.apply(runner);
             return runner;
         } catch (NoTestsRemainException e) {
             return new ErrorReportingRunner(Filter.class, new Exception(String
-                    .format("No tests found matching %s from %s", filter
+                    .format("No tests found matching %s from %s", fFilter
                             .describe(), request.toString())));
         }
     }