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

Merge pull request #310 from marcbonnici/peacekeeper

Browse Source 
PeacekeeperWorkload: Updated to work with new APK versions
This commit is contained in:
setrofim 2016-12-12 16:59:38 +00:00 committed by GitHub
commit 1befe63e45
3 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wlauto/workloads/peacekeeper/__init__.py
View File

@ -81,6 +81,10 @@ class Peacekeeper(AndroidUiAutoBenchmark):
if not url: if not url:
raise WorkloadError('The url is empty, error while running peacekeeper benchmark') raise WorkloadError('The url is empty, error while running peacekeeper benchmark')
# urlopen expects url beginning with protocol.
if not url.startswith('http'):
url = 'http://' + url
req = urllib2.Request(url) req = urllib2.Request(url)
response = urllib2.urlopen(req) response = urllib2.urlopen(req)
result_page = response.read() result_page = response.read()

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

Binary file not shown.

49
wlauto/workloads/peacekeeper/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -65,6 +65,10 @@ public class UiAutomation extends BaseUiAutomation {
UiObject addressBar = new UiObject(new UiSelector() UiObject addressBar = new UiObject(new UiSelector()
.className("android.widget.TextView") .className("android.widget.TextView")
.text("Enter Search or Address")); .text("Enter Search or Address"));
if (!addressBar.exists()) {
addressBar = new UiObject(new UiSelector()
.resourceIdMatches(".*/url_bar_title"));
}
addressBar.click(); addressBar.click();
UiObject setUrl = new UiObject(new UiSelector() UiObject setUrl = new UiObject(new UiSelector()
.className("android.widget.EditText")); .className("android.widget.EditText"));
@ -72,6 +76,13 @@ public class UiAutomation extends BaseUiAutomation {
setUrl.setText(peacekeeperUrl); setUrl.setText(peacekeeperUrl);
getUiDevice().pressEnter(); getUiDevice().pressEnter();
// Allow time for UI to update
sleep(1);
if (!setUrl.exists()){
setUrl = addressBar;
}
UiObject currentUrl = new UiObject(new UiSelector() UiObject currentUrl = new UiObject(new UiSelector()
.className("android.widget.TextView").index(1)); .className("android.widget.TextView").index(1));
for (int i = 0; i < TIMEOUT; i++) { for (int i = 0; i < TIMEOUT; i++) {
@ -88,19 +99,43 @@ public class UiAutomation extends BaseUiAutomation {
sleep(10); sleep(10);
} }
} else if (browser.equals("chrome")) { // Code for Chrome browser } else if (browser.equals("chrome")) { // Code for Chrome browser
UiObject adressBar = new UiObject(new UiSelector()
.className("android.widget.EditText")
.description("Search or type url"));
adressBar.clearTextField(); //Check for welcome screen and dismiss if present.
adressBar.setText(peacekeeperUrl); UiObject acceptTerms = new UiObject(new UiSelector()
.className("android.widget.Button")
.textContains("Accept & continue"));
if (acceptTerms.exists()){
acceptTerms.click();
UiObject dismiss = new UiObject(new UiSelector()
.className("android.widget.Button")
.resourceIdMatches(".*/negative_button"));
if (dismiss.exists()){
dismiss.clickAndWaitForNewWindow();
}
}
UiObject addressBar = new UiObject(new UiSelector()
.className("android.widget.EditText")
.descriptionContains("Search or type url"));
addressBar.clickAndWaitForNewWindow();
addressBar.clearTextField();
addressBar.setText(peacekeeperUrl);
getUiDevice().pressEnter(); getUiDevice().pressEnter();
// Allow time for UI to update
sleep(1);
if (!addressBar.exists()){
addressBar = new UiObject(new UiSelector()
.resourceIdMatches(".*/url_bar"));
}
for (int i = 0; i < TIMEOUT; i++) { for (int i = 0; i < TIMEOUT; i++) {
if (!adressBar.getText().contains("run.action")) { if (!addressBar.getText().contains("run.action")) {
// write url address to peacekeeper.txt file // write url address to peacekeeper.txt file
urlAddress = adressBar.getText(); urlAddress = addressBar.getText();
if (!urlAddress.contains("http")) if (!urlAddress.contains("http"))
urlAddress = "http://" + urlAddress; urlAddress = "http://" + urlAddress;
writer.println(urlAddress); writer.println(urlAddress);