diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar index 0ab4c6f1..b3335cbb 100644 Binary files a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar and b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar differ diff --git a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java index 80aba132..151029e3 100644 --- a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java +++ b/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java @@ -64,12 +64,15 @@ public class UiAutomation extends BaseUiAutomation { waitForVersion4Results(); viewDetails(); extractResults(); + iteration++; if (iteration >= times) { break; } + returnToTestScreen(version); dismissRateDialogIfNecessary(); + testAgain(); } } else { // version earlier than 4.0.3 dismissReleaseNotesDialogIfNecessary(); @@ -111,7 +114,7 @@ public class UiAutomation extends BaseUiAutomation { public boolean dismissRateDialogIfNecessary() throws Exception { UiSelector selector = new UiSelector(); UiObject closeButton = new UiObject(selector.text("NOT NOW")); - if (closeButton.waitForExists(TimeUnit.SECONDS.toMillis(initialTimeoutSeconds))) { + if (closeButton.waitForExists(1)) { // dialog should already be there. closeButton.click(); sleep(1); // diaglog dismissal return true; @@ -139,8 +142,6 @@ public class UiAutomation extends BaseUiAutomation { sleep(1); // possible tab transtion } - - public void hitTest() throws Exception { UiSelector selector = new UiSelector(); UiObject test = new UiObject(selector.text("Test")); @@ -252,6 +253,9 @@ public class UiAutomation extends BaseUiAutomation { getUiDevice().pressBack(); if (version.equals("5.3.0")) getUiDevice().pressBack(); + } + + public void testAgain() throws Exception { UiSelector selector = new UiSelector(); UiObject retestButton = new UiObject(selector.text("Test Again") .className("android.widget.Button"));