diff --git a/CMakeLists.txt b/CMakeLists.txt index d77ed37a6..736a5142d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,5 +163,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma_version.h add_subdirectory(src) add_subdirectory(desktoptheme) add_subdirectory(examples) +add_subdirectory(autotests) +add_subdirectory(tests) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/src/plasma/autotests/CMakeLists.txt b/autotests/CMakeLists.txt similarity index 91% rename from src/plasma/autotests/CMakeLists.txt rename to autotests/CMakeLists.txt index 06c3d1568..27fddbedb 100644 --- a/src/plasma/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -31,7 +31,7 @@ PLASMA_UNIT_TESTS( #runnercontexttest ) -add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp) +add_executable(storagetest storagetest.cpp ../src/plasma/private/storage.cpp ../src/plasma/private/storagethread.cpp) target_link_libraries(storagetest Qt5::Test Qt5::Declarative Qt5::Sql KF5::KIOCore KF5::Plasma KF5::CoreAddons ) add_test(plasma-storagetest storagetest) ecm_mark_as_test(storagetest) diff --git a/src/plasma/autotests/TODO b/autotests/TODO similarity index 100% rename from src/plasma/autotests/TODO rename to autotests/TODO diff --git a/src/plasma/autotests/configloadertest.cpp b/autotests/configloadertest.cpp similarity index 100% rename from src/plasma/autotests/configloadertest.cpp rename to autotests/configloadertest.cpp diff --git a/src/plasma/autotests/configloadertest.h b/autotests/configloadertest.h similarity index 100% rename from src/plasma/autotests/configloadertest.h rename to autotests/configloadertest.h diff --git a/src/plasma/autotests/configloadertest.xml b/autotests/configloadertest.xml similarity index 100% rename from src/plasma/autotests/configloadertest.xml rename to autotests/configloadertest.xml diff --git a/src/plasma/autotests/data/signedPackage/contents.hash b/autotests/data/signedPackage/contents.hash similarity index 100% rename from src/plasma/autotests/data/signedPackage/contents.hash rename to autotests/data/signedPackage/contents.hash diff --git a/src/plasma/autotests/data/signedPackage/contents.hash.sig b/autotests/data/signedPackage/contents.hash.sig similarity index 100% rename from src/plasma/autotests/data/signedPackage/contents.hash.sig rename to autotests/data/signedPackage/contents.hash.sig diff --git a/src/plasma/autotests/data/signedPackage/contents/code/main.js b/autotests/data/signedPackage/contents/code/main.js similarity index 100% rename from src/plasma/autotests/data/signedPackage/contents/code/main.js rename to autotests/data/signedPackage/contents/code/main.js diff --git a/src/plasma/autotests/data/signedPackage/contents/images/dummy b/autotests/data/signedPackage/contents/images/dummy similarity index 100% rename from src/plasma/autotests/data/signedPackage/contents/images/dummy rename to autotests/data/signedPackage/contents/images/dummy diff --git a/src/plasma/autotests/data/signedPackage/metadata.desktop b/autotests/data/signedPackage/metadata.desktop similarity index 100% rename from src/plasma/autotests/data/signedPackage/metadata.desktop rename to autotests/data/signedPackage/metadata.desktop diff --git a/src/plasma/autotests/data/testpackage/contents.hash b/autotests/data/testpackage/contents.hash similarity index 100% rename from src/plasma/autotests/data/testpackage/contents.hash rename to autotests/data/testpackage/contents.hash diff --git a/src/plasma/autotests/data/testpackage/contents/images/empty.png b/autotests/data/testpackage/contents/images/empty.png similarity index 100% rename from src/plasma/autotests/data/testpackage/contents/images/empty.png rename to autotests/data/testpackage/contents/images/empty.png diff --git a/src/plasma/autotests/data/testpackage/contents/ui/main.qml b/autotests/data/testpackage/contents/ui/main.qml similarity index 100% rename from src/plasma/autotests/data/testpackage/contents/ui/main.qml rename to autotests/data/testpackage/contents/ui/main.qml diff --git a/src/plasma/autotests/data/testpackage/metadata.desktop b/autotests/data/testpackage/metadata.desktop similarity index 100% rename from src/plasma/autotests/data/testpackage/metadata.desktop rename to autotests/data/testpackage/metadata.desktop diff --git a/src/plasma/autotests/packagemetadatatest.desktop b/autotests/packagemetadatatest.desktop similarity index 100% rename from src/plasma/autotests/packagemetadatatest.desktop rename to autotests/packagemetadatatest.desktop diff --git a/src/plasma/autotests/packagestructuretest.cpp b/autotests/packagestructuretest.cpp similarity index 100% rename from src/plasma/autotests/packagestructuretest.cpp rename to autotests/packagestructuretest.cpp diff --git a/src/plasma/autotests/packagestructuretest.h b/autotests/packagestructuretest.h similarity index 100% rename from src/plasma/autotests/packagestructuretest.h rename to autotests/packagestructuretest.h diff --git a/src/plasma/autotests/plasmoidpackagerc b/autotests/plasmoidpackagerc similarity index 100% rename from src/plasma/autotests/plasmoidpackagerc rename to autotests/plasmoidpackagerc diff --git a/src/plasma/autotests/plasmoidpackagetest.cpp b/autotests/plasmoidpackagetest.cpp similarity index 100% rename from src/plasma/autotests/plasmoidpackagetest.cpp rename to autotests/plasmoidpackagetest.cpp diff --git a/src/plasma/autotests/plasmoidpackagetest.h b/autotests/plasmoidpackagetest.h similarity index 100% rename from src/plasma/autotests/plasmoidpackagetest.h rename to autotests/plasmoidpackagetest.h diff --git a/src/plasma/autotests/pluginloadertest.cpp b/autotests/pluginloadertest.cpp similarity index 100% rename from src/plasma/autotests/pluginloadertest.cpp rename to autotests/pluginloadertest.cpp diff --git a/src/plasma/autotests/pluginloadertest.h b/autotests/pluginloadertest.h similarity index 100% rename from src/plasma/autotests/pluginloadertest.h rename to autotests/pluginloadertest.h diff --git a/src/plasma/autotests/runnercontexttest.cpp b/autotests/runnercontexttest.cpp similarity index 100% rename from src/plasma/autotests/runnercontexttest.cpp rename to autotests/runnercontexttest.cpp diff --git a/src/plasma/autotests/runnercontexttest.h b/autotests/runnercontexttest.h similarity index 100% rename from src/plasma/autotests/runnercontexttest.h rename to autotests/runnercontexttest.h diff --git a/src/plasma/autotests/signed.plasmoid b/autotests/signed.plasmoid similarity index 100% rename from src/plasma/autotests/signed.plasmoid rename to autotests/signed.plasmoid diff --git a/src/plasma/autotests/signed.plasmoid.invalid.sig b/autotests/signed.plasmoid.invalid.sig similarity index 100% rename from src/plasma/autotests/signed.plasmoid.invalid.sig rename to autotests/signed.plasmoid.invalid.sig diff --git a/src/plasma/autotests/signed.plasmoid.sig b/autotests/signed.plasmoid.sig similarity index 100% rename from src/plasma/autotests/signed.plasmoid.sig rename to autotests/signed.plasmoid.sig diff --git a/src/plasma/autotests/storagetest.cpp b/autotests/storagetest.cpp similarity index 100% rename from src/plasma/autotests/storagetest.cpp rename to autotests/storagetest.cpp diff --git a/src/plasma/autotests/storagetest.h b/autotests/storagetest.h similarity index 100% rename from src/plasma/autotests/storagetest.h rename to autotests/storagetest.h diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 064d3ccab..8c248308d 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -36,8 +36,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT #FIXME: gpgme++ is in kdepimlibs, must move somewhere else! include_directories(${KDEPIMLIBS_INCLUDE_DIRS} ${GPGME_INCLUDES}) -add_subdirectory(autotests) -add_subdirectory(tests) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1209) ########### next target ############### diff --git a/src/plasma/tests/CMakeLists.txt b/tests/CMakeLists.txt similarity index 100% rename from src/plasma/tests/CMakeLists.txt rename to tests/CMakeLists.txt diff --git a/src/plasma/tests/dpi/CMakeLists.txt b/tests/dpi/CMakeLists.txt similarity index 100% rename from src/plasma/tests/dpi/CMakeLists.txt rename to tests/dpi/CMakeLists.txt diff --git a/src/plasma/tests/dpi/dpitest.cpp b/tests/dpi/dpitest.cpp similarity index 100% rename from src/plasma/tests/dpi/dpitest.cpp rename to tests/dpi/dpitest.cpp diff --git a/src/plasma/tests/dpi/dpitest.h b/tests/dpi/dpitest.h similarity index 100% rename from src/plasma/tests/dpi/dpitest.h rename to tests/dpi/dpitest.h diff --git a/src/plasma/tests/dpi/main.cpp b/tests/dpi/main.cpp similarity index 100% rename from src/plasma/tests/dpi/main.cpp rename to tests/dpi/main.cpp diff --git a/src/plasma/tests/kplugins/CMakeLists.txt b/tests/kplugins/CMakeLists.txt similarity index 100% rename from src/plasma/tests/kplugins/CMakeLists.txt rename to tests/kplugins/CMakeLists.txt diff --git a/src/plasma/tests/kplugins/main.cpp b/tests/kplugins/main.cpp similarity index 100% rename from src/plasma/tests/kplugins/main.cpp rename to tests/kplugins/main.cpp diff --git a/src/plasma/tests/kplugins/plugintest.cpp b/tests/kplugins/plugintest.cpp similarity index 100% rename from src/plasma/tests/kplugins/plugintest.cpp rename to tests/kplugins/plugintest.cpp diff --git a/src/plasma/tests/kplugins/plugintest.h b/tests/kplugins/plugintest.h similarity index 100% rename from src/plasma/tests/kplugins/plugintest.h rename to tests/kplugins/plugintest.h diff --git a/src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt b/tests/testcontainmentactionsplugin/CMakeLists.txt similarity index 100% rename from src/plasma/tests/testcontainmentactionsplugin/CMakeLists.txt rename to tests/testcontainmentactionsplugin/CMakeLists.txt diff --git a/src/plasma/tests/testcontainmentactionsplugin/config.ui b/tests/testcontainmentactionsplugin/config.ui similarity index 100% rename from src/plasma/tests/testcontainmentactionsplugin/config.ui rename to tests/testcontainmentactionsplugin/config.ui diff --git a/src/plasma/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop similarity index 100% rename from src/plasma/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop rename to tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop diff --git a/src/plasma/tests/testcontainmentactionsplugin/test.cpp b/tests/testcontainmentactionsplugin/test.cpp similarity index 100% rename from src/plasma/tests/testcontainmentactionsplugin/test.cpp rename to tests/testcontainmentactionsplugin/test.cpp diff --git a/src/plasma/tests/testcontainmentactionsplugin/test.h b/tests/testcontainmentactionsplugin/test.h similarity index 100% rename from src/plasma/tests/testcontainmentactionsplugin/test.h rename to tests/testcontainmentactionsplugin/test.h diff --git a/src/plasma/tests/testengine/CMakeLists.txt b/tests/testengine/CMakeLists.txt similarity index 100% rename from src/plasma/tests/testengine/CMakeLists.txt rename to tests/testengine/CMakeLists.txt diff --git a/src/plasma/tests/testengine/plasma-dataengine-testengine.desktop b/tests/testengine/plasma-dataengine-testengine.desktop similarity index 100% rename from src/plasma/tests/testengine/plasma-dataengine-testengine.desktop rename to tests/testengine/plasma-dataengine-testengine.desktop diff --git a/src/plasma/tests/testengine/testengine.cpp b/tests/testengine/testengine.cpp similarity index 100% rename from src/plasma/tests/testengine/testengine.cpp rename to tests/testengine/testengine.cpp diff --git a/src/plasma/tests/testengine/testengine.h b/tests/testengine/testengine.h similarity index 100% rename from src/plasma/tests/testengine/testengine.h rename to tests/testengine/testengine.h