From 723a8850299e2732a4ace01f12a50f6b7e78561c Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 26 Feb 2010 11:20:16 +0100 Subject: Fixing scripts and tests to start reloading them.. --- src/tests/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/tests/CMakeLists.txt') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 5df23e24..18de9299 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -20,13 +20,13 @@ target_link_libraries( tabbar_test ##### ------------- mainview test -kde4_add_unit_test( mainview_test mainview_test.cpp ) - -target_link_libraries( mainview_test - kdeinit_rekonq - ${KDE4_KDECORE_LIBS} - ${KDE4_KDEUI_LIBS} - ${QT_QTTEST_LIBRARY} -) +# kde4_add_unit_test( mainview_test mainview_test.cpp ) +# +# target_link_libraries( mainview_test +# kdeinit_rekonq +# ${KDE4_KDECORE_LIBS} +# ${KDE4_KDEUI_LIBS} +# ${QT_QTTEST_LIBRARY} +# ) ############################################################ -- cgit v1.2.1 From 0f1dfeac60cdf35e44838b1323d98db8383738c7 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 27 Feb 2010 15:29:58 +0100 Subject: New (embrional) unit tests: mainview, tabbar, webtab, webpage --- src/tests/CMakeLists.txt | 49 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-) (limited to 'src/tests/CMakeLists.txt') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 18de9299..ccb25551 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -2,7 +2,14 @@ SET( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) -INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR}/.. +INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_SOURCE_DIR}/../adblock + ${CMAKE_CURRENT_SOURCE_DIR}/../bookmarks + ${CMAKE_CURRENT_SOURCE_DIR}/../history + ${CMAKE_CURRENT_SOURCE_DIR}/../rekonqpage + ${CMAKE_CURRENT_SOURCE_DIR}/../settings + ${CMAKE_CURRENT_SOURCE_DIR}/../urlbar ${KDE4_INCLUDES} ${QT4_INCLUDES} ) @@ -20,13 +27,37 @@ target_link_libraries( tabbar_test ##### ------------- mainview test -# kde4_add_unit_test( mainview_test mainview_test.cpp ) -# -# target_link_libraries( mainview_test -# kdeinit_rekonq -# ${KDE4_KDECORE_LIBS} -# ${KDE4_KDEUI_LIBS} -# ${QT_QTTEST_LIBRARY} -# ) +kde4_add_unit_test( mainview_test mainview_test.cpp ) + +target_link_libraries( mainview_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- webpage test + +kde4_add_unit_test( webpage_test webpage_test.cpp ) + +target_link_libraries( webpage_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- webtab test + +kde4_add_unit_test( webtab_test webtab_test.cpp ) + +target_link_libraries( webtab_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTTEST_LIBRARY} +) ############################################################ -- cgit v1.2.1 From d897ce42be8375ffab89615ab3953b8bd3ab3bbc Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 28 Feb 2010 12:22:25 +0100 Subject: All the other (blank) tests.. --- src/tests/CMakeLists.txt | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) (limited to 'src/tests/CMakeLists.txt') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index ccb25551..cdeea5ee 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -14,11 +14,22 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} ${QT4_INCLUDES} ) -##### ------------- tabbar test +##### ------------- findbar test -kde4_add_unit_test( tabbar_test tabbar_test.cpp ) +kde4_add_unit_test( findbar_test findbar_test.cpp ) -target_link_libraries( tabbar_test +target_link_libraries( findbar_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- mainwindow test + +kde4_add_unit_test( mainwindow_test mainwindow_test.cpp ) + +target_link_libraries( mainwindow_test kdeinit_rekonq ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} @@ -36,6 +47,62 @@ target_link_libraries( mainview_test ${QT_QTTEST_LIBRARY} ) +##### ------------- networkaccessmanager test + +kde4_add_unit_test( networkaccessmanager_test networkaccessmanager_test.cpp ) + +target_link_libraries( networkaccessmanager_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- protocolhandler test + +kde4_add_unit_test( protocolhandler_test protocolhandler_test.cpp ) + +target_link_libraries( protocolhandler_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- sessionmanager test + +kde4_add_unit_test( sessionmanager_test sessionmanager_test.cpp ) + +target_link_libraries( sessionmanager_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- tabbar test + +kde4_add_unit_test( tabbar_test tabbar_test.cpp ) + +target_link_libraries( tabbar_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${QT_QTTEST_LIBRARY} +) + +##### ------------- walletbar test + +kde4_add_unit_test( walletbar_test walletbar_test.cpp ) + +target_link_libraries( walletbar_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTTEST_LIBRARY} +) + ##### ------------- webpage test kde4_add_unit_test( webpage_test webpage_test.cpp ) @@ -48,6 +115,18 @@ target_link_libraries( webpage_test ${QT_QTTEST_LIBRARY} ) +##### ------------- websnap test + +kde4_add_unit_test( websnap_test websnap_test.cpp ) + +target_link_libraries( websnap_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTTEST_LIBRARY} +) + ##### ------------- webtab test kde4_add_unit_test( webtab_test webtab_test.cpp ) @@ -60,4 +139,16 @@ target_link_libraries( webtab_test ${QT_QTTEST_LIBRARY} ) +##### ------------- webview test + +kde4_add_unit_test( webview_test webview_test.cpp ) + +target_link_libraries( webview_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTTEST_LIBRARY} +) + ############################################################ -- cgit v1.2.1 From e5e4ffa0e844c4f1cbe40eeaa309c4711c1073e6 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 28 Feb 2010 17:05:37 +0100 Subject: 10 (of 12) tests working and ready to be "expanded".. --- src/tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tests/CMakeLists.txt') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index cdeea5ee..0230a5ce 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -22,6 +22,7 @@ target_link_libraries( findbar_test kdeinit_rekonq ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} + ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ) -- cgit v1.2.1 From edea0f2fc34738de52a58f00c676e814f7a8c2fd Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 28 Feb 2010 23:58:31 +0100 Subject: First works on new Unit Tests.. --- src/tests/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tests/CMakeLists.txt') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 0230a5ce..e05a056b 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -67,6 +67,7 @@ target_link_libraries( protocolhandler_test kdeinit_rekonq ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} ${QT_QTTEST_LIBRARY} ) -- cgit v1.2.1 From a708a0e447af81412599ec16e8d47e06dc584eb0 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 20 Apr 2010 16:43:10 +0200 Subject: New (empty) urlbar test and improved protocolhandler test --- src/tests/CMakeLists.txt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src/tests/CMakeLists.txt') diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index e05a056b..3bc9a27f 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../adblock ${CMAKE_CURRENT_SOURCE_DIR}/../bookmarks ${CMAKE_CURRENT_SOURCE_DIR}/../history - ${CMAKE_CURRENT_SOURCE_DIR}/../rekonqpage ${CMAKE_CURRENT_SOURCE_DIR}/../settings ${CMAKE_CURRENT_SOURCE_DIR}/../urlbar ${KDE4_INCLUDES} @@ -68,6 +67,7 @@ target_link_libraries( protocolhandler_test ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ) @@ -153,4 +153,16 @@ target_link_libraries( webview_test ${QT_QTTEST_LIBRARY} ) +##### ------------- urlbar test + +kde4_add_unit_test( urlbar_test urlbar_test.cpp ) + +target_link_libraries( urlbar_test + kdeinit_rekonq + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEUI_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QT_QTTEST_LIBRARY} +) + ############################################################ -- cgit v1.2.1