diff --git a/CMakeLists.txt b/CMakeLists.txt index 3052efc47..40f7680f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ endif() set (QT_MIN_VERSION "5.2.0") set(KF5_VERSION "4.98.0") -find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Script Test) +find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Script) find_package(KF5Activities ${KF5_VERSION} REQUIRED) find_package(KF5Archive ${KF5_VERSION} REQUIRED) diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index e5db1c529..8eec585bf 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -1,3 +1,6 @@ +find_package(Qt5Test 5.2.0 REQUIRED NO_MODULE) +set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for tests") + set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) include(ECMMarkAsTest) @@ -9,8 +12,9 @@ find_package(KF5CoreAddons REQUIRED) MACRO(PLASMA_UNIT_TESTS) FOREACH(_testname ${ARGN}) add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} Qt5::Test - KF5::Plasma KF5::Archive KF5::CoreAddons + target_link_libraries(${_testname} Qt5::Qml Qt5::Test + KF5::Plasma KF5::PlasmaQuick + KF5::Archive KF5::CoreAddons KF5::ConfigGui KF5::I18n KF5::KIOCore @@ -26,6 +30,7 @@ ENDMACRO(PLASMA_UNIT_TESTS) PLASMA_UNIT_TESTS( configloadertest packagestructuretest + packageurlinterceptortest pluginloadertest # plasmoidpackagetest ) @@ -35,6 +40,25 @@ target_link_libraries(storagetest Qt5::Test Qt5::Sql KF5::KIOCore KF5::Plasma KF add_test(plasma-storagetest storagetest) ecm_mark_as_test(storagetest) +add_executable(sortfiltermodeltest + sortfiltermodeltest.cpp + ../src/plasma/dataengineconsumer.cpp + ../src/declarativeimports/core/datamodel.cpp + ../src/declarativeimports/core/datasource.cpp + ) + +target_link_libraries(sortfiltermodeltest + KF5::Plasma + Qt5::Gui + Qt5::Test + KF5::I18n + KF5::Service + Qt5::Qml + ) + +add_test(plasma-sortfiltermodeltest sortfiltermodeltest) +ecm_mark_as_test(sortfiltermodeltest) + if(QT_QTOPENGL_FOUND) target_link_libraries(storagetest Qt5::OpenGL) endif() diff --git a/src/declarativeimports/core/tests/dynamictreemodel.cpp b/autotests/dynamictreemodel.cpp similarity index 100% rename from src/declarativeimports/core/tests/dynamictreemodel.cpp rename to autotests/dynamictreemodel.cpp diff --git a/src/declarativeimports/core/tests/dynamictreemodel.h b/autotests/dynamictreemodel.h similarity index 100% rename from src/declarativeimports/core/tests/dynamictreemodel.h rename to autotests/dynamictreemodel.h diff --git a/src/declarativeimports/core/tests/modeltest.cpp b/autotests/modeltest.cpp similarity index 100% rename from src/declarativeimports/core/tests/modeltest.cpp rename to autotests/modeltest.cpp diff --git a/src/declarativeimports/core/tests/modeltest.h b/autotests/modeltest.h similarity index 100% rename from src/declarativeimports/core/tests/modeltest.h rename to autotests/modeltest.h diff --git a/src/plasmaquick/autotests/packageurlinterceptortest.cpp b/autotests/packageurlinterceptortest.cpp similarity index 97% rename from src/plasmaquick/autotests/packageurlinterceptortest.cpp rename to autotests/packageurlinterceptortest.cpp index d39a89aab..9fb769479 100644 --- a/src/plasmaquick/autotests/packageurlinterceptortest.cpp +++ b/autotests/packageurlinterceptortest.cpp @@ -19,7 +19,7 @@ #include "packageurlinterceptortest.h" -#include +#include #include #include diff --git a/src/plasmaquick/autotests/packageurlinterceptortest.h b/autotests/packageurlinterceptortest.h similarity index 100% rename from src/plasmaquick/autotests/packageurlinterceptortest.h rename to autotests/packageurlinterceptortest.h diff --git a/src/declarativeimports/core/tests/sortfiltermodeltest.cpp b/autotests/sortfiltermodeltest.cpp similarity index 98% rename from src/declarativeimports/core/tests/sortfiltermodeltest.cpp rename to autotests/sortfiltermodeltest.cpp index f4f930c2e..0c8dafbb7 100644 --- a/src/declarativeimports/core/tests/sortfiltermodeltest.cpp +++ b/autotests/sortfiltermodeltest.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include // KDE diff --git a/src/declarativeimports/core/tests/sortfiltermodeltest.h b/autotests/sortfiltermodeltest.h similarity index 100% rename from src/declarativeimports/core/tests/sortfiltermodeltest.h rename to autotests/sortfiltermodeltest.h diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt index 044e043cf..8539ea032 100644 --- a/src/declarativeimports/core/CMakeLists.txt +++ b/src/declarativeimports/core/CMakeLists.txt @@ -75,5 +75,3 @@ install(TARGETS corebindingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core) install(FILES private/DefaultToolTip.qml DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/core/private) - -add_subdirectory(tests) diff --git a/src/declarativeimports/core/tests/CMakeLists.txt b/src/declarativeimports/core/tests/CMakeLists.txt deleted file mode 100644 index 9fc9f894a..000000000 --- a/src/declarativeimports/core/tests/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE_DIRECTORIES( - ${corebindings_SOURCE_DIR} - ) - -include(ECMMarkAsTest) - -add_executable(sortfiltermodeltest - sortfiltermodeltest.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/../../../plasma/dataengineconsumer.cpp - ${corebindings_SOURCE_DIR}/datamodel.cpp - ${corebindings_SOURCE_DIR}/datasource.cpp - ) - -target_link_libraries(sortfiltermodeltest - KF5::Plasma - Qt5::Gui - Qt5::Test - KF5::I18n - KF5::Service - Qt5::Qml - ) - - -add_test(plasma-sortfiltermodeltest sortfiltermodeltest) -ecm_mark_as_test(sortfiltermodeltest) diff --git a/src/plasmaquick/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt index 0b43f9156..4a1f6b4ff 100644 --- a/src/plasmaquick/CMakeLists.txt +++ b/src/plasmaquick/CMakeLists.txt @@ -118,5 +118,3 @@ install(FILES ) install(EXPORT KF5PlasmaQuickTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5PlasmaQuickTargets.cmake NAMESPACE KF5:: ) - -add_subdirectory(autotests) diff --git a/src/plasmaquick/autotests/CMakeLists.txt b/src/plasmaquick/autotests/CMakeLists.txt deleted file mode 100644 index 9a54d1863..000000000 --- a/src/plasmaquick/autotests/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - -include(ECMMarkAsTest) - -find_package(KF5CoreAddons REQUIRED) - -# add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ) - -MACRO(PLASMA_UNIT_TESTS) - FOREACH(_testname ${ARGN}) - add_executable(${_testname} ${_testname}.cpp) - target_link_libraries(${_testname} - Qt5::Test - Qt5::Qml - KF5::Plasma - KF5::Archive KF5::CoreAddons - KF5::ConfigGui - KF5::I18n - KF5::KIOCore - KF5::Service - KF5::PlasmaQuick - ) - if(QT_QTOPENGL_FOUND) - target_link_libraries(${_testname} Qt5::OpenGL) - endif() - add_test(plasma-${_testname} ${_testname}) - ecm_mark_as_test(${_testname}) - ENDFOREACH(_testname) -ENDMACRO(PLASMA_UNIT_TESTS) - -PLASMA_UNIT_TESTS( - packageurlinterceptortest -) - - diff --git a/src/declarativeimports/core/tests/manual/dialog_positioning.qml b/tests/dialog_positioning.qml similarity index 100% rename from src/declarativeimports/core/tests/manual/dialog_positioning.qml rename to tests/dialog_positioning.qml