1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2024-10-06 19:01:15 +01:00

Merge pull request #312 from marcbonnici/facebook

Facebook
This commit is contained in:
setrofim 2016-12-14 08:13:54 +00:00 committed by GitHub
commit 47e31765b4
4 changed files with 5 additions and 7 deletions

View File

@ -338,7 +338,7 @@ class ApkWorkload(Workload):
version > LooseVersion(max_apk_version):
msg = "version '{}' not supported. " \
"Minimum version required: '{}', Maximum version known to work: '{}'"
raise ResourceError(msg.format(version, min_apk_version))
raise ResourceError(msg.format(version, min_apk_version, max_apk_version))
elif min_apk_version is not None:
if version < LooseVersion(min_apk_version):
@ -350,7 +350,7 @@ class ApkWorkload(Workload):
if version > LooseVersion(max_apk_version):
msg = "version '{}' not supported. " \
"Maximum version known to work: '{}'"
raise ResourceError(msg.format(version, min_apk_version))
raise ResourceError(msg.format(version, max_apk_version))
def launch_package(self):
if not self.activity:

View File

@ -44,6 +44,7 @@ class Facebook(AndroidUiAutoBenchmark):
"""
package = 'com.facebook.katana'
activity = '.LoginActivity'
max_apk_version = '3.4'
#'du' specify 'disable update'
du_activity = 'com.android.vending/.AssetBrowserActivity'

View File

@ -131,10 +131,8 @@ public class UiAutomation extends BaseUiAutomation {
//Search for the facebook account
UiObject clickBar = new UiObject(new UiSelector()
.className("android.view.View").index(0)
.childSelector(new UiSelector()
.className("android.widget.ImageButton").index(0)
.description("Main navigation menu")));
.description("Main navigation menu"));
clickBar.clickAndWaitForNewWindow(timeout);
UiObject clickSearch = new UiObject(new UiSelector()
@ -189,7 +187,6 @@ public class UiAutomation extends BaseUiAutomation {
.className("android.widget.RelativeLayout").index(3));
friends.click();
sleep(timeout);
getUiDevice().pressBack();
//Update the status
UiObject updateStatus = new UiObject(new UiSelector()
@ -197,7 +194,7 @@ public class UiAutomation extends BaseUiAutomation {
.childSelector(new UiSelector()
.className("android.widget.FrameLayout").index(1)
.childSelector(new UiSelector()
.className("android.widget.RelativeLayout").index(1)
.className("android.widget.RelativeLayout").index(0)
.childSelector(new UiSelector()
.className("android.widget.LinearLayout").index(0)
.childSelector(new UiSelector()