From 67ad4a63e4e9c55827ab0cd923dd67f746166b88 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Thu, 7 May 2015 10:48:26 +0100 Subject: [PATCH] antutu: multi-times playback fix [part 2] A "please rate me" dialog occasionally pops but when returning to the initial screen (when re-running the test). The check to dismiss it wasn't being done at the right time, so it was still preventing mutli-times execution. This commit resolves that issue. --- .../antutu/com.arm.wlauto.uiauto.antutu.jar | Bin 5522 -> 5570 bytes .../com/arm/wlauto/uiauto/UiAutomation.java | 10 +++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar index 0ab4c6f170414543e88f9053d9aa10f35d9b7e5e..b3335cbb3b56476dc1ec618f690964c45abf71bd 100644 GIT binary patch delta 5313 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 T5)=RcIFnozFb4J%00000Ud=os delta 5242 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 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"));