[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kget
From:       Matthias Fuchs <mat69 () gmx ! net>
Date:       2011-03-15 21:07:48
Message-ID: 20110315210748.1A49AAC8C7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1224999 by mfuchs:

Moves all testing information to the tests directory.

 M  +0 -25     CMakeLists.txt  
 M  +1 -1      core/kget.h  
 M  +1 -1      core/transfergrouphandler.h  
 M  +1 -1      core/transfertreemodel.h  
 D             kget-test.xml  
 M  +2 -2      mainwindow.cpp  
 M  +26 -13    tests/CMakeLists.txt  
 A             tests/kget-test.xml   kget-test.xml#1224970
 M  +3 -3      tests/testkget.cpp  
 M  +3 -3      tests/testtransfers.cpp  


--- trunk/KDE/kdenetwork/kget/CMakeLists.txt #1224998:1224999
@@ -139,8 +139,6 @@
 
 qt4_add_dbus_adaptor(kgetcore_SRCS dbus/org.kde.kget.transfer.xml \
dbus/dbustransferwrapper.h DBusTransferWrapper)  qt4_add_dbus_adaptor(kgetcore_SRCS \
                dbus/org.kde.kget.verifier.xml dbus/dbusverifierwrapper.h \
                DBusVerifierWrapper)
-qt4_add_dbus_interface(kget_test_transfers_SRCS dbus/org.kde.kget.transfer.xml \
                transfer_interface)
-# qt4_add_dbus_interface(kget_test_transfers_SRCS dbus/org.kde.kget.verfier.xml \
verifier_interface)  
 
 kde4_add_library(kgetcore SHARED ${kgetcore_SRCS})
@@ -221,30 +219,7 @@
 )
 
 qt4_add_dbus_adaptor(kget_SRCS dbus/org.kde.kget.main.xml dbus/dbuskgetwrapper.h \
                DBusKGetWrapper)
-qt4_add_dbus_interface(kget_test_transfers_SRCS dbus/org.kde.kget.main.xml \
kget_interface)  
-if(CMAKE_BUILD_TYPE MATCHES debugfull)
-    ENABLE_TESTING()
-
-    set(kget_SRCS
-        ${kget_SRCS}
-        tests/testkget.cpp
-    )
-
-    set(kget_test_transfers_SRCS
-        tests/testtransfers.cpp
-    )
-
-    qt4_add_dbus_interface(kget_test_transfers_SRCS dbus/org.kde.kget.main.xml \
                kget_interface)
-    qt4_add_dbus_interface(kget_test_transfers_SRCS dbus/org.kde.kget.transfer.xml \
                transfer_interface)
-    qt4_add_dbus_interface(kget_test_transfers_SRCS dbus/org.kde.kget.verifier.xml \
                verifier_interface)
-
-    kde4_add_unit_test(kget_test_transfers
-        ${kget_test_transfers_SRCS})
-
-    target_link_libraries(kget_test_transfers ${QT_QTTEST_LIBRARY} \
                ${KDE4_KDEUI_LIBRARY} ${KDE4_KIO_LIBRARY} ${KDE4_KUTILS_LIBRARY} \
                kgetcore)
