sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-14 14:48:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #9 from jimboatarm/code_maintenance

Browse Source 
Move confirmAccess method to UxPerfUiAutomation
This commit is contained in:
jimboatarm 2016-05-10 12:06:41 +01:00
commit 1531110bd3
9 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wlauto/common/android/UxPerfUiAutomation.class
View File

Binary file not shown.

10
wlauto/external/uiauto/src/com/arm/wlauto/uiauto/UxPerfUiAutomation.java vendored
View File

@ -267,6 +267,16 @@ public class UxPerfUiAutomation extends BaseUiAutomation {
out.close();
}
public void confirmAccess() throws Exception {
// First time run requires confirmation to allow access to local files
UiObject allowButton = new UiObject(new UiSelector().textContains("Allow")
.className("android.widget.Button"));
// Some devices request multiple permisson rights so clear them all here
while (allowButton.waitForExists(timeout)) {
allowButton.clickAndWaitForNewWindow(timeout);
}
}
public void startDumpsysSurfaceFlinger(Bundle parameters, String view) {
if (Boolean.parseBoolean(parameters.getString("dumpsys_enabled"))) {
initDumpsysSurfaceFlinger(parameters.getString("package"), view);

BIN
wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar
View File

Binary file not shown.

BIN
wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar
View File

Binary file not shown.

BIN
wlauto/workloads/reader/com.arm.wlauto.uiauto.reader.jar
View File

Binary file not shown.

2
wlauto/workloads/reader/uiauto/project.properties
View File

@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-21
target=android-18

13
wlauto/workloads/reader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -33,7 +33,7 @@ public class UiAutomation extends UxPerfUiAutomation {
signInOnline(parameters);
confirmLocalFileAccess();
confirmAccess();
gesturesTest("Getting Started.pdf");
@ -122,15 +122,6 @@ public class UiAutomation extends UxPerfUiAutomation {
}
}
private void confirmLocalFileAccess() throws Exception {
// First time run requires confirmation to allow access to local files
UiObject allowButton = new UiObject(new UiSelector().textContains("Allow")
.className("android.widget.Button"));
if (allowButton.waitForExists(timeout)) {
allowButton.clickAndWaitForNewWindow(timeout);
}
}
private void openFile(final String filename) throws Exception {
String TestTag = "openfile";
@ -140,7 +131,7 @@ public class UiAutomation extends UxPerfUiAutomation {
timingResults.put(String.format(TestTag + "_" + "selectLocalFilesList" + "_" + file), selectLocalFilesList());
// On some devices permissions to access local files occurs here rather than the earlier step
confirmLocalFileAccess();
confirmAccess();
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));

BIN
wlauto/workloads/skype/com.arm.wlauto.uiauto.skype.jar
View File

Binary file not shown.

11
wlauto/workloads/skype/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -77,16 +77,6 @@ public class UiAutomation extends UxPerfUiAutomation {
signinButton.clickAndWaitForNewWindow();
}
private void confirmAccess() throws Exception {
// First time run requires confirmation to allow access to local files
UiObject allowButton = new UiObject(new UiSelector().textContains("Allow")
.className("android.widget.Button"));
// Some devices request multiple permisson rights so clear them all here
while (allowButton.waitForExists(timeout)) {
allowButton.clickAndWaitForNewWindow(timeout);
}
}
private void selectContact(String name, String id) throws Exception {
Timer timer = new Timer();
timer.start();
@ -150,5 +140,4 @@ public class UiAutomation extends UxPerfUiAutomation {
exitDumpsysGfxInfo(PACKAGE, new File(outputDir, dumpsysTag + "_gfxInfo.log"));
}
}
}