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, 26 insertions, 24 deletions

diff --git a/src/main/java/org/junit/rules/TestName.java b/src/main/java/org/junit/rules/TestName.java
index c4ab9ce..bf72602 100644
--- a/src/main/java/org/junit/rules/TestName.java
+++ b/src/main/java/org/junit/rules/TestName.java
@@ -4,36 +4,38 @@ import org.junit.runner.Description;
 
 /**
  * The TestName Rule makes the current test name available inside test methods:
- * 
+ *
  * <pre>
  * public class TestNameTest {
- * 	&#064;Rule
- * 	public TestName name= new TestName();
- * 
- * 	&#064;Test
- * 	public void testA() {
- * 		assertEquals(&quot;testA&quot;, name.getMethodName());
- * 	}
- * 
- * 	&#064;Test
- * 	public void testB() {
- * 		assertEquals(&quot;testB&quot;, name.getMethodName());
- * 	}
+ *  &#064;Rule
+ *  public TestName name= new TestName();
+ *
+ *  &#064;Test
+ *  public void testA() {
+ *      assertEquals(&quot;testA&quot;, name.getMethodName());
+ *     }
+ *
+ *  &#064;Test
+ *  public void testB() {
+ *      assertEquals(&quot;testB&quot;, name.getMethodName());
+ *     }
  * }
  * </pre>
+ *
+ * @since 4.7
  */
 public class TestName extends TestWatcher {
-	private String fName;
+    private String name;
 
-	@Override
-	protected void starting(Description d) {
-		fName= d.getMethodName();
-	}
+    @Override
+    protected void starting(Description d) {
+        name = d.getMethodName();
+    }
 
-	/**
-	 * @return the name of the currently-running test method
-	 */
-	public String getMethodName() {
-		return fName;
-	}
+    /**
+     * @return the name of the currently-running test method
+     */
+    public String getMethodName() {
+        return name;
+    }
 }