From e1827ffde2ad51adf7c496698856b45e90c519ca Mon Sep 17 00:00:00 2001 From: James Hartley Date: Tue, 3 May 2016 18:16:17 +0100 Subject: [PATCH] Tidy up Reader timing instrumentation and fix build error --- .../reader/com.arm.wlauto.uiauto.reader.jar | Bin 11683 -> 11674 bytes .../com/arm/wlauto/uiauto/UiAutomation.java | 15 +++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wlauto/workloads/reader/com.arm.wlauto.uiauto.reader.jar b/wlauto/workloads/reader/com.arm.wlauto.uiauto.reader.jar index 5be714c62c575d14bc71c50dc9969f60c1694692..aae224998bcb2b6c6b6ed4c10c9a604c8a0542e9 100644 GIT binary patch delta 11457 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 bmVTp1sHMgD?kfNQq?2teFb2*n00000MmMQx delta 11457 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 bQE8k=Pou|`_bUJZP?KaWFb3Bw00000a6F9| diff --git a/wlauto/workloads/reader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/reader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java index c51f38da..41a3ceac 100755 --- a/wlauto/workloads/reader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java +++ b/wlauto/workloads/reader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java @@ -18,8 +18,8 @@ import java.io.File; import java.io.FileWriter; import java.io.BufferedWriter; import java.util.concurrent.TimeUnit; -import java.util.LinkedHashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; @@ -72,7 +72,7 @@ public class UiAutomation extends UxPerfUiAutomation { int i = 0; do { i += 10; - tapDisplay(webViewCoords.centerX(), webViewCoords.bottom - i); + tapDisplay(webViewCoords.centerX(), webViewCoords.centerY() + i); } while ( welcomeView.exists() || i < webViewCoords.top ); } @@ -143,13 +143,16 @@ public class UiAutomation extends UxPerfUiAutomation { } private void openFile(String filename) throws Exception { + + String TestTag = "openfile"; + // Replace whitespace and full stops within the filename String file = filename.replaceAll("\\.", "_").replaceAll("\\s+", "_"); - timingResults.put(String.format("selectLocalFilesList" + "_" + file), selectLocalFilesList()); - timingResults.put(String.format("selectSearchDuration" + "_" + file), selectSearchFileButton()); - timingResults.put(String.format("searchFileList" + "_" + file), searchFileList(filename)); - timingResults.put(String.format("openFileFromList" + "_" + file), openFileFromList(filename)); + timingResults.put(String.format(TestTag + "_" + "selectLocalFilesList" + "_" + file), selectLocalFilesList()); + timingResults.put(String.format(TestTag + "_" + "selectSearchDuration" + "_" + file), selectSearchFileButton()); + timingResults.put(String.format(TestTag + "_" + "searchFileList" + "_" + file), searchFileList(filename)); + timingResults.put(String.format(TestTag + "_" + "openFileFromList" + "_" + file), openFileFromList(filename)); // Cludge to get rid of the first time run help dialogue boxes tapDisplayCentre();