diff options
author | Kevin Jin <kjin@google.com> | 2014-05-08 10:00:25 -0700 |
---|---|---|
committer | Kevin Jin <kjin@google.com> | 2014-05-08 10:00:25 -0700 |
commit | 46cbd1ba6301e660d32bed661bd65994d4911c4e (patch) | |
tree | 63deeb3504cfe23c4388b52c5c690b705f69d7ea /src | |
parent | d414dc59622a9a8a0a2e3af94387d2ecd148ca55 (diff) | |
download | droiddriver-46cbd1ba6301e660d32bed661bd65994d4911c4e.tar.gz |
add UiDevice.pressBack for convenience
Change-Id: Ifafeda79d9569d853948ac254d34cec66f896232
Diffstat (limited to 'src')
4 files changed, 10 insertions, 1 deletions
diff --git a/src/com/google/android/droiddriver/UiDevice.java b/src/com/google/android/droiddriver/UiDevice.java index d55689a..84fea1b 100644 --- a/src/com/google/android/droiddriver/UiDevice.java +++ b/src/com/google/android/droiddriver/UiDevice.java @@ -35,6 +35,9 @@ public interface UiDevice { /** Puts device to sleep if the screen is on */ void sleep(); + /** Simulates pressing "back" button */ + void pressBack(); + /** * Executes a global action without the context of a certain UiElement. * diff --git a/src/com/google/android/droiddriver/actions/Action.java b/src/com/google/android/droiddriver/actions/Action.java index 41d3f2c..86dfc24 100644 --- a/src/com/google/android/droiddriver/actions/Action.java +++ b/src/com/google/android/droiddriver/actions/Action.java @@ -32,7 +32,7 @@ public interface Action { * @param element the Ui element to perform the action on * @return Whether the action is successful. Some actions throw exceptions in * case of failure, when that behavior is more appropriate. For - * example, ClickAction. + * example, if event injection returns false. */ boolean perform(InputInjector injector, UiElement element); diff --git a/src/com/google/android/droiddriver/base/BaseUiDevice.java b/src/com/google/android/droiddriver/base/BaseUiDevice.java index 606bfcb..21e8aae 100644 --- a/src/com/google/android/droiddriver/base/BaseUiDevice.java +++ b/src/com/google/android/droiddriver/base/BaseUiDevice.java @@ -69,6 +69,11 @@ public abstract class BaseUiDevice implements UiDevice { } @Override + public void pressBack() { + perform(SingleKeyAction.BACK); + } + + @Override public boolean perform(Action action) { return getContext().getDriver().getRootElement().perform(action); } diff --git a/src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java b/src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java index d22cee9..656d0f3 100644 --- a/src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java +++ b/src/com/google/android/droiddriver/helpers/BaseDroidDriverTest.java @@ -235,6 +235,7 @@ public abstract class BaseDroidDriverTest<T extends Activity> extends if (shouldSkipRemainingTests(exception) || runCount >= tolerance - 1) { throw exception; } + Logs.log(Log.WARN, exception); } catch (IllegalAccessException e) { e.fillInStackTrace(); throw e; |