Revert "Refactor code to please vogar."

To put us back green. Will re-land after cleaning things up.

This reverts commit dc251703c2578ce7f7771a47ea3829ed5b7ad3ca.

Change-Id: Ic893ab7e24a1ad41f265cd8264ca8f14ef5982fe
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java
index 07c135e..4a5a6a1 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/share/AllTests.java
@@ -21,13 +21,6 @@
 
 public class AllTests {
   public static void main(String[] args) {
-    junit.framework.TestResult result = junit.textui.TestRunner.run(suite());
-    if (!result.wasSuccessful()) {
-        System.exit(1);
-    }
-  }
-
-  public static junit.framework.Test suite() {
     junit.framework.TestSuite suite = new junit.framework.TestSuite();
 
     //
@@ -216,6 +209,10 @@
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.VirtualMachine.SuspendTest.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.VirtualMachine.TopLevelThreadGroupsTest.class);
     suite.addTestSuite(org.apache.harmony.jpda.tests.jdwp.VirtualMachine.VersionTest.class);
-    return suite;
+
+    junit.framework.TestResult result = junit.textui.TestRunner.run(suite);
+    if (!result.wasSuccessful()) {
+        System.exit(1);
+    }
   }
 }