-endif(CMAKE_BUILD_TYPE MATCHES debugfull)
-
 kde4_add_ui_files(kget_SRCS
    conf/dlgadvanced.ui
    conf/dlgappearance.ui
--- trunk/KDE/kdenetwork/kget/core/kget.h #1224998:1224999
@@ -28,7 +28,7 @@
 
 #include "kuiserverjobs.h"
 #include "scheduler.h"
-#include "kget_export.h"
+#include "../kget_export.h"
 #include "transfer.h"
 #include "transfergrouphandler.h"
 
--- trunk/KDE/kdenetwork/kget/core/transfergrouphandler.h #1224998:1224999
@@ -16,7 +16,7 @@
 
 #include "handler.h"
 #include "transfergroup.h"
-#include "kget_export.h"
+#include "../kget_export.h"
 #include "kget.h"
 
 class QAction;
--- trunk/KDE/kdenetwork/kget/core/transfertreemodel.h #1224998:1224999
@@ -16,7 +16,7 @@
 #include <QStandardItemModel>
 #include <QList>
 
-#include <kget_export.h>
+#include "../kget_export.h"
 #include "core/transfer.h"
 #include "core/transfergroup.h"
 #include "core/handler.h"
--- trunk/KDE/kdenetwork/kget/mainwindow.cpp #1224998:1224999
@@ -34,7 +34,7 @@
 #include "ui/linkview/kget_linkview.h"
 #include "ui/metalinkcreator/metalinkcreator.h"
 #include "extensions/webinterface/httpserver.h"
-#ifdef DEBUG
+#ifdef DO_KGET_TEST
     #include "tests/testkget.h"
 #endif
 
@@ -425,7 +425,7 @@
     connect(KGet::model(), SIGNAL(groupsChangedEvent(QMap<TransferGroupHandler *, \
                TransferGroup::ChangesFlags>)),
                            SLOT(slotGroupsChanged(QMap<TransferGroupHandler *, \
TransferGroup::ChangesFlags>)));  
-#ifdef DEBUG
+#ifdef DO_KGET_TEST
     if (m_doTesting)
     {
         // Unit testing
--- trunk/KDE/kdenetwork/kget/tests/CMakeLists.txt #1224998:1224999
@@ -1,19 +1,32 @@
-set(verifiertest_SRCS
-    verifiertest.cpp
+include_directories(
+   ../
 )
 
+#===========KGet===========
+if(CMAKE_BUILD_TYPE MATCHES debugfull)
+    ENABLE_TESTING()
+
+    add_definitions(-DDO_KGET_TEST)
+    set(kget_test_transfers_SRCS
+        testkget.cpp
+        testtransfers.cpp
+    )
+
+    qt4_add_dbus_interface(kget_test_transfers_SRCS ../dbus/org.kde.kget.main.xml \
kget_interface) +    qt4_add_dbus_interface(kget_test_transfers_SRCS \
../dbus/org.kde.kget.transfer.xml transfer_interface) +    \
qt4_add_dbus_interface(kget_test_transfers_SRCS ../dbus/org.kde.kget.verifier.xml \
verifier_interface) +
+    kde4_add_unit_test(kget_test_transfers
+        ${kget_test_transfers_SRCS})
+
+    target_link_libraries(kget_test_transfers ${QT_QTTEST_LIBRARY} kgetcore)
+endif(CMAKE_BUILD_TYPE MATCHES debugfull)
+
+
+#===========Verifier===========
 kde4_add_unit_test(verifiertest
   TESTNAME kget-verifiertest
-  ${verifiertest_SRCS}
+  verifiertest.cpp
 )
 
-target_link_libraries(verifiertest kgetcore ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} \
                ${QT_QTTEST_LIBRARY})
-
-if (QCA2_FOUND)
-    target_link_libraries(verifiertest ${QCA2_LIBRARIES})
-endif (QCA2_FOUND)
-
-if (QGPGME_FOUND)
-    target_link_libraries(verifiertest ${QGPGME_LIBRARIES})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-endif(QGPGME_FOUND)
+target_link_libraries(verifiertest ${QT_QTTEST_LIBRARY} kgetcore)
--- trunk/KDE/kdenetwork/kget/tests/testkget.cpp #1224998:1224999
@@ -9,9 +9,9 @@
 */
 
 #include "testkget.h"
-#include "transfergrouphandler.h"
-#include "kget.h"
-#include "transfertreemodel.h"
+#include "core/transfergrouphandler.h"
+#include "core/kget.h"
+#include "core/transfertreemodel.h"
 
 TestKGet::TestKGet()
     : QObject(0),
--- trunk/KDE/kdenetwork/kget/tests/testtransfers.cpp #1224998:1224999
@@ -10,9 +10,9 @@
 */
 
 #include "testtransfers.h"
-#include "transfergrouphandler.h"
-#include "transferhandler.h"
-#include "kget.h"
+#include "core/transfergrouphandler.h"
+#include "core/transferhandler.h"
+#include "core/kget.h"
 
 #include "kget_interface.h"
 #include "transfer_interface.h"


[prev in list] [next in list] [prev in thread] [next in thread]