From eeb073e9e73bd537f647889f3ef73357d8f4908c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 15 Jun 2017 16:06:55 +0200 Subject: [PATCH] fix(UnitTests): add a `Units` mock --- tools/test_qml | 3 ++- tools/update_resources | 2 +- ui/dev-modules/Units/Units.qml | 8 ++++++++ ui/dev-modules/Units/qmldir | 7 +++++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ui/dev-modules/Units/Units.qml create mode 100644 ui/dev-modules/Units/qmldir diff --git a/tools/test_qml b/tools/test_qml index 6e01efadb..69603ac09 100755 --- a/tools/test_qml +++ b/tools/test_qml @@ -9,6 +9,7 @@ TEST_RUNNER='qmltestrunner' RESOURCES_FILE='resources.qrc' TEST_FILE_EXTENSION='spec.qml' +DEV_MODULES_PATH='./ui/dev-modules' MODULES_PATH='./ui/modules' SCRIPTS_PATH='./ui/scripts' @@ -41,7 +42,7 @@ do if [ -f $spec_file ]; then printf "${BLUE}Running unit qml tests of '${source_file}'...${NC}\n" - $TEST_RUNNER -import $MODULES_PATH -import $SCRIPTS_PATH -input "$spec_file" + $TEST_RUNNER -import $DEV_MODULES_PATH -import $MODULES_PATH -import $SCRIPTS_PATH -input "$spec_file" if [[ $? == 0 ]]; then printf "${GREEN}All unit tests have succeeded for '${spec_file}'.\n" diff --git a/tools/update_resources b/tools/update_resources index ae81ac129..e1d77a1dc 100755 --- a/tools/update_resources +++ b/tools/update_resources @@ -18,7 +18,7 @@ cd $SCRIPT_DIR/.. echo ' ' > $RESOURCES_FILE -for filename in $(find ui/ assets/ -type f | sort) +for filename in $(find ui/modules/ ui/scripts/ ui/views/ assets/ -type f | sort) do basename="${filename##*/}" extension="${filename##*.}" diff --git a/ui/dev-modules/Units/Units.qml b/ui/dev-modules/Units/Units.qml new file mode 100644 index 000000000..57e98f355 --- /dev/null +++ b/ui/dev-modules/Units/Units.qml @@ -0,0 +1,8 @@ +pragma Singleton +import QtQml 2.2 + +// ============================================================================= + +QtObject { + property real dp: 1.0 +} diff --git a/ui/dev-modules/Units/qmldir b/ui/dev-modules/Units/qmldir new file mode 100644 index 000000000..ef07ccac9 --- /dev/null +++ b/ui/dev-modules/Units/qmldir @@ -0,0 +1,7 @@ +# ============================================================================== +# Units component to export. +# ============================================================================== + +module Units + +singleton Units 1.0 Units.qml