diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-07-14 17:06:05 -0700 |
|---|---|---|
| committer | Brett Chabot <brettchabot@android.com> | 2010-07-14 17:10:11 -0700 |
| commit | ee549ef4b9452802c1e7b47ad592a1c9875dbea2 (patch) | |
| tree | f144af56cb39a7ab65acf3c0c2716eea4ed59193 /eclipse/plugins | |
| parent | fd404d86418a61cd82c0c2b534fb4d50d5eade51 (diff) | |
| download | sdk-ee549ef4b9452802c1e7b47ad592a1c9875dbea2.tar.gz | |
Add support for specifying adb timeout in ddms testrunner.
Also handle TimeoutException in ADT test runner.
Change-Id: I585c2818f1c77ec80222bad282ae10b3ee8f5e1c
Diffstat (limited to 'eclipse/plugins')
3 files changed, 6 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/LaunchMessages.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/LaunchMessages.java index d09ddff17..b2772f789 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/LaunchMessages.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/LaunchMessages.java @@ -44,6 +44,7 @@ public class LaunchMessages extends NLS { public static String RemoteAdtTestRunner_RunFailedMsg_s; public static String RemoteAdtTestRunner_RunIOException_s; + public static String RemoteAdtTestRunner_RunTimeoutException; public static String RemoteAdtTestRunner_RunStoppedMsg; static { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java index 461fd9db3..3f40230fc 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/runtime/RemoteAdtTestRunner.java @@ -16,6 +16,7 @@ package com.android.ide.eclipse.adt.internal.launch.junit.runtime; +import com.android.ddmlib.TimeoutException; import com.android.ddmlib.testrunner.ITestRunListener; import com.android.ddmlib.testrunner.RemoteAndroidTestRunner; import com.android.ddmlib.testrunner.TestIdentifier; @@ -125,6 +126,8 @@ public class RemoteAdtTestRunner extends RemoteTestRunner { } AdtPlugin.printToConsole(mLaunchInfo.getProject(), "Running tests..."); runner.run(new TestRunListener()); + } catch (TimeoutException e) { + reportError(LaunchMessages.RemoteAdtTestRunner_RunTimeoutException); } catch (IOException e) { reportError(String.format(LaunchMessages.RemoteAdtTestRunner_RunIOException_s, e.getMessage())); diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties index 67c911691..1ac7fb29b 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/messages.properties @@ -35,5 +35,6 @@ InstrValidator_NoTestLibMsg_s=The application does not declare uses-library %1$s InstrValidator_WrongRunnerTypeMsg_s=The instrumentation runner must be of type %1$s RemoteAdtTestRunner_RunCompleteMsg=Test run complete RemoteAdtTestRunner_RunFailedMsg_s=Test run failed: %1$s -RemoteAdtTestRunner_RunIOException_s=Test run failed. Lost connection with device: %s +RemoteAdtTestRunner_RunTimeoutException=Connection with device timed out. +RemoteAdtTestRunner_RunIOException_s=Lost connection with device: %s RemoteAdtTestRunner_RunStoppedMsg=Test run stopped |