1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-30 14:44:09 +00:00

Updated workload versions to match APK files

Some workloads presented a different version than what was in the APK file.
With the changes introduced in bb33123 several workloads broke.
This commit is contained in:
Sebastian Goscik
2016-08-24 14:33:18 +01:00
parent 07d34e5615
commit b426e00f2f
9 changed files with 31 additions and 29 deletions

View File

@@ -47,7 +47,7 @@ class Antutu(AndroidUiAutoBenchmark):
activity = ".ABenchMarkStart"
summary_metrics = ['score', 'Overall_Score']
valid_versions = ['3.3.2', '4.0.3', '5.3.0', '6.0.1']
valid_versions = ['3.3.2', '4.0.3', '5.3', '6.0.1']
device_prefs_directory = '/data/data/com.antutu.ABenchMark/shared_prefs'
device_prefs_file = '/'.join([device_prefs_directory, 'com.antutu.ABenchMark_preferences.xml'])

View File

@@ -66,7 +66,7 @@ public class UiAutomation extends BaseUiAutomation {
while (true) {
if(version.equals("6.0.1"))
hitTestButtonVersion5(TestButton6);
else if (version.equals("5.3.0")) {
else if (version.equals("5.3")) {
hitTestButton();
hitTestButtonVersion5(TestButton5);
}
@@ -308,7 +308,7 @@ public class UiAutomation extends BaseUiAutomation {
public void returnToTestScreen(String version) throws Exception {
getUiDevice().pressBack();
if (version.equals("5.3.0"))
if (version.equals("5.3"))
{
UiSelector selector = new UiSelector();
UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")