From 091e1054abc3fe5bb074ef8245291bb4775ac073 Mon Sep 17 00:00:00 2001
From: James Hartley <james.hartley@arm.com>
Date: Tue, 3 May 2016 18:14:59 +0100
Subject: [PATCH] Fix Gmail workload to run across more devices

Changes to deal with subtle differences in layouts between tablets and handsets.
Stop pushing files to he Camera directory for test purposes.
---
 wlauto/workloads/gmail/__init__.py            |  12 ++-
 .../gmail/com.arm.wlauto.uiauto.gmail.jar     | Bin 9184 -> 9695 bytes
 .../com/arm/wlauto/uiauto/UiAutomation.java   |  94 ++++++++++++------
 3 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/wlauto/workloads/gmail/__init__.py b/wlauto/workloads/gmail/__init__.py
index 748619b9..78a05abe 100755
--- a/wlauto/workloads/gmail/__init__.py
+++ b/wlauto/workloads/gmail/__init__.py
@@ -16,7 +16,7 @@ class Gmail(AndroidUiAutoBenchmark):
     description = """
     A workload to perform standard productivity tasks within Gmail.
 
-    The workload carries out various tasks, such as creatign new emails and
+    The workload carries out various tasks, such as creating new emails and
     sending them, whilst also producing metrics for action completion times.
     """
 
@@ -45,13 +45,12 @@ class Gmail(AndroidUiAutoBenchmark):
     def setup(self, context):
         super(Gmail, self).setup(context)
 
-        self.camera_dir = self.device.path.join(self.device.external_storage_directory,
-                                                      'DCIM/Camera/')
+        self.storage_dir = self.device.path.join(self.device.working_directory)
 
         for file in os.listdir(self.dependencies_directory):
             if file.endswith(".jpg"):
                 self.device.push_file(os.path.join(self.dependencies_directory, file),
-                                      os.path.join(self.camera_dir, file), timeout=300)
+                                      os.path.join(self.storage_dir, file), timeout=300)
 
         # Force a re-index of the mediaserver cache to pick up new files
         self.device.execute('am broadcast -a android.intent.action.MEDIA_MOUNTED -d file:///sdcard')
@@ -90,3 +89,8 @@ class Gmail(AndroidUiAutoBenchmark):
             if file.startswith (self.name) and file.endswith(".log"):
                 self.device.pull_file(os.path.join(self.device.working_directory, file), context.output_directory)
                 self.device.delete_file(os.path.join(self.device.working_directory, file))
+            if file.startswith (self.name) and file.endswith(".jpg"):
+                self.device.delete_file(os.path.join(self.device.working_directory, file))
+
+        # Force a re-index of the mediaserver cache to pick up new files
+        self.device.execute('am broadcast -a android.intent.action.MEDIA_MOUNTED -d file:///sdcard')
diff --git a/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar b/wlauto/workloads/gmail/com.arm.wlauto.uiauto.gmail.jar
index 783a520536e81baba0c3ee4a12cd986452168590..48aabdb73701ffe66b83220b41de60b08f3524b0 100644
GIT binary patch
delta 9436
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

delta 8921
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

