diff options
| author | Marc Bonnici <marc.bonnici@arm.com> | 2018-03-15 18:15:22 +0000 |
|---|---|---|
| committer | setrofim <setrofim@gmail.com> | 2018-03-16 07:57:00 +0000 |
| commit | 5e4a9311f2413385ac1008351ac7389562a9ee8d (patch) | |
| tree | 7a47d15be45f622ad974d934659e9d9752387609 | |
| parent | 2b7d1de9f1db2ca2c0b9cf146063f58eb4a2aad5 (diff) | |
workloads/gmail: Fix attaching files
Ensure the workload uses the passed working directory for attaching
images instead of a hard coded name and allow for finding of the attach
button by description as well as name.
| -rw-r--r-- | wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk | bin | 265512 -> 265489 bytes | |||
| -rwxr-xr-x | wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java | 13 |
2 files changed, 10 insertions, 3 deletions
diff --git a/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk b/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk Binary files differindex adc77756..a32df324 100644 --- a/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk +++ b/wa/workloads/gmail/com.arm.wa.uiauto.gmail.apk diff --git a/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java b/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java index 599351cc..257a5190 100755 --- a/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java +++ b/wa/workloads/gmail/uiauto/app/src/main/java/com/arm/wa/uiauto/gmail/UiAutomation.java @@ -159,13 +159,20 @@ public class UiAutomation extends BaseUiAutomation implements ApplaunchInterface ActionLogger logger = new ActionLogger(testTag, parameters); UiObject attachIcon = - getUiObjectByResourceId(packageID + "add_attachment", "android.widget.TextView"); + mDevice.findObject(new UiSelector().resourceId(packageID + "add_attachment") + .className("android.widget.TextView")); logger.start(); attachIcon.click(); UiObject attachFile = - getUiObjectByText("Attach file", "android.widget.TextView"); + mDevice.findObject(new UiSelector().textContains("Attach file") + .className("android.widget.TextView")); + if (!attachFile.exists()){ + attachFile = + mDevice.findObject(new UiSelector().descriptionContains("Attach file") + .className("android.widget.TextView")); + } attachFile.clickAndWaitForNewWindow(uiAutoTimeout); // Show Roots menu @@ -187,7 +194,7 @@ public class UiAutomation extends BaseUiAutomation implements ApplaunchInterface if (imagesEntry.waitForExists(uiAutoTimeout)) { imagesEntry.click(); } - selectGalleryFolder("wa"); + selectGalleryFolder(workdir_name); UiObject imageButton = mDevice.findObject(new UiSelector().resourceId("com.android.documentsui:id/grid") |