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

Resource: Added support for uiautomator apks

Browse Source 
As uiautomator2 uses apk for instrumented tests this allows for distinguishing
between a normal application apk and a uiauto test apk based on the apks package
name.
This commit is contained in:
Marc Bonnici
2017-06-07 15:17:51 +01:00
parent c0f5d36b9b
commit 238ae18491
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wa/framework/resource.py
View File

@@ -143,19 +143,21 @@ class ApkFile(Resource):
kind = 'apk' kind = 'apk'
def __init__(self, owner, variant=None, version=None): def __init__(self, owner, variant=None, version=None, uiauto=False):
super(ApkFile, self).__init__(owner) super(ApkFile, self).__init__(owner)
self.variant = variant self.variant = variant
self.version = version self.version = version
self.uiauto = uiauto
def match(self, path): def match(self, path):
name_matches = True name_matches = True
version_matches = True version_matches = True
uiauto_matches = uiauto_test_matches(path, self.uiauto)
if self.version is not None: if self.version is not None:
version_matches = apk_version_matches(path, self.version) version_matches = apk_version_matches(path, self.version)
if self.variant is not None: if self.variant is not None:
name_matches = file_name_matches(path, self.variant) name_matches = file_name_matches(path, self.variant)
return name_matches and version_matches return name_matches and version_matches and uiauto_matches
def __str__(self): def __str__(self):
text = '<{}\'s apk'.format(self.owner) text = '<{}\'s apk'.format(self.owner)
@@ -163,6 +165,8 @@ class ApkFile(Resource):
text += ' {}'.format(self.variant) text += ' {}'.format(self.variant)
if self.version: if self.version:
text += ' {}'.format(self.version) text += ' {}'.format(self.version)
if self.uiauto:
text += 'uiautomator test'
text += '>' text += '>'
return text return text
@@ -271,3 +275,6 @@ def file_name_matches(path, pattern):
return True return True
return False return False
def uiauto_test_matches(path, uiauto):
info = ApkInfo(path)
return uiauto == ('com.arm.wa.uiauto' in info.package)