diff --git a/wa/workloads/googlephotos/__init__.py b/wa/workloads/googlephotos/__init__.py index 611de973..1e95f041 100755 --- a/wa/workloads/googlephotos/__init__.py +++ b/wa/workloads/googlephotos/__init__.py @@ -42,7 +42,7 @@ class Googlephotos(ApkUiautoWorkload): 6. A rotate test is performed on a selected image, rotating anticlockwise 90 degrees, 180 degrees and 270 degrees. - Known working APK version: 4.28.0.276318361 + Known working APK version: 4.53.0.316914374 ''' default_test_images = [ diff --git a/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk b/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk index 9e17034d..90de078c 100644 Binary files a/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk and b/wa/workloads/googlephotos/com.arm.wa.uiauto.googlephotos.apk differ diff --git a/wa/workloads/googlephotos/uiauto/app/src/main/java/com/arm/wa/uiauto/googlephotos/UiAutomation.java b/wa/workloads/googlephotos/uiauto/app/src/main/java/com/arm/wa/uiauto/googlephotos/UiAutomation.java index b05d226a..cad7ebb1 100755 --- a/wa/workloads/googlephotos/uiauto/app/src/main/java/com/arm/wa/uiauto/googlephotos/UiAutomation.java +++ b/wa/workloads/googlephotos/uiauto/app/src/main/java/com/arm/wa/uiauto/googlephotos/UiAutomation.java @@ -102,6 +102,7 @@ public class UiAutomation extends BaseUiAutomation implements ApplaunchInterface // Clear the initial run dialogues of the application launch. dismissWelcomeView(); closePromotionPopUp(); + closeMissingOutPopUp(); } // Returns the launch command for the application. @@ -176,6 +177,14 @@ public class UiAutomation extends BaseUiAutomation implements ApplaunchInterface } } + public void closeMissingOutPopUp() throws Exception { + UiObject missingPopup = + mDevice.findObject(new UiSelector().textContains("Not now")); + if (missingPopup.waitForExists(3000)) { + missingPopup.click(); + } + } + // Helper to click on the first image public void selectFirstImage() throws Exception { UiObject photo = @@ -304,9 +313,9 @@ public class UiAutomation extends BaseUiAutomation implements ApplaunchInterface Iterator> it = testParams.entrySet().iterator(); clickUiObject(BY_ID, packageID + "edit", "android.widget.ImageView"); - UiObject enhance = + UiObject enhance = mDevice.findObject(new UiSelector().description("Enhance photo")); - if (enhance.exists()){ + if (enhance.waitForExists(timeout)){ enhance.click(); }