sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-10-30 06:34:13 +00:00
Code Issues Releases Wiki Activity

Extended BaseUiAutomation and UxPerfUiAutomation

Browse Source 
Moved common functionality to base classes for code reuse. Refactored
googlephotos, reader and gmail workloads to take advantage of the new
base class methods and removed total test time metric.

New methods for BaseUiAutomation:
uiDeviceVertPinchIn, uiDeviceVertPinchOut

New methods for UxPerfUiAutomation:
uiObjectVertPinchTest, writeResultsToFile, startDumpsysSurfaceFlinger,
startDumpsysSurfaceFlinger, startDumpsysGfxInfo, stopDumpsysGfxInfo

New class for UxPerfUiAutomation:
GestureTestParams
This commit is contained in:
John Richardson
2016-05-04 11:10:07 +01:00
parent c2a68074be
commit 31cf06b62a
9 changed files with 167 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wlauto/workloads/googlephotos/__init__.py
View File

@@ -39,8 +39,6 @@ class Googlephotos(AndroidUiAutoBenchmark):
def __init__(self, device, **kwargs):
super(Googlephotos, self).__init__(device, **kwargs)
self.output_file = os.path.join(self.device.working_directory, self.instrumentation_log)
self.camera_dir = self.device.path.join(self.device.external_storage_directory,
'DCIM/Camera/')
def validate(self):
super(Googlephotos, self).validate()
@@ -56,7 +54,7 @@ class Googlephotos(AndroidUiAutoBenchmark):
wa_file = ''.join([self.file_prefix, entry])
if entry.endswith(".jpg"):
self.device.push_file(os.path.join(self.dependencies_directory, entry),
os.path.join(self.camera_dir, wa_file),
os.path.join(self.device.working_directory, wa_file),
timeout=300)
# Force a re-index of the mediaserver cache to pick up new files
@@ -91,9 +89,8 @@ class Googlephotos(AndroidUiAutoBenchmark):
context.output_directory)
self.device.delete_file(os.path.join(self.device.working_directory, entry))
for entry in self.device.listdir(self.camera_dir):
if entry.startswith(self.file_prefix) and entry.endswith(".jpg"):
self.device.delete_file(os.path.join(self.camera_dir, entry))
self.device.delete_file(os.path.join(self.device.working_directory, entry))
# Force a re-index of the mediaserver cache to removed cached files
self.device.execute('am broadcast -a android.intent.action.MEDIA_MOUNTED -d file:///sdcard')

BIN
wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar
View File

Binary file not shown.

4
wlauto/workloads/googlephotos/uiauto/build.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash
class_dir=bin/classes/com/arm/wlauto/uiauto
base_class=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', '*.class')"`
base_classes=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', '*.class')"`
mkdir -p $class_dir
cp $base_class $class_dir
cp $base_classes $class_dir
ant build

2
wlauto/workloads/googlephotos/uiauto/project.properties
View File

@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-23
target=android-18

