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

Merge pull request #33 from jimboatarm/gmail_cleanup

Browse Source 
Remove redundant clickUiObject method
This commit is contained in:
jimboatarm 2016-05-27 10:57:44 +01:00
commit da00367d74
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wlauto/common/android/BaseUiAutomation$1.class
View File

Binary file not shown.

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

Binary file not shown.

6
wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java vendored
View File

@ -143,12 +143,6 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
return object; return object;
} }
public void clickUiObject(UiObject uiobject, long timeout) throws Exception {
if (!uiobject.clickAndWaitForNewWindow(timeout)) {
throw new UiObjectNotFoundException(String.format("Timeout waiting for New Window"));
}
}
public int getDisplayHeight () { public int getDisplayHeight () {
return getUiDevice().getInstance().getDisplayHeight(); return getUiDevice().getInstance().getDisplayHeight();
} }

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

Binary file not shown.

12
wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -58,12 +58,12 @@ public class UiAutomation extends UxPerfUiAutomation {
UiObject gotItBox = new UiObject(new UiSelector().resourceId("com.google.android.gm:id/welcome_tour_got_it") UiObject gotItBox = new UiObject(new UiSelector().resourceId("com.google.android.gm:id/welcome_tour_got_it")
.className("android.widget.TextView")); .className("android.widget.TextView"));
if (gotItBox.exists()) { if (gotItBox.exists()) {
clickUiObject(gotItBox, timeout); gotItBox.clickAndWaitForNewWindow(timeout);
} }
UiObject takeMeToBox = new UiObject(new UiSelector().textContains("Take me to Gmail") UiObject takeMeToBox = new UiObject(new UiSelector().textContains("Take me to Gmail")
.className("android.widget.TextView")); .className("android.widget.TextView"));
if (takeMeToBox.exists()) { if (takeMeToBox.exists()) {
clickUiObject(takeMeToBox, timeout); takeMeToBox.clickAndWaitForNewWindow(timeout);
} }
UiObject syncNowButton = new UiObject(new UiSelector().textContains("Sync now") UiObject syncNowButton = new UiObject(new UiSelector().textContains("Sync now")
@ -89,7 +89,7 @@ public class UiAutomation extends UxPerfUiAutomation {
Timer result = new Timer(); Timer result = new Timer();
UiObject newMailButton = getUiObjectByDescription("Compose", "android.widget.ImageButton"); UiObject newMailButton = getUiObjectByDescription("Compose", "android.widget.ImageButton");
result.start(); result.start();
clickUiObject(newMailButton, timeout); newMailButton.clickAndWaitForNewWindow(timeout);
result.end(); result.end();
timingResults.put("Create_newMail", result); timingResults.put("Create_newMail", result);
} }
@ -136,7 +136,7 @@ public class UiAutomation extends UxPerfUiAutomation {
Timer result = new Timer(); Timer result = new Timer();
UiObject sendButton = getUiObjectByDescription("Send", "android.widget.TextView"); UiObject sendButton = getUiObjectByDescription("Send", "android.widget.TextView");
result.start(); result.start();
clickUiObject(sendButton, timeout); sendButton.clickAndWaitForNewWindow(timeout);
result.end(); result.end();
timingResults.put("Create_Send", result); timingResults.put("Create_Send", result);
@ -153,9 +153,9 @@ public class UiAutomation extends UxPerfUiAutomation {
Timer result = new Timer(); Timer result = new Timer();
result.start(); result.start();
clickUiObject(attachIcon, timeout); attachIcon.click();
UiObject attachFile = getUiObjectByText("Attach file", "android.widget.TextView"); UiObject attachFile = getUiObjectByText("Attach file", "android.widget.TextView");
clickUiObject(attachFile, timeout); attachFile.clickAndWaitForNewWindow(timeout);
UiObject titleIsWaWorking = new UiObject(new UiSelector() UiObject titleIsWaWorking = new UiObject(new UiSelector()
.className("android.widget.TextView") .className("android.widget.TextView")