diff --git a/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.jar b/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.jar
deleted file mode 100644
index e5c47804..00000000
Binary files a/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.jar and /dev/null differ
diff --git a/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.uiautoapk b/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.uiautoapk
new file mode 100644
index 00000000..0715469e
Binary files /dev/null and b/wlauto/workloads/vellamo/com.arm.wlauto.uiauto.vellamo.uiautoapk differ
diff --git a/wlauto/workloads/vellamo/uiauto/app/build.gradle b/wlauto/workloads/vellamo/uiauto/app/build.gradle
new file mode 100644
index 00000000..d849bc8e
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/app/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.application'
+
+def packageName = "com.arm.wlauto.uiauto.vellamo"
+
+android {
+ compileSdkVersion 25
+ buildToolsVersion "25.0.3"
+ defaultConfig {
+ applicationId "${packageName}"
+ minSdkVersion 18
+ targetSdkVersion 25
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ applicationVariants.all { variant ->
+ variant.outputs.each { output ->
+ output.outputFile = file("$project.buildDir/apk/${packageName}.apk")
+ }
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support.test:runner:0.5'
+ compile 'com.android.support.test:rules:0.5'
+ compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ compile(name: 'uiauto', ext:'aar')
+}
+
+repositories {
+ flatDir {
+ dirs 'libs'
+ }
+}
diff --git a/wlauto/workloads/vellamo/uiauto/app/src/main/AndroidManifest.xml b/wlauto/workloads/vellamo/uiauto/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..109b1951
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/app/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.arm.wlauto.uiauto.vellamo"
+ android:versionCode="1"
+ android:versionName="1.0">
+
+
+ <instrumentation
+ android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:targetPackage="${applicationId}"/>
+
+</manifest>
+
diff --git a/wlauto/workloads/vellamo/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/vellamo/uiauto/app/src/main/java/com/arm/wlauto/uiauto/vellamo/UiAutomation.java
similarity index 75%
rename from wlauto/workloads/vellamo/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
rename to wlauto/workloads/vellamo/uiauto/app/src/main/java/com/arm/wlauto/uiauto/vellamo/UiAutomation.java
index cdc11b6d..8a957c29 100644
--- a/wlauto/workloads/vellamo/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/vellamo/uiauto/app/src/main/java/com/arm/wlauto/uiauto/vellamo/UiAutomation.java
@@ -1,3 +1,4 @@
+
/* Copyright 2014-2015 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,31 +17,34 @@
package com.arm.wlauto.uiauto.vellamo;
-import android.app.Activity;
import android.os.Bundle;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.UiWatcher;
import android.util.Log;
-import android.view.KeyEvent;
-import java.util.concurrent.TimeUnit;
-import java.util.ArrayList;
-
-// 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.core.UiDevice;
-import com.android.uiautomator.core.UiWatcher;
-import com.android.uiautomator.testrunner.UiAutomatorTestCase;
import com.arm.wlauto.uiauto.BaseUiAutomation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
+// Import the uiautomator libraries
+
+@RunWith(AndroidJUnit4.class)
public class UiAutomation extends BaseUiAutomation {
public static String TAG = "vellamo";
public static ArrayList<String> scores = new ArrayList();
public static Boolean wasError = false;
- public void runUiAutomation() throws Exception {
+@Test
+public void runUiAutomation() throws Exception {
+ initialize_instrumentation();
Bundle parameters = getParams();
String version = parameters.getString("version");
Boolean browser = parameters.getBoolean("browser");
@@ -86,10 +90,10 @@ public class UiAutomation extends BaseUiAutomation {
public void startTest() throws Exception {
UiSelector selector = new UiSelector();
- UiObject runButton = new UiObject(selector.textContains("Run All Chapters"));
+ UiObject runButton = mDevice.findObject(selector.textContains("Run All Chapters"));
if (!runButton.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
- UiObject pager = new UiObject(selector.className("android.support.v4.view.ViewPager"));
+ UiObject pager = mDevice.findObject(selector.className("android.support.v4.view.ViewPager"));
pager.swipeLeft(2);
if (!runButton.exists()) {
throw new UiObjectNotFoundException("Could not find \"Run All Chapters\" button.");
@@ -101,9 +105,9 @@ public class UiAutomation extends BaseUiAutomation {
public void startBrowserTest(int browserToUse, String version) throws Exception {
//Ensure chrome is selected as "browser" fails to run the benchmark
UiSelector selector = new UiSelector();
- UiObject browserToUseButton = new UiObject(selector.className("android.widget.ImageButton")
+ UiObject browserToUseButton = mDevice.findObject(selector.className("android.widget.ImageButton")
.longClickable(true).instance(browserToUse));
- UiObject browserButton = new UiObject(selector.className("android.widget.ImageButton")
+ UiObject browserButton = mDevice.findObject(selector.className("android.widget.ImageButton")
.longClickable(true).selected(true));
//Disable browsers
while(browserButton.exists()) browserButton.click();
@@ -117,10 +121,10 @@ public class UiAutomation extends BaseUiAutomation {
UiWatcher stoppedWorkingDialogWatcher = new UiWatcher() {
@Override
public boolean checkForCondition() {
- UiObject stoppedWorkingDialog = new UiObject(new UiSelector().textStartsWith("Unfortunately"));
+ UiObject stoppedWorkingDialog = mDevice.findObject(new UiSelector().textStartsWith("Unfortunately"));
if(stoppedWorkingDialog.exists()){
wasError = true;
- UiObject okButton = new UiObject(new UiSelector().className("android.widget.Button").text("OK"));
+ UiObject okButton = mDevice.findObject(new UiSelector().className("android.widget.Button").text("OK"));
try {
okButton.click();
} catch (UiObjectNotFoundException e) {
@@ -133,10 +137,10 @@ public class UiAutomation extends BaseUiAutomation {
}
};
// Register watcher
- UiDevice.getInstance().registerWatcher("stoppedWorkingDialogWatcher", stoppedWorkingDialogWatcher);
+ mDevice.registerWatcher("stoppedWorkingDialogWatcher", stoppedWorkingDialogWatcher);
// Run watcher
- UiDevice.getInstance().runWatchers();
+ mDevice.runWatchers();
startTestV3(0, version);
}
@@ -144,7 +148,7 @@ public class UiAutomation extends BaseUiAutomation {
public void startTestV3(int run, String version) throws Exception {
UiSelector selector = new UiSelector();
- UiObject thirdRunButton = new UiObject(selector.resourceId("com.quicinc.vellamo:id/card_launcher_run_button").instance(2));
+ UiObject thirdRunButton = mDevice.findObject(selector.resourceId("com.quicinc.vellamo:id/card_launcher_run_button").instance(2));
if (!thirdRunButton.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!thirdRunButton.exists()) {
throw new UiObjectNotFoundException("Could not find three \"Run\" buttons.");
@@ -152,7 +156,7 @@ public class UiAutomation extends BaseUiAutomation {
}
//Run benchmarks
- UiObject runButton = new UiObject(selector.resourceId("com.quicinc.vellamo:id/card_launcher_run_button").instance(run));
+ UiObject runButton = mDevice.findObject(selector.resourceId("com.quicinc.vellamo:id/card_launcher_run_button").instance(run));
if (!runButton.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!runButton.exists()) {
throw new UiObjectNotFoundException("Could not find correct \"Run\" button.");
@@ -162,7 +166,7 @@ public class UiAutomation extends BaseUiAutomation {
//Skip tutorial screen
if (version.equals("3.2.4")) {
- UiObject gotItButton = new UiObject(selector.textContains("Got it"));
+ UiObject gotItButton = mDevice.findObject(selector.textContains("Got it"));
if (!gotItButton.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!gotItButton.exists()) {
throw new UiObjectNotFoundException("Could not find correct \"GOT IT\" button.");
@@ -172,7 +176,7 @@ public class UiAutomation extends BaseUiAutomation {
}
else {
- UiObject swipeScreen = new UiObject(selector.textContains("Swipe left to continue"));
+ UiObject swipeScreen = mDevice.findObject(selector.textContains("Swipe left to continue"));
if (!swipeScreen.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!swipeScreen.exists()) {
throw new UiObjectNotFoundException("Could not find \"Swipe screen\".");
@@ -190,17 +194,17 @@ public class UiAutomation extends BaseUiAutomation {
waitForTestCompletion(15 * 60, "com.quicinc.vellamo:id/button_no");
//Remove watcher
- UiDevice.getInstance().removeWatcher("stoppedWorkingDialogWatcher");
+ mDevice.removeWatcher("stoppedWorkingDialogWatcher");
getScore(metric, "com.quicinc.vellamo:id/card_score_score");
- getUiDevice().pressBack();
- getUiDevice().pressBack();
- getUiDevice().pressBack();
+ mDevice.pressBack();
+ mDevice.pressBack();
+ mDevice.pressBack();
}
public void getScore(String metric, String resourceID) throws Exception {
UiSelector selector = new UiSelector();
- UiObject score = new UiObject(selector.resourceId(resourceID));
+ UiObject score = mDevice.findObject(selector.resourceId(resourceID));
if (!score.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!score.exists()) {
throw new UiObjectNotFoundException("Could not find score on screen.");
@@ -211,7 +215,7 @@ public class UiAutomation extends BaseUiAutomation {
public void waitForTestCompletion(int timeout, String resourceID) throws Exception {
UiSelector selector = new UiSelector();
- UiObject resultsNoButton = new UiObject(selector.resourceId(resourceID));
+ UiObject resultsNoButton = mDevice.findObject(selector.resourceId(resourceID));
if (!resultsNoButton.waitForExists(TimeUnit.SECONDS.toMillis(timeout))) {
throw new UiObjectNotFoundException("Did not see results screen.");
}
@@ -221,7 +225,7 @@ public class UiAutomation extends BaseUiAutomation {
public void dismissEULA() throws Exception {
UiSelector selector = new UiSelector();
waitText("Vellamo EULA");
- UiObject acceptButton = new UiObject(selector.text("Accept")
+ UiObject acceptButton = mDevice.findObject(selector.textMatches("Accept|ACCEPT")
.className("android.widget.Button"));
if (acceptButton.exists()) {
acceptButton.click();
@@ -230,9 +234,9 @@ public class UiAutomation extends BaseUiAutomation {
public void dissmissWelcomebanner() throws Exception {
UiSelector selector = new UiSelector();
- UiObject welcomeBanner = new UiObject(selector.textContains("WELCOME"));
+ UiObject welcomeBanner = mDevice.findObject(selector.textContains("WELCOME"));
if (welcomeBanner.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
- UiObject pager = new UiObject(selector.className("android.support.v4.view.ViewPager"));
+ UiObject pager = mDevice.findObject(selector.className("android.support.v4.view.ViewPager"));
pager.swipeLeft(2);
pager.swipeLeft(2);
}
@@ -240,12 +244,12 @@ public class UiAutomation extends BaseUiAutomation {
public void dismissLetsRoll() throws Exception {
UiSelector selector = new UiSelector();
- UiObject letsRollButton = new UiObject(selector.className("android.widget.Button")
+ UiObject letsRollButton = mDevice.findObject(selector.className("android.widget.Button")
.textContains("LET'S ROLL"));
if (!letsRollButton.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!letsRollButton.exists()) {
// As a fall-back look for the old capitalization
- letsRollButton = new UiObject(selector.className("android.widget.Button")
+ letsRollButton = mDevice.findObject(selector.className("android.widget.Button")
.textContains("Let's Roll"));
if (!letsRollButton.exists()) {
throw new UiObjectNotFoundException("Could not find \"Let's Roll\" button.");
@@ -257,21 +261,20 @@ public class UiAutomation extends BaseUiAutomation {
public void dismissArrow() throws Exception {
UiSelector selector = new UiSelector();
- UiObject cardContainer = new UiObject(selector.resourceId("com.quicinc.vellamo:id/cards_container")) ;
+ UiObject cardContainer = mDevice.findObject(selector.resourceId("com.quicinc.vellamo:id/cards_container")) ;
if (!cardContainer.waitForExists(TimeUnit.SECONDS.toMillis(5))) {
if (!cardContainer.exists()) {
throw new UiObjectNotFoundException("Could not find vellamo main screen");
}
}
- cardContainer.click();
}
public void dismissNetworkConnectionDialogIfNecessary() throws Exception {
UiSelector selector = new UiSelector();
- UiObject dialog = new UiObject(selector.className("android.widget.TextView")
+ UiObject dialog = mDevice.findObject(selector.className("android.widget.TextView")
.textContains("No Network Connection"));
if (dialog.exists()) {
- UiObject yesButton = new UiObject(selector.className("android.widget.Button")
+ UiObject yesButton = mDevice.findObject(selector.className("android.widget.Button")
.text("Yes"));
yesButton.click();
}
@@ -279,10 +282,10 @@ public class UiAutomation extends BaseUiAutomation {
public void dismissExplanationDialogIfNecessary() throws Exception {
UiSelector selector = new UiSelector();
- UiObject dialog = new UiObject(selector.className("android.widget.TextView")
+ UiObject dialog = mDevice.findObject(selector.className("android.widget.TextView")
.textContains("Benchmarks Explanation"));
if (dialog.exists()) {
- UiObject noButton = new UiObject(selector.className("android.widget.Button")
+ UiObject noButton = mDevice.findObject(selector.className("android.widget.Button")
.text("No"));
noButton.click();
}
diff --git a/wlauto/workloads/vellamo/uiauto/build.gradle b/wlauto/workloads/vellamo/uiauto/build.gradle
new file mode 100644
index 00000000..b78a0b86
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.3.1'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/wlauto/workloads/vellamo/uiauto/build.sh b/wlauto/workloads/vellamo/uiauto/build.sh
index 4c3ad807..0175986f 100755
--- a/wlauto/workloads/vellamo/uiauto/build.sh
+++ b/wlauto/workloads/vellamo/uiauto/build.sh
@@ -1,28 +1,40 @@
#!/bin/bash
-# Copyright 2014-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.vellamo.jar ]]; then
- cp bin/com.arm.wlauto.uiauto.vellamo.jar ..
+# CD into build dir if possible - allows building from any directory
+script_path='.'
+if `readlink -f $0 &>/dev/null`; then
+ script_path=`readlink -f $0 2>/dev/null`
+fi
+script_dir=`dirname $script_path`
+cd $script_dir
+
+# Ensure gradelw exists before starting
+if [[ ! -f gradlew ]]; then
+ echo 'gradlew file not found! Check that you are in the right directory.'
+ exit 9
+fi
+
+# Copy base class library from wlauto dist
+libs_dir=app/libs
+base_classes=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', '*.aar')"`
+mkdir -p $libs_dir
+cp $base_classes $libs_dir
+
+# Build and return appropriate exit code if failed
+# gradle build
+./gradlew clean :app:assembleDebug
+exit_code=$?
+if [[ $exit_code -ne 0 ]]; then
+ echo "ERROR: 'gradle build' exited with code $exit_code"
+ exit $exit_code
+fi
+
+# If successful move APK file to workload folder (overwrite previous)
+package=com.arm.wlauto.uiauto.vellamo
+rm -f ../$package
+if [[ -f app/build/apk/$package.apk ]]; then
+ cp app/build/apk/$package.apk ../$package.uiautoapk
+else
+ echo 'ERROR: UiAutomator apk could not be found!'
+ exit 9
fi
diff --git a/wlauto/workloads/vellamo/uiauto/build.xml b/wlauto/workloads/vellamo/uiauto/build.xml
deleted file mode 100644
index c137d62d..00000000
--- a/wlauto/workloads/vellamo/uiauto/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.arm.wlauto.uiauto.vellamo" 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>
diff --git a/wlauto/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.jar b/wlauto/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/wlauto/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/wlauto/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties b/wlauto/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..760fcce7
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed May 03 15:42:44 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/wlauto/workloads/vellamo/uiauto/gradlew b/wlauto/workloads/vellamo/uiauto/gradlew
new file mode 100755
index 00000000..9d82f789
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/wlauto/workloads/vellamo/uiauto/gradlew.bat b/wlauto/workloads/vellamo/uiauto/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/wlauto/workloads/vellamo/uiauto/project.properties b/wlauto/workloads/vellamo/uiauto/project.properties
deleted file mode 100644
index ce39f2d0..00000000
--- a/wlauto/workloads/vellamo/uiauto/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-18
diff --git a/wlauto/workloads/vellamo/uiauto/settings.gradle b/wlauto/workloads/vellamo/uiauto/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/wlauto/workloads/vellamo/uiauto/settings.gradle
@@ -0,0 +1 @@
+include ':app'