Automated import from //branches/donutburger/...@141463,141463
This commit is contained in:
committed by
The Android Open Source Project
parent
bbf8acf406
commit
8ee14c4a38
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
Reference in New Issue
Block a user