Revert "Make JUnit classes more compatible with standard JUnit"

This reverts commit 1915347673761fca7ea6f6ac01ebb9411e22f9e9.

This CL breaks libcore testing (and presumably JDWP testing)
on the ART Buildbots (device configurations); see e.g.
https://build.chromium.org/p/client.art/builders/hammerhead-ndebug/builds/6202/steps/test%20libcore/logs/stdio

Change-Id: I62680ca22eec7e641e4f0006e5c530d4219e6995
diff --git a/src/junit/framework/Test.java b/src/junit/framework/Test.java
index 3ab588f..d123022 100644
--- a/src/junit/framework/Test.java
+++ b/src/junit/framework/Test.java
@@ -18,8 +18,4 @@
 
 // Note: this class was written without inspecting the junit.framework code
 
-public interface Test {
-    int countTestCases();
-
-    void run(TestResult result);
-}
+public interface Test {}
diff --git a/src/junit/framework/TestCase.java b/src/junit/framework/TestCase.java
index b4a9529..16a4f75 100644
--- a/src/junit/framework/TestCase.java
+++ b/src/junit/framework/TestCase.java
@@ -51,16 +51,6 @@
         this.name = name;
     }
 
-    @Override
-    public int countTestCases() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void run(TestResult result) {
-        throw new UnsupportedOperationException();
-    }
-
     public final void setMethod(Method method) {
         this.method = method;
         this.name = method.getName();
diff --git a/src/junit/framework/TestSuite.java b/src/junit/framework/TestSuite.java
index 5a97398..78ee02f 100644
--- a/src/junit/framework/TestSuite.java
+++ b/src/junit/framework/TestSuite.java
@@ -64,17 +64,11 @@
     public void addTestSuite(Class<?> suite) {
         testsAndSuites.add(suite);
     }
-
-    @Override
+    
     public int countTestCases() {
         return testsAndSuites.size();
     }
-
-    @Override
-    public void run(TestResult result) {
-        throw new UnsupportedOperationException();
-    }
-
+    
     /**
      * The official JUnit framework creates test instances eagerly and holds
      * them for the duration of the test run. We prefer to create tests lazily,
diff --git a/src/org/junit/Ignore.java b/src/org/junit/Ignore.java
index 6f72baa..5dcc74d 100644
--- a/src/org/junit/Ignore.java
+++ b/src/org/junit/Ignore.java
@@ -26,5 +26,4 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Ignore {
-    String value() default "";
 }