mirror of
https://github.com/ARM-software/workload-automation.git
synced 2025-03-25 20:18:47 +00:00
Merge pull request #355 from jimboatarm/scojac01-appshareupdate
Removed surplus back command that was causing AppShare workload to fail
This commit is contained in:
commit
6ac0c20619
Binary file not shown.
@ -31,8 +31,7 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
|
|
||||||
public void runUiAutomation() throws Exception {
|
public void runUiAutomation() throws Exception {
|
||||||
// Override superclass value
|
// Override superclass value
|
||||||
this.uiAutoTimeout = TimeUnit.SECONDS.toMillis(10);
|
this.uiAutoTimeout = TimeUnit.SECONDS.toMillis(10);
|
||||||
|
|
||||||
parameters = getParams();
|
parameters = getParams();
|
||||||
|
|
||||||
// Setup the three uiautomator classes with the correct information
|
// Setup the three uiautomator classes with the correct information
|
||||||
@ -62,8 +61,7 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
logIntoSkype(loginName, loginPass);
|
logIntoSkype(loginName, loginPass);
|
||||||
// Skype won't allow us to login and share on first visit so invoke
|
// Skype won't allow us to login and share on first visit so invoke
|
||||||
// once more from googlephotos
|
// once more from googlephotos
|
||||||
pressBack();
|
pressBack();
|
||||||
pressBack();
|
|
||||||
sendToSkype(contactName);
|
sendToSkype(contactName);
|
||||||
|
|
||||||
unsetScreenOrientation();
|
unsetScreenOrientation();
|
||||||
@ -90,7 +88,7 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
// to the launching app, so we need to share the photo once more and
|
// to the launching app, so we need to share the photo once more and
|
||||||
// wait for Gmail to sync.
|
// wait for Gmail to sync.
|
||||||
shareUsingApp("Gmail", "gmail_retry");
|
shareUsingApp("Gmail", "gmail_retry");
|
||||||
|
|
||||||
gmail.clearFirstRunDialogues();
|
gmail.clearFirstRunDialogues();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,7 +118,7 @@ public class UiAutomation extends UxPerfUiAutomation {
|
|||||||
private void shareUsingApp(String appName, String tagName) throws Exception {
|
private void shareUsingApp(String appName, String tagName) throws Exception {
|
||||||
String testTag = "share";
|
String testTag = "share";
|
||||||
ActionLogger logger = new ActionLogger(testTag + "_" + tagName, parameters);
|
ActionLogger logger = new ActionLogger(testTag + "_" + tagName, parameters);
|
||||||
|
|
||||||
clickUiObject(BY_DESC, "Share", "android.widget.ImageView");
|
clickUiObject(BY_DESC, "Share", "android.widget.ImageView");
|
||||||
UiScrollable applicationGrid =
|
UiScrollable applicationGrid =
|
||||||
new UiScrollable(new UiSelector().resourceId(googlephotos.packageID + "application_grid"));
|
new UiScrollable(new UiSelector().resourceId(googlephotos.packageID + "application_grid"));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user