From 09563bc01e51149482f42c1316b0876cb4e425c9 Mon Sep 17 00:00:00 2001
From: Sebastian Goscik <sebastian.goscik@live.co.uk>
Date: Fri, 8 Jan 2016 16:14:43 +0000
Subject: [PATCH] antutu: Updated to support Antutu v6

---
 wlauto/workloads/antutu/__init__.py           |  23 +++--
 .../antutu/com.arm.wlauto.uiauto.antutu.jar   | Bin 5644 -> 6139 bytes
 .../com/arm/wlauto/uiauto/UiAutomation.java   |  97 ++++++++++++++----
 3 files changed, 91 insertions(+), 29 deletions(-)

diff --git a/wlauto/workloads/antutu/__init__.py b/wlauto/workloads/antutu/__init__.py
index 580e9daa..5d046044 100644
--- a/wlauto/workloads/antutu/__init__.py
+++ b/wlauto/workloads/antutu/__init__.py
@@ -16,7 +16,8 @@
 import os
 from collections import defaultdict, OrderedDict
 
-from wlauto import AndroidUiAutoBenchmark, Parameter
+from wlauto import AndroidUiAutoBenchmark, Parameter, File
+from wlauto.utils.android import ApkInfo
 
 
 class Antutu(AndroidUiAutoBenchmark):
@@ -46,7 +47,7 @@ class Antutu(AndroidUiAutoBenchmark):
     activity = ".ABenchMarkStart"
     summary_metrics = ['score', 'Overall_Score']
 
-    valid_versions = ['3.3.2', '4.0.3', '5.3.0']
+    valid_versions = ['3.3.2', '4.0.3', '5.3.0', '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'])
@@ -68,18 +69,26 @@ class Antutu(AndroidUiAutoBenchmark):
 
     def __init__(self, device, **kwargs):  # pylint: disable=W0613
         super(Antutu, self).__init__(device, **kwargs)
-        self.run_timeout = 6 * 60 * self.times
+        self.run_timeout = 10 * 60 * self.times
         self.uiauto_params['version'] = self.version
         self.uiauto_params['times'] = self.times
         self.uiauto_params['enable_sd_tests'] = self.enable_sd_tests
 
+    def setup(self, context):
+        if self.version == "6.0.1":
+            antutu_3d = context.resolver.get(File(self, "com.antutu.benchmark.full-1.apk"))
+            info = ApkInfo(antutu_3d)
+            if not context.device.is_installed(info.package):
+                self.device.install_apk(antutu_3d, timeout=120)
+        super(Antutu, self).setup(context)
+
     def update_result(self, context):
         super(Antutu, self).update_result(context)
         with open(self.logcat_log) as fh:
-            if self.version == '4.0.3':
-                metrics = extract_version4_metrics(fh)
+            if self.version == '3.3.2':
+                metrics = extract_older_version_metrics(fh)
             else:
-                metrics = extract_older_version_metrics(fh)  # pylint: disable=redefined-variable-type
+                metrics = extract_metrics(fh)  # pylint: disable=redefined-variable-type
         for key, value in metrics.iteritems():
             key = key.replace(' ', '_')
             context.result.add_metric(key, value)
@@ -87,7 +96,7 @@ class Antutu(AndroidUiAutoBenchmark):
 
 # Utility functions
 
-def extract_version4_metrics(fh):
+def extract_metrics(fh):
     metrics = OrderedDict()
     metric_counts = defaultdict(int)
     for line in fh:
diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar
index 122b57f0261863219b2568da318672a6bae43166..4aecde1da3e8bc38c92f2c4d5cd50675ae34b59e 100644
GIT binary patch
delta 5969
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

