Redo fix of 1189 in a way that won't break code that subclasses AllDe…

…faultPossibilitiesBuilder

src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java

@@ -9,6 +9,14 @@
 public class AllDefaultPossibilitiesBuilder extends RunnerBuilder {
     private final boolean canUseSuiteMethod;
 
+    public AllDefaultPossibilitiesBuilder() {
+        canUseSuiteMethod = true;
+    }
+
+    /**
+     * @deprecated used {@link #AllDefaultPossibilitiesBuilder()}.
+     */
+    @Deprecated
     public AllDefaultPossibilitiesBuilder(boolean canUseSuiteMethod) {
         this.canUseSuiteMethod = canUseSuiteMethod;
     }
@@ -40,10 +48,7 @@ protected JUnit3Builder junit3Builder() {
     }
 
     protected AnnotatedBuilder annotatedBuilder() {
-        // For compatibility with Request#classes(...) and the Suite runner,
-        // deeper nesting levels always need to support suite() methods:
-        RunnerBuilder suiteBuilder = canUseSuiteMethod ? this : new AllDefaultPossibilitiesBuilder(true);
-        return new AnnotatedBuilder(suiteBuilder);
+        return new AnnotatedBuilder(this);
     }
 
     protected IgnoredBuilder ignoredBuilder() {
@@ -56,4 +61,4 @@ protected RunnerBuilder suiteMethodBuilder() {
         }
         return new NullBuilder();
     }
-}
+}

src/main/java/org/junit/internal/requests/ClassRequest.java

@@ -1,8 +1,10 @@
 package org.junit.internal.requests;
 
 import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
+import org.junit.internal.builders.SuiteMethodBuilder;
 import org.junit.runner.Request;
 import org.junit.runner.Runner;
+import org.junit.runners.model.RunnerBuilder;
 
 public class ClassRequest extends Request {
     private final Object runnerLock = new Object();
@@ -30,10 +32,34 @@ public Runner getRunner() {
         if (runner == null) {
             synchronized (runnerLock) {
                 if (runner == null) {
-                    runner = new AllDefaultPossibilitiesBuilder(canUseSuiteMethod).safeRunnerForClass(fTestClass);
+                    runner = new CustomAllDefaultPossibilitiesBuilder().safeRunnerForClass(fTestClass);
                 }
             }
         }
         return runner;
     }
-}
+
+    private class CustomAllDefaultPossibilitiesBuilder extends AllDefaultPossibilitiesBuilder {
+
+        @Override
+        protected RunnerBuilder suiteMethodBuilder() {
+            return new CustomSuiteMethodBuilder();
+        }
+    }
+
+    /*
+     * Customization of {@link SuiteMethodBuilder} that prevents use of the
+     * suite method when creating a runner for fTestClass when canUseSuiteMethod
+     * is false.
+     */
+    private class CustomSuiteMethodBuilder extends SuiteMethodBuilder {
+
+        @Override
+        public Runner runnerForClass(Class<?> testClass) throws Throwable {
+            if (testClass == fTestClass && !canUseSuiteMethod) {
+                return null;
+            }
+            return super.runnerForClass(testClass);
+        }
+    }
+}