sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-18 20:11:20 +00:00
Code Issues Releases Wiki Activity

antutu: robustness fixes for v5 multi-times executions

Browse Source 
- added slight delays to ensure more precise navigation
- handle dialogs that occasionally pop up when re-running tests
This commit is contained in:
Sergei Trofimov 2015-05-12 14:28:16 +01:00
parent 57d3b80e85
commit 48cced2ff9
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

32
wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -53,7 +53,7 @@ public class UiAutomation extends BaseUiAutomation {
if (version.equals("4.0.3") || version.equals("5.3.0")){ if (version.equals("4.0.3") || version.equals("5.3.0")){
int iteration = 0; int iteration = 0;
dismissNewVersionNotificationIfNecessary(); dismissNewVersionNotificationIfNecessary();
hitTestButton(); hitTestButton();
while (true) { while (true) {
if (version.equals("5.3.0")) if (version.equals("5.3.0"))
@ -71,8 +71,8 @@ public class UiAutomation extends BaseUiAutomation {
} }
returnToTestScreen(version); returnToTestScreen(version);
dismissRateDialogIfNecessary(); dismissRateDialogIfNecessary();
testAgain(); testAgain();
} }
} else { // version earlier than 4.0.3 } else { // version earlier than 4.0.3
dismissReleaseNotesDialogIfNecessary(); dismissReleaseNotesDialogIfNecessary();
@ -114,14 +114,18 @@ public class UiAutomation extends BaseUiAutomation {
public boolean dismissRateDialogIfNecessary() throws Exception { public boolean dismissRateDialogIfNecessary() throws Exception {
UiSelector selector = new UiSelector(); UiSelector selector = new UiSelector();
UiObject closeButton = new UiObject(selector.text("NOT NOW")); UiObject closeButton = new UiObject(selector.text("NOT NOW"));
if (closeButton.waitForExists(1)) { // dialog should already be there. boolean dismissed = false;
// Sometimes, dismissing the dialog the first time does not work properly --
// it starts to disappear but is then immediately re-created; so may need to
// dismiss it as long as keeps popping up.
while (closeButton.waitForExists(2)) {
closeButton.click(); closeButton.click();
sleep(1); // diaglog dismissal sleep(1); // diaglog dismissal
return true; dismissed = true;
} else { }
return false; return dismissed;
}
} }
public void hitTestButton() throws Exception { public void hitTestButton() throws Exception {
UiSelector selector = new UiSelector(); UiSelector selector = new UiSelector();
UiObject test = new UiObject(selector.text("Test") UiObject test = new UiObject(selector.text("Test")
@ -215,7 +219,7 @@ public class UiAutomation extends BaseUiAutomation {
public void extractSectionResults() throws Exception { public void extractSectionResults() throws Exception {
UiSelector selector = new UiSelector(); UiSelector selector = new UiSelector();
Set<String> processedMetrics = new HashSet<String>(); Set<String> processedMetrics = new HashSet<String>();
actuallyExtractSectionResults(processedMetrics); actuallyExtractSectionResults(processedMetrics);
UiScrollable resultsList = new UiScrollable(selector.className("android.widget.ScrollView")); UiScrollable resultsList = new UiScrollable(selector.className("android.widget.ScrollView"));
@ -252,13 +256,23 @@ public class UiAutomation extends BaseUiAutomation {
public void returnToTestScreen(String version) throws Exception { public void returnToTestScreen(String version) throws Exception {
getUiDevice().pressBack(); getUiDevice().pressBack();
if (version.equals("5.3.0")) if (version.equals("5.3.0"))
{
UiSelector selector = new UiSelector();
UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")
.text("Details"));
sleep(1);
getUiDevice().pressBack(); getUiDevice().pressBack();
}
} }
public void testAgain() throws Exception { public void testAgain() throws Exception {
UiSelector selector = new UiSelector(); UiSelector selector = new UiSelector();
UiObject retestButton = new UiObject(selector.text("Test Again") UiObject retestButton = new UiObject(selector.text("Test Again")
.className("android.widget.Button")); .className("android.widget.Button"));
if (!retestButton.waitForExists(TimeUnit.SECONDS.toMillis(2))) {
getUiDevice().pressBack();
retestButton.waitForExists(TimeUnit.SECONDS.toMillis(2));
}
retestButton.clickAndWaitForNewWindow(); retestButton.clickAndWaitForNewWindow();
} }