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.

wlauto/workloads/antutu/__init__.py

@@ -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'])

wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java

@@ -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")

wlauto/workloads/geekbench/__init__.py

@@ -59,11 +59,11 @@ class Geekbench(AndroidUiAutoBenchmark):
     """
     summary_metrics = ['score', 'multicore_score']
     versions = {
-        '3': {
+        '3.0.0': {
             'package': 'com.primatelabs.geekbench3',
             'activity': '.HomeActivity',
         },
-        '2': {
+        '2.2.7': {
             'package': 'ca.primatelabs.geekbench2',
             'activity': '.HomeActivity',
         },
@@ -95,7 +95,7 @@ class Geekbench(AndroidUiAutoBenchmark):
         self.run_timeout = 5 * 60 * self.times
 
     def initialize(self, context):
-        if self.version == '3' and not self.device.is_rooted:
+        if self.version == '3.0.0' and not self.device.is_rooted:
             raise WorkloadError('Geekbench workload only works on rooted devices.')
 
     def init_resources(self, context):
@@ -108,12 +108,14 @@ class Geekbench(AndroidUiAutoBenchmark):
 
     def update_result(self, context):
         super(Geekbench, self).update_result(context)
-        update_method = getattr(self, 'update_result_{}'.format(self.version))
+        if self.version == "2.2.7":
-        update_method(context)
+            self.update_result_2(context)
+        else:
+            self.update_result_3(context)
 
     def validate(self):
-        if (self.times > 1) and (self.version == '2'):
+        if (self.times > 1) and (self.version == '2.2.7'):
-            raise ConfigError('times parameter is not supported for version 2 of Geekbench.')
+            raise ConfigError('times parameter is not supported for version 2.2.7 of Geekbench.')
 
     def update_result_2(self, context):
         score_calculator = GBScoreCalculator()

wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java

@@ -38,20 +38,20 @@ public class UiAutomation extends BaseUiAutomation {
 
     public void runUiAutomation() throws Exception {
         Bundle params = getParams();
-        int version = Integer.parseInt(params.getString("version"));
+        String version = params.getString("version");
         int times = Integer.parseInt(params.getString("times"));
 
         for (int i = 0; i < times; i++) {
                 runBenchmarks();
-                switch(version) {
+                if(version.equals("2.2.7")) {
-                case 2: 
                         // In version 2, we scroll through the results WebView to make sure
                         // all results appear on the screen, which causes them to be dumped into
                         // logcat by the Linaro hacks.
                         waitForResultsv2();
                         scrollThroughResults();
                         break;
-                case 3: 
+                }
+                else if(version.equals("3.0.0")) {
                         // Attempting to share the results will generate the .gb3 file with
                         // results that can then be pulled from the device. This is not possible
                         // in verison 2 of Geekbench (Share option was added later).

wlauto/workloads/glbenchmark/__init__.py

@@ -57,14 +57,14 @@ class Glb(AndroidUiAutoBenchmark):
     view = 'com.glbenchmark.glbenchmark27/com.glbenchmark.activities.GLBRender'
 
     packages = {
-        '2.7.0': 'com.glbenchmark.glbenchmark27',
+        '2.7': 'com.glbenchmark.glbenchmark27',
-        '2.5.1': 'com.glbenchmark.glbenchmark25',
+        '2.5': 'com.glbenchmark.glbenchmark25',
     }
     # If usecase is not specified the default usecase is the first supported usecase alias
     # for the specified version.
     supported_usecase_aliases = {
-        '2.7.0': ['t-rex', 'egypt'],
+        '2.7': ['t-rex', 'egypt'],
-        '2.5.1': ['egypt-classic', 'egypt'],
+        '2.5': ['egypt-classic', 'egypt'],
     }
 
     default_iterations = 1
@@ -73,15 +73,15 @@ class Glb(AndroidUiAutoBenchmark):
     regex = re.compile(r'GLBenchmark (metric|FPS): (.*)')
 
     parameters = [
-        Parameter('version', default='2.7.0', allowed_values=['2.7.0', '2.5.1'],
+        Parameter('version', default='2.7', allowed_values=['2.7', '2.5'],
                   description=('Specifies which version of the benchmark to run (different versions '
                                'support different use cases).')),
         Parameter('use_case', default=None,
                   description="""Specifies which usecase to run, as listed in the benchmark menu; e.g.
                                  ``'GLBenchmark 2.5 Egypt HD'``. For convenience, two aliases are provided
                                  for the most common use cases: ``'egypt'`` and ``'t-rex'``. These could
-                                 be use instead of the full use case title. For version ``'2.7.0'`` it defaults
+                                 be use instead of the full use case title. For version ``'2.7'`` it defaults
-                                 to ``'t-rex'``, for version ``'2.5.1'`` it defaults to ``'egypt-classic'``.
+                                 to ``'t-rex'``, for version ``'2.5'`` it defaults to ``'egypt-classic'``.
                   """),
         Parameter('variant', default='onscreen',
                   description="""Specifies which variant of the use case to run, as listed in the benchmarks

wlauto/workloads/glbenchmark/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java

@@ -81,7 +81,7 @@ public class UiAutomation extends BaseUiAutomation {
         UiObject useCaseText = new UiObject(selector.className("android.widget.TextView")
                                                     .text(useCase)
                                            );
-        if (version.equals("2.7.0")){
+        if (version.equals("2.7")){
                 UiObject variantText =  useCaseText.getFromParent(selector.className("android.widget.TextView")
                                                                           .text(variant));
                 int scrolls = 0;
@@ -94,7 +94,7 @@ public class UiAutomation extends BaseUiAutomation {
                 }
                 variantText.click();
         }
-        else if (version.equals("2.5.1")){
+        else if (version.equals("2.5")){
                 int scrolls = 0;
                 while(!useCaseText.exists()) {
                         testList.scrollForward();
@@ -123,7 +123,7 @@ public class UiAutomation extends BaseUiAutomation {
     public void waitForResults(String version, String useCase, int timeout) throws Exception {
         UiSelector selector = new UiSelector();
         UiObject results = null;
-        if (version.equals("2.7.0"))
+        if (version.equals("2.7"))
                 results = new UiObject(selector.text("Results").className("android.widget.TextView"));
         else
                 results =  new UiObject(selector.text(useCase).className("android.widget.TextView"));