diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | tests/testqml.cpp | 46 | ||||
| -rw-r--r-- | tests/tst_qPref.qml | 17 |
5 files changed, 78 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 339874373..ef39d73bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- tests: add qml test harness - Cloud storage: fix potential issue with credentials on Linux [#1346] - Mobile/iOS: fix missing translations - Dive media: support addition of videos diff --git a/CMakeLists.txt b/CMakeLists.txt index b1d3632c5..986e5632c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ if(BTSUPPORT) list(APPEND QT_EXTRA_LIBRARIES Qt5::Bluetooth) endif() -find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network Svg Test LinguistTools Positioning Quick Location ${QT_EXTRA_COMPONENTS}) +find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network Svg Test QuickTest LinguistTools Positioning Quick Location ${QT_EXTRA_COMPONENTS}) set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Svg Qt5::Positioning Qt5::Quick Qt5::Location ${QT_EXTRA_LIBRARIES}) set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test Qt5::QuickTest) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a9c65bd09..d0e82e97f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -76,6 +76,17 @@ enable_testing() add_definitions(-g) add_definitions(-DSUBSURFACE_TEST_DATA="${SUBSURFACE_TEST_DATA}") +# Build QML test runner +add_executable(TestQML testqml.cpp ) +target_link_libraries( + TestQML + subsurface_corelib + RESOURCE_LIBRARY + ${QT_TEST_LIBRARIES} + ${SUBSURFACE_LINK_LIBRARIES} +) + +# SSRF test cases (TBD, convert to standard qTest setup) TEST(TestUnitConversion testunitconversion.cpp) TEST(TestProfile testprofile.cpp) TEST(TestGpsCoords testgpscoords.cpp) @@ -88,6 +99,7 @@ TEST(TestPreferences testpreferences.cpp) TEST(TestPicture testpicture.cpp) TEST(TestMerge testmerge.cpp) TEST(TestTagList testtaglist.cpp) +add_test(NAME TestQML COMMAND $<TARGET_FILE:TestQML> ${SUBSURFACE_SOURCE}/tests) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} @@ -104,6 +116,7 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} TestPicture TestMerge TestTagList + TestQML ) # useful for debugging CMake issues diff --git a/tests/testqml.cpp b/tests/testqml.cpp new file mode 100644 index 000000000..fe411f0bb --- /dev/null +++ b/tests/testqml.cpp @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <QQmlEngine> +#include <QtQuickTest> +#include <QtTest> +#include <QQmlEngine> +#include <QQmlContext> + +#include "core/settings/qPref.h" + + +// this is the content of QUICK_TEST_MAIN amended with +// registration of ssrf classes +int main(int argc, char **argv) +{ + // QML testing is not supported in the oldest Qt versions we support + // if running with Qt version less than 5.10 then skip test +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QTEST_ADD_GPU_BLACKLIST_SUPPORT + QTEST_SET_MAIN_SOURCE_PATH + + // check that qPref exists + new qPref; + + // check that we have a directory + if (argc < 2) { + qDebug() << "ERROR: missing tst_* directory"; + return -1; + } + // save tst_dir and pass rest to Qt + const char *tst_dir = argv[1]; + for (int i = 1; i < argc; i++) + argv[i] = argv[i+1]; + argc--; + + // Register types + auto rc = qmlRegisterType<qPref>("org.subsurfacedivelog.mobile", 1, 0, "SsrfPrefs"); + if (rc < 0) { + qDebug() << "ERROR: cannot register qPref"; + return -1; + } + + return quick_test_main(argc, argv, "TestQML", tst_dir); +#else + return 0; +#endif +} diff --git a/tests/tst_qPref.qml b/tests/tst_qPref.qml new file mode 100644 index 000000000..99b798423 --- /dev/null +++ b/tests/tst_qPref.qml @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +import QtQuick 2.6 +import QtTest 1.2 +import org.subsurfacedivelog.mobile 1.0 + +TestCase { + name: "qPref" + + SsrfPrefs { + id: prefs + } + + function test_register() { + var x = prefs.mobile_version + compare(x, prefs.mobile_version) + } +} |