From e40517ab955986664638d91bc04c7d664d040a2e Mon Sep 17 00:00:00 2001 From: Marc Bonnici Date: Tue, 13 Nov 2018 11:47:04 +0000 Subject: workloads/gfxbench: Fix not detecting missing asset popup Add check for a differently worded popup informing that assets are missing. --- .../gfxbench/com.arm.wa.uiauto.gfxbench.apk | Bin 264829 -> 264836 bytes .../com/arm/wa/uiauto/gfxbench/UiAutomation.java | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk b/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk index 08461b41..27b29bbc 100755 Binary files a/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk and b/wa/workloads/gfxbench/com.arm.wa.uiauto.gfxbench.apk differ diff --git a/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java b/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java index bde7ce22..8b15ffd7 100755 --- a/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java +++ b/wa/workloads/gfxbench/uiauto/app/src/main/java/com/arm/wa/uiauto/gfxbench/UiAutomation.java @@ -74,14 +74,18 @@ public class UiAutomation extends BaseUiAutomation { UiObject sync = mDevice.findObject(new UiSelector().text("Data synchronization") .className("android.widget.TextView")); - if (sync.exists()){ - UiObject data = - mDevice.findObject(new UiSelector().resourceId("android:id/button1") - .className("android.widget.Button")); - data.click(); - } - - UiObject home = + if (!sync.exists()){ + sync = mDevice.findObject(new UiSelector().text("Pushed data not found") + .className("android.widget.TextView")); + } + if (sync.exists()){ + UiObject data = + mDevice.findObject(new UiSelector().resourceId("android:id/button1") + .className("android.widget.Button")); + data.click(); + } + + UiObject home = mDevice.findObject(new UiSelector().resourceId("net.kishonti.gfxbench.gl.v50000.corporate:id/main_homeBack") .className("android.widget.LinearLayout")); home.waitForExists(300000); -- cgit v1.2.3