OSDN Git Service

generic: fix tests after the build system cleanup
authorIvailo Monev <xakepa10@gmail.com>
Mon, 7 Sep 2015 08:20:00 +0000 (11:20 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Mon, 7 Sep 2015 08:20:00 +0000 (11:20 +0300)
44 files changed:
CMakeLists.txt
ark/kerfuffle/tests/CMakeLists.txt
ark/plugins/clirarplugin/tests/CMakeLists.txt
gwenview/tests/CMakeLists.txt
gwenview/tests/auto/CMakeLists.txt
gwenview/tests/manual/CMakeLists.txt
jovie/filters/CMakeLists.txt
jovie/filters/stringreplacer/CMakeLists.txt
kcalc/knumber/tests/CMakeLists.txt
kdevplatform/CHANGELOG.1.7.1 [deleted file]
kdevplatform/CMakeLists.txt
kdevplatform/interfaces/tests/CMakeLists.txt
kdevplatform/language/backgroundparser/tests/CMakeLists.txt
kdevplatform/language/codegen/tests/CMakeLists.txt
kdevplatform/language/duchain/tests/CMakeLists.txt
kdevplatform/language/duchain/tests/serialization/CMakeLists.txt
kdevplatform/language/highlighting/tests/CMakeLists.txt
kdevplatform/outputview/tests/CMakeLists.txt
kdevplatform/project/tests/CMakeLists.txt
kdevplatform/shell/tests/CMakeLists.txt
kdevplatform/sublime/tests/CMakeLists.txt
kdevplatform/util/tests/CMakeLists.txt
kdevplatform/vcs/dvcs/tests/CMakeLists.txt
kdevplatform/vcs/models/tests/CMakeLists.txt
kfilemetadata/autotests/CMakeLists.txt
kget/CMakeLists.txt
kget/Changelog [deleted file]
kget/tests/CMakeLists.txt
kompare/libkomparediff2/tests/CMakeLists.txt
ksystemlog/tests/CMakeLists.txt
libkscreen/tests/CMakeLists.txt
libktorrent/src/datachecker/tests/CMakeLists.txt
libktorrent/src/dht/tests/CMakeLists.txt
libktorrent/src/diskio/tests/CMakeLists.txt
libktorrent/src/download/tests/CMakeLists.txt
libktorrent/src/magnet/tests/CMakeLists.txt
libktorrent/src/mse/tests/CMakeLists.txt
libktorrent/src/net/tests/CMakeLists.txt
libktorrent/src/peer/tests/CMakeLists.txt
libktorrent/src/torrent/tests/CMakeLists.txt
libktorrent/src/util/tests/CMakeLists.txt
libktorrent/src/utp/tests/CMakeLists.txt
okular/tests/CMakeLists.txt
syndication/tests/CMakeLists.txt

index 9b701bc..5bd9a1f 100644 (file)
@@ -61,6 +61,7 @@ macro_optional_add_subdirectory (skanlite)
 macro_optional_add_subdirectory (svgpart)
 macro_optional_add_subdirectory (thumbnailers)
 macro_optional_add_subdirectory (yakuake)
+# FIXME: half of the tests of kdevplatform are noop
 macro_optional_add_subdirectory (kdevplatform)
 # FIXME: bootstrap fails because of kdevplatform not being found
 # macro_optional_add_subdirectory (kdevelop)
index 853228b..f7dc50d 100644 (file)
@@ -10,8 +10,14 @@ add_library(jsoninterface STATIC ${JSONINTERFACE_SOURCES})
 
 macro(KERFUFFLE_UNIT_TESTS)
     foreach(_testname ${ARGN})
-        kde4_add_unit_test(${_testname} NOGUI ${_testname}.cpp)
-        target_link_libraries(${_testname} jsoninterface kerfuffle ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${KERFUFFLE_QJSON_LIBRARIES})
+        kde4_add_test(kerfuffle-${_testname} ${_testname}.cpp)
+        target_link_libraries(kerfuffle-${_testname}
+            jsoninterface
+            kerfuffle
+            ${KDE4_KDEUI_LIBS}
+            ${QT_QTTEST_LIBRARY}
+            ${KERFUFFLE_QJSON_LIBRARIES}
+        )
     endforeach(_testname)
 endmacro(KERFUFFLE_UNIT_TESTS)
 
index 5466c2f..5aa06ae 100644 (file)
@@ -1,4 +1,2 @@
-set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-kde4_add_unit_test(clirartest NOGUI clirartest.cpp ../cliplugin.cpp)
-target_link_libraries(clirartest kerfuffle ${QT_QTTEST_LIBRARY} ${KDE4_KPARTS_LIBRARY})
+kde4_add_test(clirarplugin-clirartest clirartest.cpp ../cliplugin.cpp)
+target_link_libraries(clirarplugin-clirartest kerfuffle ${QT_QTTEST_LIBRARY} ${KDE4_KPARTS_LIBRARY})
index a8a2913..7e7fa88 100644 (file)
@@ -1,5 +1,3 @@
 add_subdirectory(auto)
 add_subdirectory(manual)
 
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
-add_dependencies(check buildtests)
index 9d6dbef..9485426 100644 (file)
@@ -1,7 +1,5 @@
 macro(gv_add_unit_test _test)
-    set(_src ${_test}.cpp ${ARGN})
-    qt4_automoc(${_src})
-    kde4_add_unit_test(${_test} ${_src})
+    kde4_add_test(${_test} ${_test}.cpp ${ARGN})
     target_link_libraries(${_test}
         ${KDE4_KIO_LIBS}
         ${KDE4_KDEUI_LIBS}
@@ -10,20 +8,17 @@ macro(gv_add_unit_test _test)
         ${QT_QTCORE_LIBRARY}
         ${QT_QTGUI_LIBRARY}
         ${KDCRAW_LIBRARIES}
-        gwenviewlib)
+        gwenviewlib
+    )
 endmacro(gv_add_unit_test)
 
 include_directories(
     ${gwenview_SOURCE_DIR}
     ${importer_SOURCE_DIR}
-    )
+)
 
 # For config-gwenview.h
-include_directories(
-    ${gwenview_BINARY_DIR}
-    )
-
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${gwenview_BINARY_DIR})
 
 gv_add_unit_test(imagescalertest testutils.cpp)
 gv_add_unit_test(paintutilstest)
@@ -39,7 +34,7 @@ gv_add_unit_test(importertest
     ${importer_SOURCE_DIR}/importer.cpp
     ${importer_SOURCE_DIR}/fileutils.cpp
     ${importer_SOURCE_DIR}/filenameformater.cpp
-    )
+)
 gv_add_unit_test(sorteddirmodeltest testutils.cpp)
 gv_add_unit_test(slidecontainerautotest slidecontainerautotest.cpp)
 gv_add_unit_test(imagemetainfomodeltest testutils.cpp)
index 077def4..86a7b25 100644 (file)
@@ -6,7 +6,7 @@ set(slidecontainertest_SRCS
     slidecontainertest.cpp
     )
 
-add_executable(slidecontainertest TEST ${slidecontainertest_SRCS})
+kde4_add_manual_test(slidecontainertest ${slidecontainertest_SRCS})
 
 target_link_libraries(slidecontainertest ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} gwenviewlib)
 
@@ -15,7 +15,7 @@ set(imageloadbench_SRCS
     imageloadbench.cpp
     )
 
-add_executable(imageloadbench TEST ${imageloadbench_SRCS})
+kde4_add_manual_test(imageloadbench ${imageloadbench_SRCS})
 
 target_link_libraries(imageloadbench ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} gwenviewlib)
 
@@ -25,7 +25,7 @@ set(thumbnailgen_SRCS
     ../auto/testutils.cpp # FIXME: Move testutils.cpp to test/
     )
 
