From 09d0736d3bc0590051a409244a6effa97c227946 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 6 May 2015 12:37:56 +0100 Subject: [PATCH] antutu: fixing multi-times playback for v5 "times" parameter didn't work properly for version 5 because an extra back button press was required due to UI changes from previous versions. This commit adds the button press. --- .../antutu/com.arm.wlauto.uiauto.antutu.jar | Bin 5442 -> 5522 bytes .../com/arm/wlauto/uiauto/UiAutomation.java | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar index 35618ede332b81361ec579657df2f967fba819be..0ab4c6f170414543e88f9053d9aa10f35d9b7e5e 100644 GIT binary patch delta 5351 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 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 339f7d72..80aba132 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 @@ -68,7 +68,8 @@ public class UiAutomation extends BaseUiAutomation { if (iteration >= times) { break; } - returnToTestScreen(); + returnToTestScreen(version); + dismissRateDialogIfNecessary(); } } else { // version earlier than 4.0.3 dismissReleaseNotesDialogIfNecessary(); @@ -107,6 +108,17 @@ 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))) { + closeButton.click(); + sleep(1); // diaglog dismissal + return true; + } else { + return false; + } + } public void hitTestButton() throws Exception { UiSelector selector = new UiSelector(); UiObject test = new UiObject(selector.text("Test") @@ -236,8 +248,10 @@ public class UiAutomation extends BaseUiAutomation { } } - public void returnToTestScreen() throws Exception { + public void returnToTestScreen(String version) throws Exception { getUiDevice().pressBack(); + if (version.equals("5.3.0")) + getUiDevice().pressBack(); UiSelector selector = new UiSelector(); UiObject retestButton = new UiObject(selector.text("Test Again") .className("android.widget.Button"));