LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brett Chabot
2009-03-24 20:21:04 -07:00
committed by The Android Open Source Project
parent bbf8acf406
commit 8ee14c4a38
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java
View File

@@ -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.DelayedLaunchInfo;
import com.android.ide.eclipse.adt.launch.IAndroidLaunchAction; 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.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.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
@@ -166,7 +166,7 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
private final VMRunnerConfiguration mRunConfig; private final VMRunnerConfiguration mRunConfig;
private final ILaunch mLaunch; private final ILaunch mLaunch;
private final AndroidJUnitLaunchInfo mJUnitInfo; private final AndroidJUnitLaunchInfo mJUnitInfo;
private RemoteADTTestRunner mTestRunner = null; private RemoteAdtTestRunner mTestRunner = null;
private boolean mIsTerminated = false; private boolean mIsTerminated = false;
TestRunnerProcess(VMRunnerConfiguration runConfig, ILaunch launch, TestRunnerProcess(VMRunnerConfiguration runConfig, ILaunch launch,
@@ -256,7 +256,7 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
*/ */
@Override @Override
public void run() { public void run() {
mTestRunner = new RemoteADTTestRunner(); mTestRunner = new RemoteAdtTestRunner();
mTestRunner.runTests(mRunConfig.getProgramArguments(), mJUnitInfo); mTestRunner.runTests(mRunConfig.getProgramArguments(), mJUnitInfo);
} }
} }

4
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteADTTestRunner.java → tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/runtime/RemoteAdtTestRunner.java
View File

@@ -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 * @see org.eclipse.jdt.internal.junit.runner.RemoteTestRunner for more details on the protocol
*/ */
@SuppressWarnings("restriction") @SuppressWarnings("restriction")
public class RemoteADTTestRunner extends RemoteTestRunner { public class RemoteAdtTestRunner extends RemoteTestRunner {
private AndroidJUnitLaunchInfo mLaunchInfo; private AndroidJUnitLaunchInfo mLaunchInfo;
private TestExecution mExecution; private TestExecution mExecution;
@@ -97,6 +97,8 @@ public class RemoteADTTestRunner extends RemoteTestRunner {
// error occurred during test collection. // error occurred during test collection.
reportError(collector.getErrorMessage()); reportError(collector.getErrorMessage());
// abort here // abort here
notifyTestRunEnded(0);
return;
} }
notifyTestRunStarted(collector.getTestCaseCount()); notifyTestRunStarted(collector.getTestCaseCount());
collector.sendTrees(this); collector.sendTrees(this);