-add_executable(thumbnailgen TEST ${thumbnailgen_SRCS})
+kde4_add_manual_test(thumbnailgen ${thumbnailgen_SRCS})
 
 target_link_libraries(thumbnailgen
     ${QT_QTCORE_LIBRARY}
index 1f8db87..b3a0aa5 100644 (file)
@@ -10,7 +10,7 @@ add_subdirectory( talkerchooser )
 if(ENABLE_TESTING)
     set(testfilter_SRCS main.cpp )
 
-    add_executable(testfilter TEST ${testfilter_SRCS})
+    kde4_add_manual_test(testfilter ${testfilter_SRCS})
 
     target_link_libraries(testfilter  ${KDE4_KDEUI_LIBS} kttsd )
 endif()
index 650d4eb..1c6dc45 100644 (file)
@@ -14,19 +14,16 @@ set(jovie_stringreplacerplugin_PART_SRCS
 
 kde4_add_plugin(jovie_stringreplacerplugin ${jovie_stringreplacerplugin_PART_SRCS})
 
-target_link_libraries(jovie_stringreplacerplugin  ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kttsd )
+target_link_libraries(jovie_stringreplacerplugin  ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} kttsd)
 
-install(TARGETS jovie_stringreplacerplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS jovie_stringreplacerplugin DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 ########### test cdata escaper ##########
 
 if(ENABLE_TESTING)
     set(test_cdataescaper_SRCS testcdataescaper.cpp cdataescaper.cpp)
-    kde4_add_unit_test(
-        test_cdataescaper TESTNAME jovie-cdata_esecaper
-        ${test_cdataescaper_SRCS}
-    )
-    target_link_libraries(test_cdataescaper
+    kde4_add_test(jovie-cdata_esecaper ${test_cdataescaper_SRCS})
+    target_link_libraries(jovie-cdata_esecaper
         ${KDE4_KDECORE_LIBS}
         ${QT_QTTEST_LIBRARY}
         ${QT_QTCORE_LIBRARY}
@@ -46,6 +43,6 @@ install(FILES
     festival_unspeakable_chars.xml
     qt2plaintext.xml DESTINATION ${DATA_INSTALL_DIR}/jovie/stringreplacer/)
 
-install( FILES jovie_stringreplacerplugin.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(FILES jovie_stringreplacerplugin.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
 
 
index d309244..6acf7dd 100644 (file)
@@ -3,6 +3,6 @@ include_directories( ${CMAKE_SOURCE_DIR}/knumber  )
 
 set(knumbertest_SRCS knumbertest.cpp ${libknumber_la_SRCS})
 
-kde4_add_unit_test(knumbertest TESTNAME KNumber ${knumbertest_SRCS})
+kde4_add_test(knumber-KNumber ${knumbertest_SRCS})
 
-target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES})
+target_link_libraries(knumber-KNumber ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES})
diff --git a/kdevplatform/CHANGELOG.1.7.1 b/kdevplatform/CHANGELOG.1.7.1
deleted file mode 100644 (file)
index bb3bb90..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-ChangeLog for kdevplatform v1.7.1
-=================================
-
-* Milian Wolff: Don't crash when no service is available to open directories.
-* Sebastien Speierer: Prevent new project in a non-empty folder.
-* Milian Wolff: Prepare release of 1.7.1
-* Milian Wolff: Prevent accessing invalid m_view pointer.
-* Milian Wolff: Cleanup code to prevent crashes when accessing nullptr.
-* Milian Wolff: Fix potential deadlock on shutdown.
-* Kevin Funk: Fix access to nullptr
-* Kevin Funk: projectfilter: Hide *.orig by default
-* Kevin Funk: projectmanagerview: Fix bug on delayed initialization
-* René J.V. Bertin: Restore upload functionality to git.reviewboard.kde.org
-* Nicolai Hähnle: sublime: prevent accidentally adding nullptrs to ContainerPrivate::viewForWidget
-* René J.V. Bertin: replace toAscii() with toLatin1() in KUrl conversions
-* Kevin Funk: Fix possible crash in CodeHighlighting
-* Kevin Funk: BreakpointWidget: Make less annoying
-* Kevin Funk: BreakpointWidget: Fix look of header
-* Kevin Funk: Detect more common Qt runtime warnings
-* Kevin Funk: ProblemReporter: Improve appearance of the list
-* Kevin Funk: Use KDevelop::htmlToPlainText where applicable
-* Kevin Funk: Make the assistant popup less obtrusive
-* Sven Brauch: Use an estimate of the text width to decide on assistant layout
-* Kevin Funk: Introduce KDevelop::htmlToPlainText
-* Kevin Funk: Don't use the undocumented qAppName()
-* Milian Wolff: Hide inline private data type and use typedef for Defines more.
-* Milian Wolff: Improve error reporting.
-* Sven Brauch: Move __pycache__ to excluded folders, it's not a file
-* Kevin Funk: Make compile on OSX
-* Milian Wolff: Use kDebug instead of qDebug
-* Kevin Funk: Fix unused variable
-* Kevin Funk: Fix unused variable
-* Kevin Funk: Revert "Make shell scripts portable and stable."
-* Kevin Funk: Revert "Attempt to fix kdevplatform_shell_environment"
-* Sergey Kalinichev: Don't start parse project job if there is nothing to parse.
-* Kevin Funk: Make F4 work again
-* Kevin Funk: externalscript: Fix crash in case of no active document
-* Sergey Kalinichev: Use match accuracy when asking for mime type.
-* René J.V. Bertin: Workaround a crash on Mac OS X after finishing code review.
index f6e8f65..0c66105 100644 (file)
@@ -15,6 +15,9 @@ set(KDEVPLATFORM_LIB_SOVERSION 8)
 cmake_minimum_required(VERSION 2.8.9)
 project(KDevPlatform)
 
+# FIXME: tests are broken
+set(ENABLE_TESTING OFF)
+
 set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules)
 
 set(KDE_MIN_VERSION "4.7.0")
index 32124fa..d87a4d8 100644 (file)
@@ -3,13 +3,13 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 add_definitions(-DKDEVPLATFORMINTERFACES_EXPORT=)
 
 set(foregroundlock_SRC test_foregroundlock.cpp ../foregroundlock.cpp)
-kde4_add_unit_test(foregroundlocktest ${foregroundlock_SRC})
-target_link_libraries(foregroundlocktest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
+kde4_add_test(kdevplatform-foregroundlocktest ${foregroundlock_SRC})
+target_link_libraries(kdevplatform-foregroundlocktest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
 
 if( RT_LIBRARY )
-    target_link_libraries( foregroundlocktest ${RT_LIBRARY} )
+    target_link_libraries(kdevplatform-foregroundlocktest ${RT_LIBRARY} )
 endif( RT_LIBRARY )
 
 if( Threads_FOUND )
-    target_link_libraries( foregroundlocktest ${CMAKE_THREAD_LIBS_INIT} )
+    target_link_libraries(kdevplatform-foregroundlocktest ${CMAKE_THREAD_LIBS_INIT} )
 endif( Threads_FOUND )
\ No newline at end of file
index 02b2fa1..9ab95e4 100644 (file)
@@ -1,9 +1,10 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
 set(backgroundparsertest_SRCS test_backgroundparser.cpp testlanguagesupport.cpp testparsejob.cpp)
 
-kde4_add_unit_test(backgroundparsertest ${backgroundparsertest_SRCS})
-target_link_libraries(backgroundparsertest ${KDE4_KDECORE_LIBS} ${KDE4_TEXTEDITOR_LIBS}
-    ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} ${KDE4_THREADWEAVER_LIBS} kdevplatformlanguage)
+kde4_add_test(kdevplatform-backgroundparsertest ${backgroundparsertest_SRCS})
+target_link_libraries(kdevplatform-backgroundparsertest
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_TEXTEDITOR_LIBS}
+    ${QT_QTTEST_LIBRARY}
+    ${KDEVPLATFORM_TESTS_LIBRARIES}
+    ${KDE4_THREADWEAVER_LIBS}
+    kdevplatformlanguage)
index a168f9c..df52b80 100644 (file)
@@ -1,22 +1,22 @@
 set(documentchangesettest_SRCS test_documentchangeset.cpp)
 
-kde4_add_unit_test(documentchangesettest ${documentchangesettest_SRCS})
-target_link_libraries(documentchangesettest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
+kde4_add_test(kdevplatform-documentchangesettest ${documentchangesettest_SRCS})
+target_link_libraries(kdevplatform-documentchangesettest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
 
 set(templaterenderertest_SRCS test_templaterenderer.cpp)
 
-kde4_add_unit_test(templaterenderertest ${templaterenderertest_SRCS})
-target_link_libraries(templaterenderertest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
+kde4_add_test(kdevplatform-templaterenderertest ${templaterenderertest_SRCS})
+target_link_libraries(kdevplatform-templaterenderertest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
 
 set(templateclassgeneratortest_SRCS test_templateclassgenerator.cpp)
 
-kde4_add_unit_test(templateclassgeneratortest ${templateclassgeneratortest_SRCS})
-target_link_libraries(templateclassgeneratortest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
+kde4_add_test(kdevplatform-templateclassgeneratortest ${templateclassgeneratortest_SRCS})
+target_link_libraries(kdevplatform-templateclassgeneratortest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
 
 set(templatesmodeltest_SRCS test_templatesmodel.cpp)
 
-kde4_add_unit_test(templatesmodeltest ${templatesmodeltest_SRCS})
-target_link_libraries(templatesmodeltest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
+kde4_add_test(kdevplatform-templatesmodeltest ${templatesmodeltest_SRCS})
+target_link_libraries(kdevplatform-templatesmodeltest ${QT_QTTEST_LIBRARY} kdevplatformtests kdevplatformlanguage)
 
 configure_file(codegen_tests_config.h.cmake codegen_tests_config.h)
 add_subdirectory(data)
index 20cc76b..7a150fa 100644 (file)
@@ -1,45 +1,45 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
 add_subdirectory(serialization)
 
 ########### next target ###############
 
 set(duchaintest_SRCS test_duchain.cpp)
 
-kde4_add_unit_test(duchaintest ${duchaintest_SRCS})
-target_link_libraries(duchaintest ${KDE4_KDECORE_LIBS} ${KDE4_TEXTEDITOR_LIBS}
+kde4_add_test(kdevplatform-duchaintest ${duchaintest_SRCS})
+target_link_libraries(kdevplatform-duchaintest ${KDE4_KDECORE_LIBS} ${KDE4_TEXTEDITOR_LIBS}
     ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES} kdevplatformlanguage)
 
 ########### next target ###############
 
 set(itemrepositorytest_SRCS test_itemrepository.cpp)
 
-kde4_add_unit_test(itemrepositorytest ${itemrepositorytest_SRCS})
-target_link_libraries(itemrepositorytest ${KDE4_KDECORE_LIBS} ${KDE4_KTEXTEDITOR_LIBRARY}
-    ${QT_QTTEST_LIBRARY} kdevplatformlanguage ${KDEVPLATFORM_TESTS_LIBRARIES})
+kde4_add_test(kdevplatform-itemrepositorytest ${itemrepositorytest_SRCS})
+target_link_libraries(kdevplatform-itemrepositorytest
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KTEXTEDITOR_LIBRARY}
+    ${QT_QTTEST_LIBRARY}
+    kdevplatformlanguage
+    ${KDEVPLATFORM_TESTS_LIBRARIES})
 
 ########### next target ###############
 
 set(itemrepositoryregistry_automatic_test_SRCS test_itemrepositoryregistry_automatic.cpp)
-kde4_add_unit_test(itemrepositoryregistry_automatic_test ${itemrepositoryregistry_automatic_test_SRCS})
-target_link_libraries(itemrepositoryregistry_automatic_test ${QT_QTTEST_LIBRARY}
+kde4_add_test(kdevplatform-itemrepositoryregistry_automatic_test ${itemrepositoryregistry_automatic_test_SRCS})
+target_link_libraries(kdevplatform-itemrepositoryregistry_automatic_test ${QT_QTTEST_LIBRARY}
     kdevplatformlanguage ${KDEVPLATFORM_TESTS_LIBRARIES})
 
 ########### next target ###############
 
 set(itemrepositoryregistry_deferred_test_SRCS test_itemrepositoryregistry_deferred.cpp)
-kde4_add_unit_test(itemrepositoryregistry_deferred_test ${itemrepositoryregistry_deferred_test_SRCS})
-target_link_libraries(itemrepositoryregistry_deferred_test ${QT_QTTEST_LIBRARY}
+kde4_add_test(kdevplatform-itemrepositoryregistry_deferred_test ${itemrepositoryregistry_deferred_test_SRCS})
+target_link_libraries(kdevplatform-itemrepositoryregistry_deferred_test ${QT_QTTEST_LIBRARY}
     kdevplatformlanguage ${KDEVPLATFORM_TESTS_LIBRARIES})
 
 ########### next target ###############
 
 set(benchhashes_SRCS benchhashes.cpp)
 
-kde4_add_unit_test(benchhashes ${benchhashes_SRCS})
-target_link_libraries(benchhashes
+kde4_add_test(kdevplatform-benchhashes ${benchhashes_SRCS})
+target_link_libraries(kdevplatform-benchhashes
   ${KDE4_KDECORE_LIBS}
   ${QT_QTTEST_LIBRARY}
   ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
index f82ffbd..21ac2ab 100644 (file)
@@ -1,39 +1,35 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
 ########### next target ###############
 
 set(tst_itemrepository_SRCS tst_itemrepository.cpp)
 
-kde4_add_unit_test(tst_itemrepository ${tst_itemrepository_SRCS})
+kde4_add_test(tst_itemrepository ${tst_itemrepository_SRCS})
 target_link_libraries(tst_itemrepository
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTTEST_LIBRARY}
-  ${KDEVPLATFORM_TESTS_LIBRARIES}
-  ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+    ${KDE4_KDECORE_LIBS}
+    ${QT_QTTEST_LIBRARY}
+    ${KDEVPLATFORM_TESTS_LIBRARIES}
+    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
 )
 
 ########### next target ###############
 
 set(tst_indexedstring_SRCS tst_indexedstring.cpp)
 
-kde4_add_unit_test(tst_indexedstring ${tst_indexedstring_SRCS})
+kde4_add_test(tst_indexedstring ${tst_indexedstring_SRCS})
 target_link_libraries(tst_indexedstring
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTTEST_LIBRARY}
-  ${KDEVPLATFORM_TESTS_LIBRARIES}
-  ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+    ${KDE4_KDECORE_LIBS}
+    ${QT_QTTEST_LIBRARY}
+    ${KDEVPLATFORM_TESTS_LIBRARIES}
+    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
 )
 
 ########### next target ###############
 
 set(tst_identifier_SRCS tst_identifier.cpp)
 
-kde4_add_unit_test(tst_identifier ${tst_identifier_SRCS})
+kde4_add_test(tst_identifier ${tst_identifier_SRCS})
 target_link_libraries(tst_identifier
-  ${KDE4_KDECORE_LIBS}
-  ${QT_QTTEST_LIBRARY}
-  ${KDEVPLATFORM_TESTS_LIBRARIES}
-  ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+    ${KDE4_KDECORE_LIBS}
+    ${QT_QTTEST_LIBRARY}
+    ${KDEVPLATFORM_TESTS_LIBRARIES}
+    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
 )
index 559144c..caae878 100644 (file)
@@ -1,10 +1,6 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
 set(highlightingtest_SRCS test_highlighting.cpp)
 
-kde4_add_unit_test(highlightingtest ${highlightingtest_SRCS})
-target_link_libraries(highlightingtest ${KDE4_KDECORE_LIBS} ${KDE4_TEXTEDITOR_LIBS}
+kde4_add_test(kdevplatform-highlightingtest ${highlightingtest_SRCS})
+target_link_libraries(kdevplatform-highlightingtest ${KDE4_KDECORE_LIBS} ${KDE4_TEXTEDITOR_LIBS}
     ${QT_QTTEST_LIBRARY} 
     ${KDEVPLATFORM_TESTS_LIBRARIES} kdevplatformlanguage)
index 321e8a3..1253c9b 100644 (file)
@@ -1,7 +1,5 @@
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 macro(OUTPUTVIEW_CREATE_TEST name)
-    kde4_add_unit_test(${name} ${ARGN})
+    kde4_add_test(${name} ${ARGN})
     target_link_libraries(${name}
                           ${QT_QTTEST_LIBRARY}
                           ${KDEVPLATFORM_TESTS_LIBRARIES}
index e105696..b039a3d 100644 (file)
@@ -1,6 +1,3 @@
-# The executables go into the tests dir
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 # also needed for the plugin, so the plugincontrollertest knows the binary dir
 #add_definitions( -DBUILD_DIR="\\"${KDevPlatform_BINARY_DIR}\\"" )
 include_directories(
@@ -9,12 +6,12 @@ include_directories(
     ${KDevPlatform_SOURCE_DIR}/project
 )
 
-set( projectmodeltest_SRCS
+set(projectmodeltest_SRCS
     projectmodeltest.cpp
 )
 
-kde4_add_unit_test(projectmodeltest ${projectmodeltest_SRCS})
-target_link_libraries(projectmodeltest
+kde4_add_test(kdevplatform-projectmodeltest ${projectmodeltest_SRCS})
+target_link_libraries(kdevplatform-projectmodeltest
     ${QT_QTTEST_LIBRARY}
     kdevplatforminterfaces
     kdevplatformproject
@@ -22,11 +19,11 @@ target_link_libraries(projectmodeltest
     kdevplatformtests
 )
 
-set( projectmodelperformancetest_SRCS
+set(projectmodelperformancetest_SRCS
     projectmodelperformancetest.cpp
 )
-add_executable(projectmodelperformancetest ${projectmodelperformancetest_SRCS})
-target_link_libraries(projectmodelperformancetest
+kde4_add_manual_test(kdevplatform-projectmodelperformancetest ${projectmodelperformancetest_SRCS})
+target_link_libraries(kdevplatform-projectmodelperformancetest
     ${QT_QTTEST_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     kdevplatforminterfaces
index 8db5fed..9d71f74 100644 (file)
@@ -10,29 +10,29 @@ include_directories(
     )
 
 set(documentcontrollertest_SRCS documentcontrollertest.cpp)
-kde4_add_unit_test(shell-documentcontrollertest ${documentcontrollertest_SRCS})
+kde4_add_test(shell-documentcontrollertest ${documentcontrollertest_SRCS})
 target_link_libraries( shell-documentcontrollertest ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES})
 
 set(uicontrollertest_SRCS uicontrollertest.cpp)
-kde4_add_unit_test(shell-uicontrollertest ${uicontrollertest_SRCS})
+kde4_add_test(shell-uicontrollertest ${uicontrollertest_SRCS})
 target_link_libraries( shell-uicontrollertest ${QT_QTTEST_LIBRARY} ${KDEVPLATFORM_TESTS_LIBRARIES})
 
 set( shellbuddytest_SRCS shellbuddytest.cpp )
-kde4_add_unit_test(shell-buddytest ${shellbuddytest_SRCS})
+kde4_add_test(shell-buddytest ${shellbuddytest_SRCS})
 target_link_libraries(shell-buddytest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} kdevplatformtests kdevplatformshell kdevplatforminterfaces sublime )
 
 set( shelldocumentoperationtest_SRCS shelldocumentoperationtest.cpp )
-kde4_add_unit_test(shell-documentoperationtest ${shelldocumentoperationtest_SRCS})
+kde4_add_test(shell-documentoperationtest ${shelldocumentoperationtest_SRCS})
 target_link_libraries(shell-documentoperationtest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} kdevplatformtests kdevplatformshell kdevplatforminterfaces sublime )
 
 ## This test needs fixing:
 # creating a factory is not enough to inject a new project plugin, we also need a KPluginInfo
 set( projectcontrollertest_SRCS projectcontrollertest.cpp )
-#kde4_add_unit_test(shell-projectcontrollertest ${projectcontrollertest_SRCS})
+#kde4_add_test(shell-projectcontrollertest ${projectcontrollertest_SRCS})
 #target_link_libraries(shell-projectcontrollertest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} kdevplatformshell sublime kdevplatformproject kdevplatforminterfaces )
 
 set( sessioncontrollertest_SRCS sessioncontrollertest.cpp )
-kde4_add_unit_test(shell-sessioncontrollertest ${sessioncontrollertest_SRCS})
+kde4_add_test(shell-sessioncontrollertest ${sessioncontrollertest_SRCS})
 target_link_libraries(shell-sessioncontrollertest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kdevplatformtests kdevplatformshell kdevplatforminterfaces sublime )
 
 configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES)
@@ -43,9 +43,9 @@ target_link_libraries( kdevnonguiinterfaceplugin ${QT_QTCORE_LIBRARY} ${KDE4_KDE
 
 # Disabled for now, until I find a way of loading plugins from builddir/sourcedir
 set( plugincontrollertest_SRCS plugincontrollertest.cpp )
-kde4_add_unit_test(shell-plugincontrollertest ${plugincontrollertest_SRCS})
+kde4_add_test(shell-plugincontrollertest ${plugincontrollertest_SRCS})
 target_link_libraries(shell-plugincontrollertest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} kdevplatformtests kdevplatformshell kdevplatforminterfaces sublime )
 
 set( testcontrollertest_SRCS testcontrollertest.cpp )
-kde4_add_unit_test(shell-testcontrollertest ${testcontrollertest_SRCS})
+kde4_add_test(shell-testcontrollertest ${testcontrollertest_SRCS})
 target_link_libraries(shell-testcontrollertest ${QT_QTTEST_LIBRARY} kdevplatformtests)
index c38d307..b93816a 100644 (file)
@@ -1,40 +1,40 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 set( areaoperationtest_SRCS areaoperationtest.cpp areaprinter.cpp )
-kde4_add_unit_test(sublime-areaoperationtest ${areaoperationtest_SRCS})
+kde4_add_test(sublime-areaoperationtest ${areaoperationtest_SRCS})
 target_link_libraries(sublime-areaoperationtest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
 
 set( areawalkertest_SRCS areawalkertest.cpp areaprinter.cpp )
-kde4_add_unit_test(sublime-areawalkertest ${areawalkertest_SRCS})
+kde4_add_test(sublime-areawalkertest ${areawalkertest_SRCS})
 target_link_libraries(sublime-areawalkertest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
 
 set( viewtest_SRCS viewtest.cpp )
-kde4_add_unit_test(sublime-viewtest ${viewtest_SRCS})
+kde4_add_test(sublime-viewtest ${viewtest_SRCS})
 target_link_libraries(sublime-viewtest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
 
 set( documenttest_SRCS documenttest.cpp )
-kde4_add_unit_test(sublime-documenttest ${documenttest_SRCS})
+kde4_add_test(sublime-documenttest ${documenttest_SRCS})
 target_link_libraries(sublime-documenttest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
 
 set( controllertest_SRCS controllertest.cpp )
-kde4_add_unit_test(sublime-controllertest ${controllertest_SRCS})
+kde4_add_test(sublime-controllertest ${controllertest_SRCS})
 target_link_libraries(sublime-controllertest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
 
 set( viewactivationtest_SRCS viewactivationtest.cpp )
-kde4_add_unit_test(sublime-viewactivationtest ${viewactivationtest_SRCS})
+kde4_add_test(sublime-viewactivationtest ${viewactivationtest_SRCS})
 target_link_libraries(sublime-viewactivationtest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
 
 set( aggregatemodeltest_SRCS aggregatemodeltest.cpp )
-kde4_add_unit_test(sublime-aggregatemodeltest ${aggregatemodeltest_SRCS})
+kde4_add_test(sublime-aggregatemodeltest ${aggregatemodeltest_SRCS})
 target_link_libraries(sublime-aggregatemodeltest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime kdevplatformtests )
 
 set( toolviewtoolbartest_SRCS toolviewtoolbartest.cpp )
-kde4_add_unit_test(sublime-toolviewtoolbartest ${toolviewtoolbartest_SRCS})
+kde4_add_test(sublime-toolviewtoolbartest ${toolviewtoolbartest_SRCS})
 target_link_libraries(sublime-toolviewtoolbartest ${QT_QTTEST_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} sublime )
 
index 1194c6a..878fa29 100644 (file)
@@ -2,17 +2,17 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 set(embeddedfreetreetest_SRCS test_embeddedfreetree.cpp)
 
-kde4_add_unit_test(embeddedfreetreetest ${embeddedfreetreetest_SRCS})
+kde4_add_test(embeddedfreetreetest ${embeddedfreetreetest_SRCS})
 target_link_libraries(embeddedfreetreetest ${KDE4_KDECORE_LIBS} ${KDE4_TEXTEDITOR_LIBS} ${QT_QTTEST_LIBRARY} kdevplatformlanguage kdevplatformtests)
 
 set(kdevvarlengtharray_SRC test_kdevvarlengtharray.cpp)
-kde4_add_unit_test(kdevvarlengtharraytest ${kdevvarlengtharray_SRC})
+kde4_add_test(kdevvarlengtharraytest ${kdevvarlengtharray_SRC})
 target_link_libraries(kdevvarlengtharraytest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
 
-kde4_add_unit_test(test_stringhandler test_stringhandler.cpp)
+kde4_add_test(test_stringhandler test_stringhandler.cpp)
 target_link_libraries(test_stringhandler ${QT_QTTEST_LIBRARY} kdevplatformutil)
 
-kde4_add_unit_test(pathtest test_path.cpp)
+kde4_add_test(pathtest test_path.cpp)
 target_link_libraries(pathtest
     ${QT_QTTEST_LIBRARY}
     ${QT_QTCORE_LIBRARY}
index 07f689b..2a9bcb2 100644 (file)
@@ -1,11 +1,10 @@
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 set(dvcsTest_SRCS dvcsjobTest.cpp)
-kde4_add_unit_test(dvcsTest ${dvcsTest_SRCS})
+kde4_add_test(dvcsTest ${dvcsTest_SRCS})
 target_link_libraries(dvcsTest
-                             ${QT_QTTEST_LIBRARY}
-                                         ${QT_QTGUI_LIBRARY}
-                             ${KDE4_KDECORE_LIBS}
-                      ${KDEVPLATFORM_TESTS_LIBRARIES}
-                      kdevplatformutil
-                      kdevplatformvcs
-                         )
+    ${QT_QTTEST_LIBRARY}
+    ${QT_QTGUI_LIBRARY}
+    ${KDE4_KDECORE_LIBS}
+    ${KDEVPLATFORM_TESTS_LIBRARIES}
+    kdevplatformutil
+    kdevplatformvcs
+)
index e6b6942..dff7e75 100644 (file)
@@ -1,11 +1,11 @@
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 set(modelsTest_SRCS modelstest.cpp)
-kde4_add_unit_test(modelsTest ${modelsTest_SRCS})
+kde4_add_test(modelsTest ${modelsTest_SRCS})
 target_link_libraries(modelsTest
-                      ${QT_QTTEST_LIBRARY}
-                      ${QT_QTGUI_LIBRARY}
-                      ${KDE4_KDECORE_LIBS}
-                      ${KDEVPLATFORM_TESTS_LIBRARIES}
-                      kdevplatformutil
-                      kdevplatformvcs
-                      )
+    ${QT_QTTEST_LIBRARY}
+    ${QT_QTGUI_LIBRARY}
+    ${KDE4_KDECORE_LIBS}
+    ${KDEVPLATFORM_TESTS_LIBRARIES}
+    kdevplatformutil
+    kdevplatformvcs
+)
index 3fd71f5..c95a939 100644 (file)
@@ -1,28 +1,30 @@
-configure_file(indexerextractortestsconfig.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/indexerextractortestsconfig.h @ONLY)
+configure_file(
+    indexerextractortestsconfig.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/indexerextractortestsconfig.h @ONLY
+)
 
-kde4_add_unit_test(extractortests NOGUI
-  indexerextractortests.cpp
-  simpleresult.cpp
-  ../src/extractors/plaintextextractor.cpp
+kde4_add_test(kfilemetadata-extractortests
+    indexerextractortests.cpp
+    simpleresult.cpp
+    ../src/extractors/plaintextextractor.cpp
 )
 
-target_link_libraries(extractortests
-  ${QT_QTTEST_LIBRARY}
-  ${KDE4_KDECORE_LIBS}
-  kfilemetadata
+target_link_libraries(kfilemetadata-extractortests
+    ${QT_QTTEST_LIBRARY}
+    ${KDE4_KDECORE_LIBS}
+    kfilemetadata
 )
 
 #
 # Property Info
 #
-kde4_add_unit_test(propertyinfotest NOGUI
-  propertyinfotest.cpp
+kde4_add_test(kfilemetadata-propertyinfotest
+    propertyinfotest.cpp
 )
 
-target_link_libraries(propertyinfotest
-  ${QT_QTTEST_LIBRARY}
-  ${KDE4_KDECORE_LIBS}
-  kfilemetadata
+target_link_libraries(kfilemetadata-propertyinfotest
+    ${QT_QTTEST_LIBRARY}
+    ${KDE4_KDECORE_LIBS}
+    kfilemetadata
 )
 
index c7ef64a..ff5bd83 100644 (file)
@@ -65,7 +65,6 @@ add_subdirectory(core)
 add_subdirectory(ui)
 add_subdirectory(transfer-plugins)
 add_subdirectory(extensions)
-add_subdirectory(sounds)
 add_subdirectory(desktop)
 add_subdirectory(plasma)
 add_subdirectory(tests)
diff --git a/kget/Changelog b/kget/Changelog
deleted file mode 100644 (file)
index 85244f4..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-2007-02-21 Manolo Valdes <nolis71cu @ gmail.com>
-        * Add Metalink support.
-
-2006-09-02 Manolo Valdes <nolis71cu @ gmail.com>
-        * Add Multisegments kio based transfers.
-
-2006-09-01 Urs Wolfer <uwolfer @ kde.org>
-        * Make DBUS really working.
-
-2006-08-31 Urs Wolfer <uwolfer @ fwo.ch>
-        * Enable again FileDialog::getExistingDirectory. It is now fixed.
-        * YesNo messageboxes are bad for usability. Replace with YesNoCancel.
-        * Fix the messagebox order in the add download process (do not show the
-          same box twice).
-
-2006-08-31 Dario Massarin <nekkar@libero.it>
-        * Add the TransfersViewDelegate and TransferTreeSelectionModel classes.
-        * The former will be used to redesign the TransfersView look & feel,
-          now it is used just to catch the mouse events.
-        * The latter was introduced to have more control over the
-          items that can be selected by the user. In this way it was possible
-          to inhibit the selection of group objects.
-        * Show the KMenu when the user right clicks on a selection of transfers.
-
-2005-11-03 Urs Wolfer <uwolfer @ fwo.ch>
-        * Add option to show / hide menubar and toolbar (forwardport)
-
-2005-10-10 Urs Wolfer <uwolfer @ fwo.ch>
-        * Icon updates: Remove a lot icons. Most icons are part of
-          kdelibs. cr22-{app-kget}/{mime-kget_list}.png  icons were 32x32.
-          Resized to 22x22. edit_add / edit_remove icons (used in sidebar)
-          aren't in kdelibs. Replaced with viewmag+/-. I know they are not
-          very suitable. But we have to do a lot of work on the sidebar.
-        * (Re-)implement "Copy URL to Clipboard" transfer action.
-
-2005-10-07 Urs Wolfer <uwolfer @ fwo.ch>
-        * Work on configuration dialogs
-        * Make droptarget-sticky function working
-        * Start implementing expert-mode
-        * (Re-)implement clipboard-autopaste function
-
-2005-10-06 Urs Wolfer <uwolfer @ fwo.ch>
-        * Make commandline option --showDropTarget working
-
-2005-09-17 Urs Wolfer <uwolfer @ fwo.ch>
-        * Konqueror integration implementation.
-        Note: Konqueror freezes at download start if integration is enabled.
-        But I think it's more a Konqueror than a KGet problem. I hope I'll find a solution.
-
-2005-09-10 Dario Massarin <nekkar@libero.it>
-        * Now a TransferHandler object is created always bt the TransferFactory.
-        This allows to easily reimplement the TransferHandler class, just by
-        creating your own class and returning it when the createTransferHandler()
-        function gets called.
-        * More work on the BTTransferHandler class.
-        * The transfer plugins can now provide its details widget that is 
-        displayed automatically at the bottom of the TransferDetails widget.
-        * Implementation of a first bittorrent details widget. 
-        * Note that the bittorrent plugin currently has some problems related 
-        to threads. It seems that Qt4 is quite different from Qt3 in these regards.
-
-2005-09-08 Dario Massarin <nekkar@libero.it>
-        * Start to implement properly the detailsWidgets for each transfer.
-        Now we have a basic widget available with all the plugins and the 
-        next step is to add at the bottom of it another widget provided
-        by each plugin's factory with the createTransferDetails() function.
-        * Start to implement a BTTransferHandler class, reimplementation 
-        of the generic TransferHandler class.
-
-2005-09-02 Urs Wolfer <uwolfer @ fwo.ch>
-        * *Replace the old droptarget icon with the nuvola one
-
-2005-08-31 Urs Wolfer <uwolfer @ fwo.ch>
-        * Icons in smaller sizes (forwardport)
-        * Work on configuration dialogs. Not finished yet.
-
-2005-08-23 Urs Wolfer <uwolfer @ fwo.ch>
-        * Better KGet mime icon (forwardport)
-        * Remove artifacts from images (forwardport)
-        * Add action to show / hide drop target
-        * Add some actions to maintoolbar (new download, show / hide drop target)
-        * Fix a problem with the configuration dialog (wasn't shown the first call)
-        * Remove some compiler warnings
-
-2005-08-12 Dario Massarin <nekkar@libero.it>
-        * Make the configuration dialogs compile again, but we have to 
-        completely redesign them, since they usually refer to settings
-        that are not available anymore.
-        * Fix a problem in the scheduler introduced with the last commit.
-
-2005-08-11 Dario Massarin <nekkar@libero.it>
-        * More work on the ViewsContainer class. Now we have 3 buttons:
-        "Downloads", "Finished" and "Transfer Details" one. The last one
-        is associated with a QMenu that lets you select which transfer to 
-        visualize.
-        * Fixed problem when stopping delayed transfers.
-
-2005-08-06 Dario Massarin <nekkar@libero.it>
-        * Change the way we handle the Transfer actions
-        * Reoganize the gui, introducing a new ViewsContainer class.
-
-2005-08-02 Dario Massarin <nekkar@libero.it>
-        Big commit:
-        * KGet ported to qt4. Here there are some issues that still need to be
-        resolved. For example I had to disable the bittorrent plugin becouse
-        currently I don't know how to make it compile again.
-        * Started implementing a new sidebar with qt3. Then I switched to qt4 and
-        realized I had to rewrite it, since I made use of the QListBox classes :-(
-        So I did. I used the QVBoxLayout class.
-        More to come..
-
-2005-07-29 Dario Massarin <nekkar@libero.it>
-        Many changes:
-        * Implement two TransferGroup actions (start and stop) and a popupMenu()
-        function in the TransferGroupHandler function.
-        This means that now we can start the download of a group and all the
-        necessary scheduling operations are handled by the scheduler.
-        * Make it possible to have actions defined in the TransferGroupHandler
-        without having to make the handler a QObject. This was achieved by 
-        creating a QObject object on demand only if necessary. I'm planning
-        to do the same with the TransferHandler class (where this issue becomes 
-        even more critical, especially if the user has lots of transfers).
-        * Right clicking on a TransferGroup in the mainview shows a popup menu
-        populated with the available actions.
-        * Found a way to implement delays in the jobs. Since I don't want a Job to
-        be a QObject, I implemented the timers inside the Scheduler.
-        * When a download switches in the aborted status, delay it.
-        * Now if we move the transfers in a group, they are started or stopped
-        accordingly to their new position. Wow. This finally makes it possible for
-        us to decide in which order to download files!
-        * Implement the start and stop functions in the scheduler, which will
-        start and stop the download in all the available queues.
-        * Hide the m_statusText and m_statusPixmap members in the Transfer class.
-        A Transfer plugin now should call the Transfer::setStatus( ) function to 
-        set them.
-        * Fixed a couple of memory leaks
-
-2005-04-25 Dario Massarin <nekkar@libero.it>
-        Lots of changes:
-        * Redesign of the TransferAction class.
-        * Now the selected transfers are handled in a perfect model/view style.
-        You can select a transfer by means of the TransferHandler. The selection
-        of a transfer triggers a TransferChangedEvent. The list of selected
-        transfers can be retrived from the model.
-        * With this code in place, I added, as a proof of concept, two actions
-        in the toolbar, that are executed only on the selected transfers.
-        * New default TransferAction: "open destination". I think it's very useful
-        * In the mainview the icon associated with each transfer now reflects
-        the mymetype of the file.
-        * Several changes in the Transfer and TransferGroup API
-        * Reorganization of the bittorrent plugin code. Now we check in the
-        Factory if the file is local, and only if this is true we create the
-        BTTransfer object. This allowed to remove lots of code.
-        * Now we can load and save the transfers when starting and closing kget.
-        It seems to work, but I didn't test this very much.
-        * Other things, that now I don't remember :-)
-
-2005-04-17 Dario Massarin <nekkar@libero.it>
-        Lots of stuff:
-        * Much work on the Job, JobQueue, TransferGroup, TransferHandler classes
-        * Make it possible for each Transfer plugin to define its own actions,
-        or to simply extend the default ones that ship with the base Transfer
-        class.
-        * Add a new TransferAction class that is basically a KAction with the
-        possibility to attach Transfer objects. When the action is executed,
-        this applies to all the attached Transfers. In this way we can create
-        each action only once, saving lots of resources.
-        * Make the TransferFactory return a pointer to a KPopupMenu, filled with
-        the actions that belong to all the transfer of the given list of transfers.
-        * Start to implement the start() and stop() functions in TransferHandler
-        * Start to turn the JobQueue in a standalone class, that doesn't need
-        to be reimplemented (but that can be reimplemented, as the TransferGroup
-        class does).
-        * Start to implement the Scheduler class.
-        * Various fixes and cleanups.
-
-        The code now allows to start and stop a transfer from the view, only by means
-        of the popupmenu. I think now it should be possible to add the long
-        awaited bitTorrent plugin, at least for testing pourposes.
-
-2005-03-26 Dario Massarin <nekkar@libero.it>
-        * Reorganization of the model class
-        * The new plugin structure starts working
-
-2005-03-06 Dario Massarin <nekkar@libero.it>
-        The work on the new architecture has started.
-
-2005-01-29 Dario Massarin <nekkar@libero.it>
-        * Make it possible in the mainview to move the transfer to a new group
-        using the popupmenu.
-        * group.{h,cpp}: big optimization: cache the groupChanged signals. In this 
-        way the GroupList object emits far less signals than before. If you have n
-        transfers, this can save up to 2*n-1 signal calls that are all packed in
-        a single signal.
-        * Cleaned up the code a bit.
-
-2005-01-22 Dario Massarin <nekkar@libero.it>
-        * Ported the new sidebar to the QListBox class.
-
-2005-01-15 Dario Massarin <nekkar@libero.it>
-        * Initial implementation of a new sidebar.
-
-2005-01-14 Dario Massarin <nekkar@libero.it>
-        * Improve the progressbar look&feel
-
-2005-01-14 Dario Massarin <nekkar@libero.it>
-        * Improve the mainview look&feel, especially in the way the groups
-        are painted. The priority column has been removed. The arrow indicators
-        showing the priority have been changed to display a kget icon, that gets
-        colorized with a color which depends on the priority level.
-
-2005-01-14 Dario Massarin <nekkar@libero.it>
-        * Implement delay in the transfer class. We don't need this function
-        to be abstract virtual. Remove its partial implementation from the 
-        TransferKio class.
-        * Now the scheduler sets a small delay (5 seconds) when necessary
-        (with broken urls) to the transfers. This is enough to allow the
-        scheduler to skip them when downloading and to go on downloading the
-        non broken urls. Nice behaviour, IMHO.
-
-2005-01-14 Dario Massarin <nekkar@libero.it>
-        * Correct stupid bug that caused wrong updates of the percent field 
-        in the group object.
-
-2005-01-13 Dario Massarin <nekkar@libero.it>
-        * Reorganization of the directories. Some files have been renamed.
-
-2004-11-05 Dario Massarin <nekkar@libero.it>
-        * Fixed nasty bug in transferKio.cpp which produced a crash every time
-        a download was aborted.
-        * Now also the scheduler is a TransferInterrogator. This means that 
-        I have removed the transferStatusChanged signal and now only the
-        transferChanged signal is emitted from the transfer object :-)
-
-2004-11-05 Dario Massarin <nekkar@libero.it>
-        * New system tray icon effects. This has been realized looking at the 
-        amarok code. In the future, when other things will be in place, I will
-        surely paint an icon filled according to the current downloading progress.
-
-2004-11-05 Dario Massarin <nekkar@libero.it>
-        * Delayed initialization. This should speed up the application startup
-        especially when the user has lots of transfers.
-
-2004-11-05 Dario Massarin <nekkar@libero.it>
-        * Cleanups all over the code.
-        
-        * interrogator.h: Now we have this new file that defines the two classes
-        TransferInterrogator and GroupInterrogator. If a class wants to interrogate
-        a transfer or a group object it should reimplement them.
-        
-        * group.{h,cpp}: The progressed size, totalSize and percent properties are
-        not saved anymore to file. Now we update the group properties every time
-        we see that a transfer that belongs to the group has changed. Each group 
-        change is notified to all the views.        
-        
-        * mainview.cpp: fixed crash when executing actions on a group item.
-
-2004-10-17 Dario Massarin <nekkar@libero.it>
-    
-        * transfer.{h,cpp}: New class TransferInterrogator that abstracts the
-        objects that can "interrogate" the Transfers using the function
-        changesFlags(TransferInterrogator *). In this way not only the views
-        can do it but also, for example, the GroupList objects.
-
-        * group.{h,cpp}: The Group class has been further developed to keep
-        global statistics on its transfers. There is still lots of work to do.
-        
-        * mainview.{h,cpp}: Tried to achieve a better look&feel. I'm not very
-        happy with the final result, yet.
-
-2004-10-16 Dario Massarin <nekkar@libero.it>
-    
-        * Added license statements.
-        
-        * mainview.cpp: Some more work on the groups.
-
-2004-10-10 Dario Massarin <nekkar@libero.it>
-
-        * group.{h,cpp}: This file introduces the Group and GroupList classes.
-        
-        * panels/groupspanel.{h,cpp}: This is the new "group panel". It's far
-        from complete, but at least we can add/remove groups, this gets notified
-        to all the views and saved to the "transfers.kgt" together with the
-        transfers
-
-2004-10-04 Dario Massarin <nekkar@libero.it>
-        
-        * transfer.{h,cpp}: The transfer class has been completely rewritten. Now
-        it is possible to implement a new Transfer simply inheriting the Transfer
-        class and implementing the virtual methods.
-        There is also a new api that allows each view to ask the transfer which
-        particular field in the Info struct has changed since the last update. This
-        results in a big optimization becouse we can now avoid unnecessary repaints.
-        
-        * transferKio.{h,cpp}: This is the first implemented transfer. It's the 
-        simplest transfer one can implement since it uses a KIOSlave.
-        
-        * views/mainview.{h,cpp}: New view that should be the main one. It
-        reimplements the KListView class. The "special features" list contains
-        the introduction of some cool icons and a new progress bar.
-        
-2004-10-05 Dario Massarin <nekkar@libero.it>
-        * transferlist.{h,cpp}: Api semplifications. In this moment there are some
-        new problems I have just discover and I will fix tomorrow.
-        
-        * transferlist.{h,cpp}, transfer.{h,cpp}: The way kget saves the transfers
-        into the transfers.kgt file has been completely rethinked. The code has been
-        rewritten from scratch and now it uses QDom. In this way each new transfer can,
-        if needed, save its own data that isn't already saved by the Transfer class.
-        
-        * some fixes..
-                
-        
-        
-        
index b87d4f7..3adb9c4 100644 (file)
@@ -47,6 +47,6 @@ set(filedeletertest_SRCS
     ../core/filedeleter.cpp
 )
 
-kde4_add_unit_test(kget-filedeletertest ${filedeletertest_SRCS})
+kde4_add_test(kget-filedeletertest ${filedeletertest_SRCS})
 
 target_link_libraries(kget-filedeletertest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
index 1f0200d..b5ea9a2 100644 (file)
@@ -1,7 +1,5 @@
 include_directories(..)
 
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 set(interactiveDiffTest_SRCS
     interactivedifftest.cpp
     ../perforceparser.cpp
@@ -18,9 +16,9 @@ set(interactiveDiffTest_SRCS
     ../stringlistpair.cpp
 )
 
-kde4_add_unit_test(interactiveDiffTest ${interactiveDiffTest_SRCS})
-set_target_properties(interactiveDiffTest PROPERTIES COMPILE_FLAGS "-DDIFF2_EXPORT=")
-target_link_libraries(interactiveDiffTest
+kde4_add_test(kompare-interactiveDiffTest ${interactiveDiffTest_SRCS})
+set_target_properties(kompare-interactiveDiffTest PROPERTIES COMPILE_FLAGS "-DDIFF2_EXPORT=")
+target_link_libraries(kompare-interactiveDiffTest
     ${QT_QTTEST_LIBRARY}
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KPARTS_LIBS}
@@ -32,9 +30,9 @@ set(levenshteinTest_SRCS
     ../stringlistpair.cpp
 )
 
-kde4_add_unit_test(levenshteintest ${levenshteinTest_SRCS})
-set_target_properties(levenshteintest PROPERTIES COMPILE_FLAGS "-DDIFF2_EXPORT=")
-target_link_libraries(levenshteintest
+kde4_add_test(kompare-levenshteintest ${levenshteinTest_SRCS})
+set_target_properties(kompare-levenshteintest PROPERTIES COMPILE_FLAGS "-DDIFF2_EXPORT=")
+target_link_libraries(kompare-levenshteintest
     ${QT_QTTEST_LIBRARY}
     ${QT_QTCORE_LIBRARY}
 )
index 3e593cc..5e31a1c 100644 (file)
@@ -1,53 +1,45 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
 include_directories( 
-       ${CMAKE_CURRENT_SOURCE_DIR}
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/config
-       ${CMAKE_CURRENT_BINARY_DIR}/../src/config
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/system
-       ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/kernel
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/config
+    ${CMAKE_CURRENT_BINARY_DIR}/../src/config
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/system
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/kernel
 )
 
 macro(ksystemlog_unit_tests)
-       foreach(unitTest ${ARGN})
-               set(unitTest_sources
-                       ${unitTest}.cpp
-                       testUtil.cpp
-               )
-               
-               qt4_add_resources( unitTest_sources testResources.qrc )
+    foreach(unitTest ${ARGN})
+        set(unitTest_sources
+            ${unitTest}.cpp
+            testUtil.cpp
+        )
+
+        qt4_add_resources( unitTest_sources testResources.qrc )
+
+        kde4_add_test(ksystemlog-${unitTest} ${unitTest_sources})
 
-               kde4_add_unit_test(
-                       ${unitTest} 
-                       TESTNAME ksystemlog-${unitTest}
-                       
-                       ${unitTest_sources}
-               )
-               
-               target_link_libraries(
-                       ${unitTest} 
-                       ${QT_AND_KDECORE_LIBS} 
-                       ${QT_QTTEST_LIBRARY}
-                       ${KDE4_KDEUI_LIBS}
-                       ${KDE4_KIO_LIBS}
-                       ${KDE4_KDECORE_LIBS} 
-                       ksystemlog_lib
-                       ksystemlog_base_mode
-                       ksystemlog_config
-                       ksystemlog_system
-                       ksystemlog_kernel
-               )
-       endforeach(unitTest)
+        target_link_libraries(ksystemlog-${unitTest} 
+            ${QT_AND_KDECORE_LIBS} 
+            ${QT_QTTEST_LIBRARY}
+            ${KDE4_KDEUI_LIBS}
+            ${KDE4_KIO_LIBS}
+            ${KDE4_KDECORE_LIBS} 
+            ksystemlog_lib
+            ksystemlog_base_mode
+            ksystemlog_config
+            ksystemlog_system
+            ksystemlog_kernel
+        )
+    endforeach(unitTest)
 endmacro(ksystemlog_unit_tests)
 
 ksystemlog_unit_tests(
-       logModeFactoryTest
-       systemAnalyzerTest
-       kernelAnalyzerTest
+    logModeFactoryTest
+    systemAnalyzerTest
+    kernelAnalyzerTest
 
     # Not real unit tests
-       kioLogFileReaderTest
-       findIncompatibleKioTest
+    kioLogFileReaderTest
+    findIncompatibleKioTest
 )
index c88984e..b0c9125 100644 (file)
@@ -4,11 +4,8 @@ include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}
 
 macro(KSCREEN_TESTS)
     foreach(_testname ${ARGN})
-        qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc)
-        include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${X11_Xrandr_INCLUDE_PATH})
-        kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc)
-        target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
-        add_test(${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname})
+        kde4_add_test(libkscreen-${_testname} ${_testname}.cpp)
+        target_link_libraries(libkscreen-${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
     endforeach(_testname)
 endmacro(KSCREEN_TESTS)
 
index 84b7a62..ab98c18 100644 (file)
@@ -1,4 +1,4 @@
 set(datacheckertest_SRCS datacheckertest.cpp)
 
-kde4_add_unit_test(datacheckertest TESTNAME datacheckertest ${datacheckertest_SRCS})
-target_link_libraries( datacheckertest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-datacheckertest ${datacheckertest_SRCS})
+target_link_libraries(libktorrent-datacheckertest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
index 56c1aa0..1d3c0bb 100644 (file)
@@ -1,7 +1,7 @@
 set(rpcmsgtest_SRCS rpcmsgtest.cpp)
-kde4_add_unit_test(rpcmsgtest TESTNAME rpcmsgtest ${rpcmsgtest_SRCS})
-target_link_libraries( rpcmsgtest ${QT_QTTEST_LIBRARY} testlib ktorrent)
+kde4_add_test(libktorrent-rpcmsgtest ${rpcmsgtest_SRCS})
+target_link_libraries(libktorrent-rpcmsgtest ${QT_QTTEST_LIBRARY} testlib ktorrent)
 
 set(keytest_SRCS keytest.cpp)
-kde4_add_unit_test(keytest TESTNAME keytest ${keytest_SRCS})
-target_link_libraries( keytest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-keytest ${keytest_SRCS})
+target_link_libraries(libktorrent-keytest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
index 58f6f6e..20fbe3f 100644 (file)
@@ -1,7 +1,7 @@
 set(chunkmanagertest_SRCS chunkmanagertest.cpp)
-kde4_add_unit_test(chunkmanagertest TESTNAME chunkmanagertest ${chunkmanagertest_SRCS})
-target_link_libraries( chunkmanagertest ${QT_QTTEST_LIBRARY} testlib ktorrent)
+kde4_add_test(libktorrent-chunkmanagertest ${chunkmanagertest_SRCS})
+target_link_libraries(libktorrent-chunkmanagertest ${QT_QTTEST_LIBRARY} testlib ktorrent)
 
 set(preallocationtest_SRCS preallocationtest.cpp)
-kde4_add_unit_test(preallocationtest TESTNAME preallocationtest ${preallocationtest_SRCS})
-target_link_libraries( preallocationtest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-preallocationtest ${preallocationtest_SRCS})
+target_link_libraries(libktorrent-preallocationtest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
index 07bec93..16cb810 100644 (file)
@@ -1,4 +1,4 @@
 set(streamingchunkselectortest_SRCS streamingchunkselectortest.cpp)
 
-kde4_add_unit_test(streamingchunkselectortest TESTNAME streamingchunkselectortest ${streamingchunkselectortest_SRCS})
-target_link_libraries( streamingchunkselectortest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-streamingchunkselectortest ${streamingchunkselectortest_SRCS})
+target_link_libraries(libktorrent-streamingchunkselectortest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
index 111ae2a..1195923 100644 (file)
@@ -1,4 +1,4 @@
 set(magnetlinktest_SRCS magnetlinktest.cpp)
 
-kde4_add_unit_test(magnetlinktest TESTNAME magnetlinktest ${magnetlinktest_SRCS})
-target_link_libraries( magnetlinktest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-magnetlinktest ${magnetlinktest_SRCS})
+target_link_libraries(libktorrent-magnetlinktest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
index bb9e3be..4807d95 100644 (file)
@@ -1,3 +1,3 @@
 set(rc4encryptortest_SRCS rc4encryptortest.cpp)
-kde4_add_unit_test(rc4encryptortest TESTNAME rc4encryptortest ${rc4encryptortest_SRCS})
-target_link_libraries( rc4encryptortest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-rc4encryptortest ${rc4encryptortest_SRCS})
+target_link_libraries(libktorrent-rc4encryptortest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
index 3990327..066e3dd 100644 (file)
@@ -1,7 +1,7 @@
 set(polltest_SRCS polltest.cpp)
-kde4_add_unit_test(polltest TESTNAME polltest ${polltest_SRCS})
-target_link_libraries( polltest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-polltest ${polltest_SRCS})
+target_link_libraries(libktorrent-polltest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(wakeuppipetest_SRCS wakeuppipetest.cpp)
-kde4_add_unit_test(wakeuppipetest TESTNAME wakeuppipetest ${wakeuppipetest_SRCS})
-target_link_libraries( wakeuppipetest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-wakeuppipetest ${wakeuppipetest_SRCS})
+target_link_libraries(libktorrent-wakeuppipetest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
index 7874460..70d48c1 100644 (file)
@@ -1,11 +1,11 @@
 set(superseedtest_SRCS superseedtest.cpp)
-kde4_add_unit_test(superseedtest TESTNAME superseedtest ${superseedtest_SRCS})
-target_link_libraries( superseedtest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-superseedtest ${superseedtest_SRCS})
+target_link_libraries(libktorrent-superseedtest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(packetreadertest_SRCS packetreadertest.cpp)
-kde4_add_unit_test(packetreadertest TESTNAME packetreadertest ${packetreadertest_SRCS})
-target_link_libraries(packetreadertest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-packetreadertest ${packetreadertest_SRCS})
+target_link_libraries(libktorrent-packetreadertest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(connectionlimittest_SRCS connectionlimittest.cpp)
-kde4_add_unit_test(connectionlimittest TESTNAME connectionlimittest ${connectionlimittest_SRCS})
-target_link_libraries(connectionlimittest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-connectionlimittest ${connectionlimittest_SRCS})
+target_link_libraries(libktorrent-connectionlimittest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
index 66ba576..44d531f 100644 (file)
@@ -1,13 +1,13 @@
 include_directories(${LIBKTORRENT_SOURCE_DIR})
 
 set(statsfiletest_SRCS statsfiletest.cpp)
-kde4_add_unit_test(statsfiletest TESTNAME statsfiletest ${statsfiletest_SRCS})
-target_link_libraries( statsfiletest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-statsfiletest ${statsfiletest_SRCS})
+target_link_libraries(libktorrent-statsfiletest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(torrentfilestreamtest_SRCS torrentfilestreamtest.cpp)
-kde4_add_unit_test(torrentfilestreamtest TESTNAME torrentfilestreamtest ${torrentfilestreamtest_SRCS})
-target_link_libraries( torrentfilestreamtest ${QT_QTTEST_LIBRARY} testlib ktorrent)
+kde4_add_test(libktorrent-torrentfilestreamtest ${torrentfilestreamtest_SRCS})
+target_link_libraries(libktorrent-torrentfilestreamtest ${QT_QTTEST_LIBRARY} testlib ktorrent)
 
 set(torrentfilestreammultitest_SRCS torrentfilestreammultitest.cpp)
-kde4_add_unit_test(torrentfilestreammultitest TESTNAME torrentfilestreammultitest ${torrentfilestreammultitest_SRCS})
-target_link_libraries( torrentfilestreammultitest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-torrentfilestreammultitest ${torrentfilestreammultitest_SRCS})
+target_link_libraries(libktorrent-torrentfilestreammultitest ${QT_QTTEST_LIBRARY} testlib ktorrent)
\ No newline at end of file
index 693c5f3..764bd4f 100644 (file)
@@ -1,21 +1,19 @@
 set(circularbuffertest_SRCS circularbuffertest.cpp)
-kde4_add_unit_test(circularbuffertest TESTNAME circularbuffertest ${circularbuffertest_SRCS})
-target_link_libraries( circularbuffertest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-circularbuffertest ${circularbuffertest_SRCS})
+target_link_libraries(libktorrent-circularbuffertest ${QT_QTTEST_LIBRARY} ktorrent)
 
-if(NOT MSVC)
 set(signalcatchertest_SRCS signalcatchertest.cpp)
-kde4_add_unit_test(signalcatchertest TESTNAME signalcatchertest ${signalcatchertest_SRCS})
-target_link_libraries( signalcatchertest ${QT_QTTEST_LIBRARY} ktorrent)
-endif(NOT MSVC)
+kde4_add_test(libktorrent-signalcatchertest ${signalcatchertest_SRCS})
+target_link_libraries(libktorrent-signalcatchertest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(resourcemanagertest_SRCS resourcemanagertest.cpp)
-kde4_add_unit_test(resourcemanagertest TESTNAME resourcemanagertest ${resourcemanagertest_SRCS})
-target_link_libraries( resourcemanagertest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-resourcemanagertest ${resourcemanagertest_SRCS})
+target_link_libraries(libktorrent-resourcemanagertest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(fileopstest_SRCS fileopstest.cpp)
-kde4_add_unit_test(fileopstest TESTNAME fileopstest ${fileopstest_SRCS})
-target_link_libraries( fileopstest ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-fileopstest ${fileopstest_SRCS})
+target_link_libraries(libktorrent-fileopstest ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(bufferpooltest_SRCS bufferpooltest.cpp)
-kde4_add_unit_test(bufferpooltest TESTNAME bufferpooltest ${bufferpooltest_SRCS})
-target_link_libraries( bufferpooltest ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-bufferpooltest ${bufferpooltest_SRCS})
+target_link_libraries(libktorrent-bufferpooltest ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
index cddb4a6..8c7af94 100644 (file)
@@ -1,47 +1,47 @@
 set(localwindowtest_SRCS localwindowtest.cpp)
-kde4_add_unit_test(localwindowtest TESTNAME localwindowtest ${localwindowtest_SRCS})
-target_link_libraries( localwindowtest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-localwindowtest ${localwindowtest_SRCS})
+target_link_libraries(libktorrent-localwindowtest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(remotewindowtest_SRCS remotewindowtest.cpp)
-kde4_add_unit_test(remotewindowtest TESTNAME remotewindowtest ${remotewindowtest_SRCS})
-target_link_libraries( remotewindowtest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-remotewindowtest ${remotewindowtest_SRCS})
+target_link_libraries(libktorrent-remotewindowtest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(connectiontest_SRCS connectiontest.cpp)
-kde4_add_unit_test(connectiontest TESTNAME connectiontest ${connectiontest_SRCS})
-target_link_libraries( connectiontest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-connectiontest ${connectiontest_SRCS})
+target_link_libraries(libktorrent-connectiontest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(sendtest_SRCS sendtest.cpp)
-kde4_add_unit_test(sendtest TESTNAME sendtest ${sendtest_SRCS})
-target_link_libraries( sendtest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-sendtest ${sendtest_SRCS})
+target_link_libraries(libktorrent-sendtest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(connecttest_SRCS connecttest.cpp)
-kde4_add_unit_test(connecttest TESTNAME connecttest ${connecttest_SRCS})
-target_link_libraries( connecttest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-connecttest ${connecttest_SRCS})
+target_link_libraries(libktorrent-connecttest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(transmittest_SRCS transmittest.cpp)
-kde4_add_unit_test(transmittest TESTNAME transmittest ${transmittest_SRCS})
-target_link_libraries( transmittest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-transmittest ${transmittest_SRCS})
+target_link_libraries(libktorrent-transmittest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(packetlosstest_SRCS packetlosstest.cpp)
-kde4_add_unit_test(packetlosstest TESTNAME packetlosstest ${packetlosstest_SRCS})
-target_link_libraries( packetlosstest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-packetlosstest ${packetlosstest_SRCS})
+target_link_libraries(libktorrent-packetlosstest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(fintest_SRCS fintest.cpp)
-kde4_add_unit_test(fintest TESTNAME fintest ${fintest_SRCS})
-target_link_libraries( fintest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-fintest ${fintest_SRCS})
+target_link_libraries(libktorrent-fintest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(sockettest_SRCS sockettest.cpp)
-kde4_add_unit_test(sockettest TESTNAME sockettest ${sockettest_SRCS})
-target_link_libraries( sockettest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-sockettest ${sockettest_SRCS})
+target_link_libraries(libktorrent-sockettest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(utppolltest_SRCS utppolltest.cpp)
-kde4_add_unit_test(utppolltest TESTNAME utppolltest ${utppolltest_SRCS})
-target_link_libraries( utppolltest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-utppolltest ${utppolltest_SRCS})
+target_link_libraries(libktorrent-utppolltest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(delaywindowtest_SRCS delaywindowtest.cpp)
-kde4_add_unit_test(delaywindowtest TESTNAME delaywindowtest ${delaywindowtest_SRCS})
-target_link_libraries( delaywindowtest ${QT_QTTEST_LIBRARY} ktorrent)
+kde4_add_test(libktorrent-delaywindowtest ${delaywindowtest_SRCS})
+target_link_libraries(libktorrent-delaywindowtest ${QT_QTTEST_LIBRARY} ktorrent)
 
 set(packetbuffertest_SRCS packetbuffertest.cpp)
-kde4_add_unit_test(packetbuffertest TESTNAME packetbuffertest ${packetbuffertest_SRCS})
-target_link_libraries( packetbuffertest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
+kde4_add_test(libktorrent-packetbuffertest ${packetbuffertest_SRCS})
+target_link_libraries(libktorrent-packetbuffertest ${QT_QTTEST_LIBRARY} ktorrent)
\ No newline at end of file
index 7fdd0be..f5651b2 100644 (file)
@@ -2,38 +2,38 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
 
-kde4_add_unit_test( shelltest shelltest.cpp ../shell/shellutils.cpp )
-target_link_libraries( shelltest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+kde4_add_test(okular-shelltest shelltest.cpp ../shell/shellutils.cpp )
+target_link_libraries(okular-shelltest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
 
-kde4_add_unit_test( parttest parttest.cpp )
-target_link_libraries( parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
+kde4_add_test(okular-parttest parttest.cpp )
+target_link_libraries(okular-parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
 
-kde4_add_unit_test( documenttest documenttest.cpp )
-target_link_libraries( documenttest ${KDE4_KDECORE_LIBS} ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
+kde4_add_test(okular-documenttest documenttest.cpp )
+target_link_libraries(okular-documenttest ${KDE4_KDECORE_LIBS} ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
 
-kde4_add_unit_test( searchtest searchtest.cpp )
-target_link_libraries( searchtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
+kde4_add_test(okular-searchtest searchtest.cpp )
+target_link_libraries(okular-searchtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
 
-kde4_add_unit_test( annotationstest annotationstest.cpp )
-target_link_libraries( annotationstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
+kde4_add_test(okular-annotationstest annotationstest.cpp )
+target_link_libraries(okular-annotationstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
 
-kde4_add_unit_test( urldetecttest urldetecttest.cpp )
-target_link_libraries( urldetecttest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+kde4_add_test(okular-urldetecttest urldetecttest.cpp )
+target_link_libraries(okular-urldetecttest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
 
-kde4_add_unit_test( editannotationcontentstest editannotationcontentstest.cpp testingutils.cpp)
-target_link_libraries( editannotationcontentstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+kde4_add_test(okular-editannotationcontentstest editannotationcontentstest.cpp testingutils.cpp)
+target_link_libraries(okular-editannotationcontentstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
-kde4_add_unit_test( addremoveannotationtest addremoveannotationtest.cpp testingutils.cpp)
-target_link_libraries( addremoveannotationtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+kde4_add_test(okular-addremoveannotationtest addremoveannotationtest.cpp testingutils.cpp)
+target_link_libraries(okular-addremoveannotationtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
-kde4_add_unit_test( translateannotationtest translateannotationtest.cpp testingutils.cpp)
-target_link_libraries( translateannotationtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+kde4_add_test(okular-translateannotationtest translateannotationtest.cpp testingutils.cpp)
+target_link_libraries(okular-translateannotationtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
-kde4_add_unit_test( modifyannotationpropertiestest modifyannotationpropertiestest.cpp testingutils.cpp)
-target_link_libraries( modifyannotationpropertiestest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+kde4_add_test(okular-modifyannotationpropertiestest modifyannotationpropertiestest.cpp testingutils.cpp)
+target_link_libraries(okular-modifyannotationpropertiestest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
-kde4_add_unit_test( editformstest editformstest.cpp )
-target_link_libraries( editformstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+kde4_add_test(okular-editformstest editformstest.cpp )
+target_link_libraries(okular-editformstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
-kde4_add_unit_test( mainshelltest mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp )
-target_link_libraries( mainshelltest ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY} okularpart okularcore )
+kde4_add_test(okular-mainshelltest mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp )
+target_link_libraries(okular-mainshelltest ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY} okularpart okularcore )
index 3274f1d..c6875fd 100644 (file)
@@ -10,27 +10,27 @@ include_directories(
 set(testlibsyndication_SRCS testlibsyndication.cpp )
 
 
-add_executable(testlibsyndication NOGUI TEST ${testlibsyndication_SRCS})
+kde4_add_manual_test(testlibsyndication ${testlibsyndication_SRCS})
 
-target_link_libraries(testlibsyndication  syndication ${KDE4_KDECORE_LIBS} )
+target_link_libraries(testlibsyndication syndication ${KDE4_KDECORE_LIBS} )
 
 ########### next target ###############
 
 set(testloader_SRCS testloader.cpp )
 
 
-add_executable(testloader TEST ${testloader_SRCS})
+kde4_add_manual_test(testloader ${testloader_SRCS})
 
-target_link_libraries(testloader  syndication ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} )
+target_link_libraries(testloader syndication ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} )
 
 ########### next target ###############
 
 set(testpersonimpl_SRCS testpersonimpl.cpp )
 
 
-kde4_add_unit_test(testpersonimpl TESTNAME libsyndication-testpersonimpl  ${testpersonimpl_SRCS})
+kde4_add_test(syndication-testpersonimpl  ${testpersonimpl_SRCS})
 
-target_link_libraries(testpersonimpl  syndication ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+target_link_libraries(syndication-testpersonimpl syndication ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
 
 ########### next target ###############