moved UiAutomator code to java, and removed not required python code for device interfacing

wlauto/workloads/androbench/__init__.py

@@ -18,49 +18,15 @@ import os
 import re
 import time
 
-from wlauto import AndroidBenchmark
-from uiautomator import Device
+from wlauto import AndroidUiAutoBenchmark
 
-
-class Androbench(AndroidBenchmark):
+class Androbench(AndroidUiAutoBenchmark):
 
     name = 'androbench'
     description = """Androbench measures the storage performance of device"""
     package = 'com.andromeda.androbench2'
     activity = '.main'
-    device=''
-
-    def setup(self, context):
-		global device
-		os.system('adb devices > deviceinfo')
-		devinf = open('deviceinfo','rb')
-		dev = devinf.readlines()[1].split('\t')[0]
-		devinf.close()
-		device=Device(dev)
-		os.system('rm deviceinfo')
-
-
-    def run(self, context):
-		global device,package,activity
-		os.system('adb shell pm clear com.andromeda.androbench2')		
-		os.system('adb shell am start -n com.andromeda.androbench2/.main')
-		while True :
-			if device(text="Measure your storage performance").exists :
-				time.sleep(1)
-				break
-				
-		if device(textStartsWith="Micro").exists :
-			device(textStartsWith="Micro").click()
-		if device(text="Yes").exists :
-			device(textStartsWith="Yes").click()
-		
-		
-		while True :
-			if device(text="Cancel").exists :
-				device(text="Cancel").click()
-				time.sleep(1)
-				break
-			
+    run_timeout = 10 * 60
 
     def update_result(self, context):
         super(Androbench, self).update_result(context)
@@ -68,8 +34,8 @@ class Androbench(AndroidBenchmark):
         fhresults=open("results.raw","rb")
         results=fhresults.readlines()[0].split('|')
         context.result.add_metric('Sequential Read ', results[8], 'MB/s')
-        context.result.add_metric('Sequential Write MB/s ', results[9] , 'MB/s')
-        context.result.add_metric('Random Read MB/s ', results[10], 'MB/s')
-        context.result.add_metric('Random Write MB/s ', results[12], 'MB/s')
+        context.result.add_metric('Sequential Write ', results[9] , 'MB/s')
+        context.result.add_metric('Random Read ', results[10], 'MB/s')
+        context.result.add_metric('Random Write ', results[12], 'MB/s')
         os.system('rm results.raw')
         

wlauto/workloads/androbench/uiauto/build.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+#    Copyright 2013-2015 ARM Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+
+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', 'BaseUiAutomation.class')"`
+mkdir -p $class_dir
+cp $base_class $class_dir
+
+ant build
+
+if [[ -f bin/com.arm.wlauto.uiauto.androbench.jar ]]; then
+    cp bin/com.arm.wlauto.uiauto.androbench.jar ..
+fi

wlauto/workloads/androbench/uiauto/build.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="com.arm.wlauto.uiauto.androbench" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: VERSION_TAG -->
+    <import file="${sdk.dir}/tools/ant/uibuild.xml" />
+
+</project>

wlauto/workloads/androbench/uiauto/project.properties

@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17

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

@@ -0,0 +1,67 @@
+/*    Copyright 2013-2015 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+
+package com.arm.wlauto.uiauto.androbench;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+// Import the uiautomator libraries
+import com.android.uiautomator.core.UiObject;
+import com.android.uiautomator.core.UiObjectNotFoundException;
+import com.android.uiautomator.core.UiScrollable;
+import com.android.uiautomator.core.UiSelector;
+import com.android.uiautomator.testrunner.UiAutomatorTestCase;
+
+import com.arm.wlauto.uiauto.BaseUiAutomation;
+
+public class UiAutomation extends BaseUiAutomation {   
+
+    public static String TAG = "androbench";
+
+    public void runUiAutomation() throws Exception {
+        Bundle status = new Bundle();
+        status.putString("product", getUiDevice().getProductName());
+        UiSelector selector = new UiSelector();
+        sleep(3);
+        UiObject btn_microbench = new UiObject(selector	.textContains("Micro")
+                                                   .className("android.widget.Button"));
+        btn_microbench.click();
+        
+		UiObject btn_yes= new UiObject(selector	.textContains("Yes")
+                                                   .className("android.widget.Button"));
+        btn_yes.click();
+
+
+        try{
+            UiObject complete_text = new UiObject(selector .text("Cancel")
+                                                           .className("android.widget.Button"));
+
+            waitObject(complete_text);            
+
+            sleep(2);
+            complete_text.click();
+        } finally{
+            //complete_text.click();
+        }
+
+        sleep(5);
+        takeScreenshot("Androbench");
+        getAutomationSupport().sendStatus(Activity.RESULT_OK, status);
+    }
+
+}