delta 5480
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
X@c&88|G9h%X-it5q{oyd|IhMYx3HXN

diff --git a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index 2d98e5f4..4d7a08d1 100644
--- a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -34,36 +34,60 @@ import com.android.uiautomator.testrunner.UiAutomatorTestCase;
 
 import com.arm.wlauto.uiauto.BaseUiAutomation;
 
-public class UiAutomation extends BaseUiAutomation {   
+public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "antutu";
-
+    public static String TestButton5 = "com.antutu.ABenchMark:id/start_test_region";
+    public static String TestButton6 = "com.antutu.ABenchMark:id/start_test_text";
     private static int initialTimeoutSeconds = 20;
 
     public void runUiAutomation() throws Exception{
         Bundle parameters = getParams();
 
         String version = parameters.getString("version");
-        boolean enableSdTests = Boolean.parseBoolean(parameters.getString("enable_sd_tests")); 
+        boolean enableSdTests = Boolean.parseBoolean(parameters.getString("enable_sd_tests"));
 
         int times = Integer.parseInt(parameters.getString("times"));
         if (times < 1) {
                 times = 1;
         }
 
-        if (version.equals("4.0.3") || version.equals("5.3.0")){
+        if (version.equals("3.3.2")) { // version earlier than 4.0.3
+            dismissReleaseNotesDialogIfNecessary();
+            if(!enableSdTests){
+               disableSdCardTests();
+            }
+            hitStart();
+            waitForAndViewResults();
+        }
+        else {
             int iteration = 0;
             dismissNewVersionNotificationIfNecessary();
-            hitTestButton();
             while (true) {
-                    if (version.equals("5.3.0"))
-                        hitTestButtonVersion5();
+                    if(version.equals("6.0.1"))
+                        hitTestButtonVersion5(TestButton6);
+                    else if (version.equals("5.3.0")) {
+                        hitTestButton();
+                        hitTestButtonVersion5(TestButton5);
+                    }
+                    else if (version.equals("4.0.3")) {
+                        hitTestButton();
+                        hitTestButton();
+                    }
                     else
                         hitTestButton();
 
-                    waitForVersion4Results();
-                    viewDetails();
-                    extractResults();
+                    if(version.equals("6.0.1"))
+                    {
+                        waitForVersion6Results();
+                        extractResults6();
+                    }
+                    else
+                    {
+                        waitForVersion4Results();
+                        viewDetails();
+                        extractResults();
+                    }
 
                     iteration++;
                     if (iteration >= times) {
@@ -74,13 +98,6 @@ public class UiAutomation extends BaseUiAutomation {
                     dismissRateDialogIfNecessary();
                     testAgain();
             }
-        } else { // version earlier than 4.0.3
-            dismissReleaseNotesDialogIfNecessary();
-            if(!enableSdTests){
-               disableSdCardTests();
-            }
-            hitStart();
-            waitForAndViewResults();
         }
 
         Bundle status = new Bundle();
@@ -98,7 +115,7 @@ public class UiAutomation extends BaseUiAutomation {
             return false;
         }
     }
-    
+
     public boolean dismissReleaseNotesDialogIfNecessary() throws Exception {
         UiSelector selector = new UiSelector();
         UiObject closeButton = new UiObject(selector.text("Close"));
@@ -118,11 +135,11 @@ public class UiAutomation extends BaseUiAutomation {
         // Sometimes, dismissing the dialog the first time does not work properly --
         // it starts to disappear but is then immediately re-created; so may need to
         // dismiss it as long as keeps popping up.
-        while (closeButton.waitForExists(2)) { 
+        while (closeButton.waitForExists(2)) {
             closeButton.click();
             sleep(1); // diaglog dismissal
             dismissed = true;
-        } 
+        }
         return dismissed;
     }
 
@@ -137,15 +154,16 @@ public class UiAutomation extends BaseUiAutomation {
 
    /* In version 5 of antutu, the test has been changed from a button widget to a textview */
 
-   public void hitTestButtonVersion5() throws Exception {
+   public void hitTestButtonVersion5(String id) throws Exception {
         UiSelector selector = new UiSelector();
-        UiObject test = new UiObject(selector.resourceId("com.antutu.ABenchMark:id/start_test_region")
+        UiObject test = new UiObject(selector.resourceId(id)
                                              .className("android.widget.TextView"));
         test.waitForExists(initialTimeoutSeconds);
         test.click();
         sleep(1); // possible tab transtion
     }
 
+
     public void hitTest() throws Exception {
         UiSelector selector = new UiSelector();
         UiObject test = new UiObject(selector.text("Test"));
@@ -193,6 +211,17 @@ public class UiAutomation extends BaseUiAutomation {
         }
     }
 
+    public void waitForVersion6Results() throws Exception {
+        UiObject qrText = new UiObject(new UiSelector().className("android.widget.TextView")
+                                                       .text("QRCode of result"));
+        for (int i = 0; i < 120; i++) {
+            if (qrText.exists()) {
+                break;
+            }
+            sleep(5);
+        }
+    }
+
     public void viewDetails() throws Exception {
         UiSelector selector = new UiSelector();
         UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")
@@ -200,6 +229,30 @@ public class UiAutomation extends BaseUiAutomation {
         detailsButton.clickAndWaitForNewWindow();
     }
 
+    public void extractResults6() throws Exception {
+        //Overal result
+        UiObject result = new UiObject(new UiSelector().resourceId("com.antutu.ABenchMark:id/tv_score_name"));
+        if (result.exists()) {
+            Log.v(TAG, String.format("ANTUTU RESULT: Overall Score: %s", result.getText()));
+        }
+
+        // individual scores
+        extractSectionResults6("3d");
+        extractSectionResults6("ux");
+        extractSectionResults6("cpu");
+        extractSectionResults6("ram");
+    }
+
+    public void extractSectionResults6(String section) throws Exception {
+        UiSelector selector = new UiSelector();
+        UiObject resultLayout = new UiObject(selector.resourceId("com.antutu.ABenchMark:id/hcf_" + section));
+        UiObject result = resultLayout.getChild(selector.resourceId("com.antutu.ABenchMark:id/tv_score_value"));
+
+        if (result.exists()) {
+            Log.v(TAG, String.format("ANTUTU RESULT: %s Score: %s", section, result.getText()));
+        }
+    }
+
     public void extractResults() throws Exception {
         extractOverallResult();
         extractSectionResults();