Automated import from //branches/donutburger/...@141463,141463

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java
index 4dfe37d..b880263 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java
@@ -20,7 +20,7 @@ import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.launch.DelayedLaunchInfo;
 import com.android.ide.eclipse.adt.launch.IAndroidLaunchAction;
 import com.android.ide.eclipse.adt.launch.junit.runtime.AndroidJUnitLaunchInfo;
-import com.android.ide.eclipse.adt.launch.junit.runtime.RemoteADTTestRunner;
+import com.android.ide.eclipse.adt.launch.junit.runtime.RemoteAdtTestRunner;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -166,7 +166,7 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
         private final VMRunnerConfiguration mRunConfig;
         private final ILaunch mLaunch;
         private final AndroidJUnitLaunchInfo mJUnitInfo;
-        private RemoteADTTestRunner mTestRunner = null;
+        private RemoteAdtTestRunner mTestRunner = null;
         private boolean mIsTerminated = false;
         
         TestRunnerProcess(VMRunnerConfiguration runConfig, ILaunch launch,
@@ -256,7 +256,7 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
          */
         @Override
         public void run() {
-            mTestRunner = new RemoteADTTestRunner();
+            mTestRunner = new RemoteAdtTestRunner();
             mTestRunner.runTests(mRunConfig.getProgramArguments(), mJUnitInfo);
         }
     }

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteADTTestRunner.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
similarity index 98%
rename from eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteADTTestRunner.java
rename to eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
index 6834c08..0a6a3da 100755 (executable)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteADTTestRunner.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
@@ -34,7 +34,7 @@ import org.eclipse.jdt.internal.junit.runner.TestReferenceFailure;
  * @see org.eclipse.jdt.internal.junit.runner.RemoteTestRunner for more details on the protocol
  */
 @SuppressWarnings("restriction")
-public class RemoteADTTestRunner extends RemoteTestRunner {
+public class RemoteAdtTestRunner extends RemoteTestRunner {
 
     private AndroidJUnitLaunchInfo mLaunchInfo;
     private TestExecution mExecution;
@@ -97,6 +97,8 @@ public class RemoteADTTestRunner extends RemoteTestRunner {
             // error occurred during test collection.
             reportError(collector.getErrorMessage());
             // abort here
+            notifyTestRunEnded(0);
+            return;
         }
         notifyTestRunStarted(collector.getTestCaseCount());
         collector.sendTrees(this);