diff --git a/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
index e3455c33..b2ab4dfe 100644
--- a/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/gmail/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
@@ -31,21 +31,15 @@ public class UiAutomation extends UxPerfUiAutomation {
     public void runUiAutomation() throws Exception {
         parameters = getParams();
 
-        Timer result = new Timer();
-        result.start();
-
         clearFirstRunDialogues();
 
         clickNewMail();
+        attachFiles();
         setToField();
         setSubjectField();
         setComposeField();
-        attachFiles();
         clickSendButton();
 
-        result.end();
-        timingResults.put("Total", result);
-
         writeResultsToFile(timingResults, parameters.getString("output_file"));
     }
 
@@ -53,9 +47,9 @@ public class UiAutomation extends UxPerfUiAutomation {
         // Enter search text into the file searchBox.  This will automatically filter the list.
         UiObject gotItBox = getUiObjectByResourceId("com.google.android.gm:id/welcome_tour_got_it",
                                                      "android.widget.TextView");
-        gotItBox.clickAndWaitForNewWindow();
+        clickUiObject(gotItBox, timeout);
         UiObject takeMeToBox = getUiObjectByText("Take me to Gmail", "android.widget.TextView");
-        takeMeToBox.clickAndWaitForNewWindow();
+        clickUiObject(takeMeToBox, timeout);
         UiObject converationView = new UiObject(new UiSelector()
                                             .resourceId("com.google.android.gm:id/conversation_list_view")
                                             .className("android.widget.ListView"));
@@ -68,7 +62,7 @@ public class UiAutomation extends UxPerfUiAutomation {
         Timer result = new Timer();
         UiObject newMailButton = getUiObjectByDescription("Compose", "android.widget.ImageButton");
         result.start();
-        newMailButton.clickAndWaitForNewWindow(timeout);
+        clickUiObject(newMailButton, timeout);
         result.end();
         timingResults.put("newMail", result);
     }
@@ -108,7 +102,7 @@ public class UiAutomation extends UxPerfUiAutomation {
         Timer result = new Timer();
         UiObject sendButton = getUiObjectByDescription("Send", "android.widget.TextView");
         result.start();
-        sendButton.clickAndWaitForNewWindow(timeout);
+        clickUiObject(sendButton, timeout);
         result.end();
         timingResults.put("Send", result);
     }
@@ -120,28 +114,66 @@ public class UiAutomation extends UxPerfUiAutomation {
 
         String [] imageFiles = {"1.jpg", "2.jpg", "3.jpg", "4.jpg", "5.jpg"};
 
-        result.start();
-
         for ( int i=0; i < imageFiles.length; i++) {
-            attachIcon.clickAndWaitForNewWindow(timeout);
-            UiObject attachFile = getUiObjectByText("Attach file", "android.widget.TextView");
-            attachFile.clickAndWaitForNewWindow(timeout);
-            UiObject imagesEntry = getUiObjectByText("Images", "android.widget.TextView");
-            imagesEntry.clickAndWaitForNewWindow(timeout);
-            UiObject listView = new UiObject(new UiSelector().textContains("List view")
-                                                             .className("android.webkit.WebView"));
-            if (listView.exists()) {
-                listView.clickAndWaitForNewWindow(timeout);
-            }
-            UiObject cameraEntry = getUiObjectByText("Camera", "android.widget.TextView");
-            cameraEntry.clickAndWaitForNewWindow(timeout);
-            UiObject oneJpg = getUiObjectByText(imageFiles[i], "android.widget.TextView");
-            oneJpg.clickAndWaitForNewWindow(timeout);
-        }
-        result.end();
-        timingResults.put("AttachFiles", result);
-    }
+            result.start();
 
+            clickUiObject(attachIcon, timeout);
+            UiObject attachFile = getUiObjectByText("Attach file", "android.widget.TextView");
+            clickUiObject(attachFile, timeout);
+
+            UiObject titleIsWaWorking = new UiObject(new UiSelector()
+                                                .className("android.widget.TextView")
+                                                .textContains("wa-working"));
+            UiObject titleIsImages = new UiObject(new UiSelector()
+                                                .className("android.widget.TextView")
+                                                .textContains("Images"));
+            UiObject frameLayout = new UiObject(new UiSelector()
+                                                .className("android.widget.FrameLayout")
+                                                .resourceId("android:id/action_bar_container"));
+            UiObject rootMenu = new UiObject(new UiSelector()
+                                                .className("android.widget.ImageButton")
+                                                .descriptionContains("Show roots"));
+            UiObject imagesEntry = new UiObject(new UiSelector()
+                                                .className("android.widget.TextView")
+                                                .textContains("Images"));
+            UiObject waFolder =  new UiObject(new UiSelector()
+                                                .className("android.widget.TextView")
+                                                .textContains("wa-working"));
+
+            // Some devices use a FrameLayout as oppoised to a view Group so treat them differently
+            if (frameLayout.exists()) {
+                imagesEntry.click();
+                waitObject(titleIsImages, 4);
+                waFolder.click();
+                waitObject(titleIsWaWorking, 4);
+            } else {
+                // Portrait devices will roll the menu up so click the root menu icon
+                if (!titleIsWaWorking.exists()) {
+                    if (rootMenu.exists()) {
+                       rootMenu.click();
+                    }
+                    imagesEntry.click();
+                    waitObject(titleIsImages, 4);
+                    waFolder.click();
+                    waitObject(titleIsWaWorking, 4);
+                }
+            }
+
+            UiObject imageFileButton = new UiObject(new UiSelector()
+                                                .resourceId("com.android.documentsui:id/grid")
+                                                .className("android.widget.GridView")
+                                                .childSelector(new UiSelector()
+                                                .index(i).className("android.widget.FrameLayout")));
+
+            clickUiObject(imageFileButton, timeout);
+
+            result.end();
+
+            // Replace whitespace and full stops within the filename
+            String file = imageFiles[i].replaceAll("\\.", "_").replaceAll("\\s+", "_");
+            timingResults.put(String.format("AttachFiles" + "_" + file), result);
+        }
+    }
 
     private void writeResultsToFile(LinkedHashMap timingResults, String file) throws Exception {
         // Write out the key/value pairs to the instrumentation log file