Upgrade to JUnit 4.12

The license has changed from Common Public License v1.0 to
Eclipse Public License v1.0.

This will not compile as it is because it is intended to be
built against Hamcrest 1.3 or later but it is being built
against Hamcrest 1.1.

A follow on patch will fix the compilation errors so that it
builds against Hamcrest 1.1. That allows Hamcrest to be upgraded
separately. The patch can be reverted once Hamcrest has been
upgraded.

There are also some Android specific issues that will also be
fixed in follow on patches.

Bug: 33613916
Test: make checkbuild
Change-Id: Ic2c983a030399e3ace1a14927cb143fbd8307b4f

1 files changed, 46 insertions, 47 deletions

diff --git a/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java b/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
index d3bd50a..d86ec95 100644
--- a/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
+++ b/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java
@@ -1,6 +1,3 @@
-/**
- *
- */
 package org.junit.internal.builders;
 
 import java.util.Arrays;
@@ -10,48 +7,50 @@ import org.junit.runner.Runner;
 import org.junit.runners.model.RunnerBuilder;
 
 public class AllDefaultPossibilitiesBuilder extends RunnerBuilder {
-	private final boolean fCanUseSuiteMethod;
-
-	public AllDefaultPossibilitiesBuilder(boolean canUseSuiteMethod) {
-		fCanUseSuiteMethod= canUseSuiteMethod;
-	}
-
-	@Override
-	public Runner runnerForClass(Class<?> testClass) throws Throwable {
-		List<RunnerBuilder> builders= Arrays.asList(
-				ignoredBuilder(),
-				annotatedBuilder(),
-				suiteMethodBuilder(),
-				junit3Builder(),
-				junit4Builder());
-
-		for (RunnerBuilder each : builders) {
-			Runner runner= each.safeRunnerForClass(testClass);
-			if (runner != null)
-				return runner;
-		}
-		return null;
-	}
-
-	protected JUnit4Builder junit4Builder() {
-		return new JUnit4Builder();
-	}
-
-	protected JUnit3Builder junit3Builder() {
-		return new JUnit3Builder();
-	}
-
-	protected AnnotatedBuilder annotatedBuilder() {
-		return new AnnotatedBuilder(this);
-	}
-
-	protected IgnoredBuilder ignoredBuilder() {
-		return new IgnoredBuilder();
-	}
-
-	protected RunnerBuilder suiteMethodBuilder() {
-		if (fCanUseSuiteMethod)
-			return new SuiteMethodBuilder();
-		return new NullBuilder();
-	}
+    private final boolean canUseSuiteMethod;
+
+    public AllDefaultPossibilitiesBuilder(boolean canUseSuiteMethod) {
+        this.canUseSuiteMethod = canUseSuiteMethod;
+    }
+
+    @Override
+    public Runner runnerForClass(Class<?> testClass) throws Throwable {
+        List<RunnerBuilder> builders = Arrays.asList(
+                ignoredBuilder(),
+                annotatedBuilder(),
+                suiteMethodBuilder(),
+                junit3Builder(),
+                junit4Builder());
+
+        for (RunnerBuilder each : builders) {
+            Runner runner = each.safeRunnerForClass(testClass);
+            if (runner != null) {
+                return runner;
+            }
+        }
+        return null;
+    }
+
+    protected JUnit4Builder junit4Builder() {
+        return new JUnit4Builder();
+    }
+
+    protected JUnit3Builder junit3Builder() {
+        return new JUnit3Builder();
+    }
+
+    protected AnnotatedBuilder annotatedBuilder() {
+        return new AnnotatedBuilder(this);
+    }
+
+    protected IgnoredBuilder ignoredBuilder() {
+        return new IgnoredBuilder();
+    }
+
+    protected RunnerBuilder suiteMethodBuilder() {
+        if (canUseSuiteMethod) {
+            return new SuiteMethodBuilder();
+        }
+        return new NullBuilder();
+    }
 }
\ No newline at end of file