From fb7b4a5bf1bdb9126366b10f9bbbb9c7e651ba70 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Fri, 11 Dec 2015 19:02:07 -0800 Subject: [PATCH] Fixed ActivityChooser logic for the initial case. When ActionSendMultipleConsumerActivity is not the default action, it just need to be selected, without clicking 'Just Once' BUG: 25752530 Change-Id: I111063aa0dbba37e0cac8f0572f43a48c659e975 --- .../Shell/tests/src/com/android/shell/UiBot.java | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/Shell/tests/src/com/android/shell/UiBot.java b/packages/Shell/tests/src/com/android/shell/UiBot.java index 7d3713724e76..c87172720ad7 100644 --- a/packages/Shell/tests/src/com/android/shell/UiBot.java +++ b/packages/Shell/tests/src/com/android/shell/UiBot.java @@ -124,6 +124,16 @@ final class UiBot { if (gotIt) { Log.v(TAG, "Found activity " + name + ", it's the default action"); + // Clicks the "Just Once" button. + gotIt = mDevice + .wait(Until.hasObject(By.res("android", "button_once")), mTimeout); + assertTrue("'Just Once' button not visible yet", gotIt); + + UiObject justOnce = mDevice + .findObject(new UiSelector().resourceId("android:id/button_once")); + assertTrue("'Just Once' button not found", justOnce.exists()); + + click(justOnce, "Just Once"); } else { // Since it's not, need to find it in the scrollable list... Log.v(TAG, "Activity " + name + " is not default action"); @@ -140,16 +150,5 @@ final class UiBot { // ... then select it. click(activity, name); } - - // Then clicks the "Just Once" button. - gotIt = mDevice - .wait(Until.hasObject(By.res("android", "button_once")), mTimeout); - assertTrue("'Just Once' button not visible yet", gotIt); - - UiObject justOnce = mDevice - .findObject(new UiSelector().resourceId("android:id/button_once")); - assertTrue("'Just Once' button not found", justOnce.exists()); - - click(justOnce, "Just Once"); } } -- 2.11.0