1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-14 14:48:53 +00:00

Merge pull request #13 from jimboatarm/fudge

Fixes for Gmail, Reader and Photos on a particular devicex
This commit is contained in:
McGeagh 2016-05-10 16:23:35 +01:00
commit 493a2de536
4 changed files with 12 additions and 11 deletions

View File

@ -62,7 +62,7 @@ public class UiAutomation extends UxPerfUiAutomation {
result.start();
clickUiObject(newMailButton, timeout);
result.end();
timingResults.put("newMail", result);
timingResults.put("Create_newMail", result);
}
public void setToField() throws Exception {
@ -73,7 +73,7 @@ public class UiAutomation extends UxPerfUiAutomation {
toField.setText(recipient);
getUiDevice().pressEnter();
result.end();
timingResults.put("To", result);
timingResults.put("Create_To", result);
}
public void setSubjectField() throws Exception {
@ -85,7 +85,7 @@ public class UiAutomation extends UxPerfUiAutomation {
subjectField.setText("This is a test message");
getUiDevice().pressEnter();
result.end();
timingResults.put("Subject", result);
timingResults.put("Create_Subject", result);
}
public void setComposeField() throws Exception {
@ -95,7 +95,7 @@ public class UiAutomation extends UxPerfUiAutomation {
composeField.setText("This is a test composition");
getUiDevice().pressEnter();
result.end();
timingResults.put("Compose", result);
timingResults.put("Create_Compose", result);
}
public void clickSendButton() throws Exception {
@ -104,11 +104,9 @@ public class UiAutomation extends UxPerfUiAutomation {
result.start();
clickUiObject(sendButton, timeout);
result.end();
timingResults.put("Send", result);
timingResults.put("Create_Send", result);
UiObject drawerButton = new UiObject(new UiSelector().descriptionContains("avigat")
.className("android.widget.ImageButton"));
waitObject(drawerButton, networkTimeoutSecs);
sendButton.waitUntilGone(networkTimeoutSecs);
}
public void attachFiles() throws Exception {
@ -168,8 +166,8 @@ public class UiAutomation extends UxPerfUiAutomation {
.className("android.widget.GridView")
.childSelector(new UiSelector()
.index(i).className("android.widget.FrameLayout")));
clickUiObject(imageFileButton, timeout);
imageFileButton.click();
imageFileButton.waitUntilGone(timeout);
result.end();

View File

@ -28,6 +28,7 @@ public class UiAutomation extends UxPerfUiAutomation {
public void runUiAutomation() throws Exception {
parameters = getParams();
confirmAccess();
dismissWelcomeView();
gesturesTest();
editPhotoColorTest();
@ -390,7 +391,9 @@ public class UiAutomation extends UxPerfUiAutomation {
save.click();
UiObject navigateUpButton =
getUiObjectByDescription("Navigate Up", "android.widget.ImageButton");
new UiObject(new UiSelector().descriptionContains("Navigate Up")
.className("android.widget.ImageButton"));
navigateUpButton.waitForExists(viewTimeout);
navigateUpButton.click();
}
}