139
wlauto/workloads/googlephotos/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@@ -1,8 +1,6 @@
package com.arm.wlauto.uiauto.googlephotos;
import android.os.Bundle;
import android.graphics.Point;
import android.graphics.Rect;
// Import the uiautomator libraries
import com.android.uiautomator.core.UiObject;
@@ -11,9 +9,6 @@ import com.android.uiautomator.core.UiSelector;
import com.arm.wlauto.uiauto.UxPerfUiAutomation;
import java.io.File;
import java.io.FileWriter;
import java.io.BufferedWriter;
import java.util.concurrent.TimeUnit;
import java.util.LinkedHashMap;
import java.util.Iterator;
@@ -25,21 +20,16 @@ public class UiAutomation extends UxPerfUiAutomation {
public static String TAG = "uxperf_googlephotos";
public Bundle parameters;
private long viewTimeout = TimeUnit.SECONDS.toMillis(20);
private long viewTimeout = TimeUnit.SECONDS.toMillis(10);
private LinkedHashMap<String, Timer> timingResults = new LinkedHashMap<String, Timer>();
public void runUiAutomation() throws Exception {
Timer result = new Timer();
result.start();
parameters = getParams();
dismissWelcomeView();
gesturesTest();
editPhotoTest();
result.end();
timingResults.put("total", result);
writeResultsToFile(timingResults, parameters.getString("output_file"));
}
@@ -50,10 +40,10 @@ public class UiAutomation extends UxPerfUiAutomation {
sleep(3); // Pause while splash screen loads
UiObject getStarteddButton =
UiObject getStartedButton =
getUiObjectByResourceId("com.google.android.apps.photos:id/get_started",
"android.widget.Button");
getStarteddButton.clickAndWaitForNewWindow();
getStartedButton.clickAndWaitForNewWindow();
UiObject welcomeButton =
getUiObjectByResourceId("com.google.android.apps.photos:id/name",
@@ -79,7 +69,7 @@ public class UiAutomation extends UxPerfUiAutomation {
nextButton.clickAndWaitForNewWindow();
}
private void gesturesTest () throws Exception {
private void gesturesTest() throws Exception {
String testTag = "gestures";
// Perform a range of swipe tests while browsing photo gallery
@@ -112,10 +102,10 @@ public class UiAutomation extends UxPerfUiAutomation {
if (!view.waitForExists(viewTimeout)) {
throw new UiObjectNotFoundException("Could not find \"photo view\".");
};
}
startDumpsysGfxInfo();
startDumpsysSurfaceFlinger(viewName);
startDumpsysGfxInfo(parameters);
startDumpsysSurfaceFlinger(parameters, viewName);
Timer results = new Timer();
@@ -133,8 +123,8 @@ public class UiAutomation extends UxPerfUiAutomation {
break;
}
stopDumpsysSurfaceFlinger(viewName, surfFlingerlogName);
stopDumpsysGfxInfo(gfxInfologName);
stopDumpsysSurfaceFlinger(parameters, viewName, surfFlingerlogName);
stopDumpsysGfxInfo(parameters, gfxInfologName);
timingResults.put(runName, results);
}
@@ -172,9 +162,9 @@ public class UiAutomation extends UxPerfUiAutomation {
timingResults.put(testTag, result);
}
// Helper to click on an individual photographs based on index in Camera gallery.
private void selectPhoto(int index) throws Exception {
UiObject cameraHeading = new UiObject(new UiSelector().text("Camera"));
// Helper to click on an individual photographs based on index in wa-working gallery.
private void selectPhoto(final int index) throws Exception {
UiObject cameraHeading = new UiObject(new UiSelector().text("wa-working"));
cameraHeading.clickAndWaitForNewWindow();
UiObject photo =
@@ -183,109 +173,4 @@ public class UiAutomation extends UxPerfUiAutomation {
.index(index)));
photo.click();
}
// Helper for testing zoom facility. NOTE: the built in UiObject methods
// pinchIn() and pinchOut() do not zoom appropriately for this application.
private Timer uiObjectVertPinchTest(
UiObject view, PinchType direction,
int steps, int percent) throws Exception {
Timer results = new Timer();
results.start();
final int FINGER_TOUCH_HALF_WIDTH = 20;
// make value between 1 and 100
percent = (percent < 0) ? 1 : (percent > 100) ? 100 : percent;
float percentage = percent / 100f;
Rect rect = view.getVisibleBounds();
if (rect.width() <= FINGER_TOUCH_HALF_WIDTH * 2)
throw new IllegalStateException("Object width is too small for operation");
// start from the same point at the center of the control
Point startPoint1 = new Point(rect.centerX(), rect.centerY() + FINGER_TOUCH_HALF_WIDTH);
Point startPoint2 = new Point(rect.centerX(), rect.centerY() - FINGER_TOUCH_HALF_WIDTH);
// End at the top-center and bottom-center of the control
Point endPoint1 = new Point(rect.centerX(), rect.centerY() + (int) ((rect.height() / 2) * percentage));
Point endPoint2 = new Point(rect.centerX(), rect.centerY() - (int) ((rect.height() / 2) * percentage));
if (direction.equals(PinchType.IN)) {
view.performTwoPointerGesture(endPoint1, endPoint2, startPoint1, startPoint2, steps);
} else if (direction.equals(PinchType.OUT)) {
view.performTwoPointerGesture(startPoint1, startPoint2, endPoint1, endPoint2, steps);
}
results.end();
return results;
}
private class GestureTestParams {
GestureType gestureType;
Direction gestureDirection;
PinchType pinchType;
private int percent;
private int steps;
GestureTestParams(GestureType gesture, Direction direction, int steps) {
this.gestureType = gesture;
this.gestureDirection = direction;
this.pinchType = PinchType.NULL;
this.steps = steps;
this.percent = 0;
}
GestureTestParams(GestureType gesture, PinchType pinchType, int steps, int percent) {
this.gestureType = gesture;
this.gestureDirection = Direction.NULL;
this.pinchType = pinchType;
this.steps = steps;
this.percent = percent;
}
}
private void writeResultsToFile(LinkedHashMap timingResults, String file) throws Exception {
// Write out the key/value pairs to the instrumentation log file
FileWriter fstream = new FileWriter(file);
BufferedWriter out = new BufferedWriter(fstream);
Iterator<Entry<String, Timer>> it = timingResults.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, Timer> pairs = it.next();
Timer results = pairs.getValue();
long start = results.getStart();
long finish = results.getFinish();
long duration = results.getDuration();
out.write(String.format(pairs .getKey() + " " + start + " " + finish + " " + duration + "\n"));
}
out.close();
}
private void startDumpsysSurfaceFlinger(String view) {
if (Boolean.parseBoolean(parameters.getString("dumpsys_enabled"))) {
initDumpsysSurfaceFlinger(parameters.getString("package"), view);
}
}
private void stopDumpsysSurfaceFlinger(String view, String filename) throws Exception {
if (Boolean.parseBoolean(parameters.getString("dumpsys_enabled"))) {
File out_file = new File(parameters.getString("output_dir"), filename);
exitDumpsysSurfaceFlinger(parameters.getString("package"), view, out_file);
}
}
private void startDumpsysGfxInfo() {
if (Boolean.parseBoolean(parameters.getString("dumpsys_enabled"))) {
initDumpsysGfxInfo(parameters.getString("package"));
}
}
private void stopDumpsysGfxInfo(String filename) throws Exception {
if (Boolean.parseBoolean(parameters.getString("dumpsys_enabled"))) {
File out_file = new File(parameters.getString("output_dir"), filename);
exitDumpsysGfxInfo(parameters.getString("package"), out_file);
}
}
}