Change workload name to skype

wlauto/workloads/skype/__init__.py

@@ -25,9 +25,9 @@ SKYPE_ACTION_URIS = {
 }
 
 
-class SkypeEcho(AndroidUiAutoBenchmark):
+class Skype(AndroidUiAutoBenchmark):
 
-    name = 'skypeecho'
+    name = 'skype'
     description = '''
     Workload that makes Skype calls
 
@@ -71,12 +71,12 @@ class SkypeEcho(AndroidUiAutoBenchmark):
     ]
 
     def __init__(self, device, **kwargs):
-        super(SkypeEcho, self).__init__(device, **kwargs)
+        super(Skype, self).__init__(device, **kwargs)
         self.output_file = op.join(self.device.working_directory, self.instrumentation_log)
         self.run_timeout = self.duration + 60
 
     def validate(self):
-        super(SkypeEcho, self).validate()
+        super(Skype, self).validate()
         self.uiauto_params['results_file'] = self.output_file
         self.uiauto_params['dumpsys_enabled'] = self.dumpsys_enabled
         self.uiauto_params['output_dir'] = self.device.working_directory
@@ -89,18 +89,18 @@ class SkypeEcho(AndroidUiAutoBenchmark):
 
     def setup(self, context):
         self.logger.info('===== setup() ======')
-        super(SkypeEcho, self).setup(context)
+        super(Skype, self).setup(context)
         self.device.execute('am force-stop {}'.format(self.package))
         self.device.execute('am start -W -a android.intent.action.VIEW -d skype:dummy?dummy')
         time.sleep(1)
 
     def run(self, context):
         self.logger.info('===== run() ======')
-        super(SkypeEcho, self).run(context)
+        super(Skype, self).run(context)
 
     def update_result(self, context):
         self.logger.info('===== update_result() ======')
-        super(SkypeEcho, self).update_result(context)
+        super(Skype, self).update_result(context)
         if not self.dumpsys_enabled:
             return
 
@@ -119,7 +119,7 @@ class SkypeEcho(AndroidUiAutoBenchmark):
 
     def teardown(self, context):
         self.logger.info('===== teardown() ======')
-        super(SkypeEcho, self).teardown(context)
+        super(Skype, self).teardown(context)
         # Pull log files
         wd = self.device.working_directory
         for entry in self.device.listdir(wd):

wlauto/workloads/skype/template-agenda.mustache

@@ -2,7 +2,7 @@ global:
     iterations: 1
 workloads:
     -   id: {{workload_id}}
-        name: skypeecho
+        name: skype
         params:
             login_name: {{login_name}}
             login_pass: {{login_pass}}

wlauto/workloads/skype/uiauto/build.sh

@@ -12,6 +12,6 @@ if [[ $exit_code -ne 0 ]]; then
     echo "ERROR: ant build exited with code $exit_code" && exit $exit_code
 fi
 
-if [[ -f bin/com.arm.wlauto.uiauto.skypeecho.jar ]]; then
+if [[ -f bin/com.arm.wlauto.uiauto.skype.jar ]]; then
-    cp bin/com.arm.wlauto.uiauto.skypeecho.jar ..
+    cp bin/com.arm.wlauto.uiauto.skype.jar ..
 fi

wlauto/workloads/skype/uiauto/build.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="com.arm.wlauto.uiauto.skypeecho" default="help">
+<project name="com.arm.wlauto.uiauto.skype" 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

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

@@ -1,4 +1,4 @@
-package com.arm.wlauto.uiauto.skypeecho;
+package com.arm.wlauto.uiauto.skype;
 
 import java.io.File;
 import java.io.BufferedWriter;
@@ -25,7 +25,7 @@ import com.arm.wlauto.uiauto.UxPerfUiAutomation;
 
 public class UiAutomation extends UxPerfUiAutomation {
 
-    public static final String TAG = "skypeecho";
+    public static final String TAG = "skype";
     public static final String PACKAGE = "com.skype.raider";
     public static final String PACKAGE_ID = "com.skype.raider:id/";
     public static final String TEXT_VIEW = "android.widget.TextView";