1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-07 05:31:21 +00:00

Geekbench: Adding support for Version 5 of Geekbench Corporate

This commit is contained in:
Scott Jackson 2019-09-06 09:18:55 +00:00 committed by Marc Bonnici
parent d3af4e7515
commit 1a15f5c761
3 changed files with 5 additions and 5 deletions

View File

@ -357,8 +357,8 @@ class GeekbenchCorproate(Geekbench): # pylint: disable=too-many-ancestors
name = "geekbench-corporate" name = "geekbench-corporate"
is_corporate = True is_corporate = True
requires_network = False requires_network = False
supported_versions = ['4.1.0', '5.0.0'] supported_versions = ['4.1.0', '4.3.4', '5.0.0']
package_names = ['com.primatelabs.geekbench4.corporate'] package_names = ['com.primatelabs.geekbench4.corporate', 'com.primatelabs.geekbench5.corporate']
activity = 'com.primatelabs.geekbench.HomeActivity' activity = 'com.primatelabs.geekbench.HomeActivity'
parameters = [ parameters = [

View File

@ -139,11 +139,11 @@ public class UiAutomation extends BaseUiAutomation {
uiDeviceSwipe(Direction.DOWN, 50); uiDeviceSwipe(Direction.DOWN, 50);
scrollPage(); scrollPage();
String packageName = isCorporate ? "com.primatelabs.geekbench4.corporate" String packageName = isCorporate ? "com.primatelabs.geekbench.*.corporate"
: "com.primatelabs.geekbench"; : "com.primatelabs.geekbench";
UiObject runButton = UiObject runButton =
mDevice.findObject(new UiSelector().resourceId(packageName + ":id/runCpuBenchmarks") mDevice.findObject(new UiSelector().resourceIdMatches(packageName + ":id/runCpuBenchmarks"));
.className("android.widget.Button"));
if (!runButton.waitForExists(WAIT_TIMEOUT_5SEC)) { if (!runButton.waitForExists(WAIT_TIMEOUT_5SEC)) {
throw new UiObjectNotFoundException("Could not find Run button"); throw new UiObjectNotFoundException("Could not find Run button");
} }