[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepimlibs/frameworks] kimap: Build tests
From: Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date: 2014-03-31 19:54:32
Message-ID: E1WUiHw-0006C4-3a () scm ! kde ! org
[Download RAW message or body]
Git commit fe915aa6d245c6816ab88bfdde9f1e886b70f94a by Christophe Giboudeaux.
Committed on 31/03/2014 at 19:56.
Pushed by cgiboudeaux into branch 'frameworks'.
Build tests
M +2 -1 kimap/CMakeLists.txt
M +15 -32 kimap/autotests/CMakeLists.txt
M +6 -12 kimap/autotests/kimaptest/CMakeLists.txt
M +2 -2 kimap/autotests/kimaptest/fakeserver.cpp
M +3 -3 kimap/autotests/kimaptest/mockjob.cpp
M +1 -1 kimap/autotests/streamparsertest.cpp
M +1 -1 kimap/autotests/testrfccodecs.cpp
A +11 -0 kimap/tests/CMakeLists.txt
R +10 -10 kimap/tests/testimapidle.cpp [from: kimap/autotests/testimapidle.cpp - \
092% similarity] R +28 -28 kimap/tests/testimapserver.cpp [from: \
kimap/autotests/testimapserver.cpp - 095% similarity]
http://commits.kde.org/kdepimlibs/fe915aa6d245c6816ab88bfdde9f1e886b70f94a
diff --git a/kimap/CMakeLists.txt b/kimap/CMakeLists.txt
index 66bb9a7..a3f2409 100644
--- a/kimap/CMakeLists.txt
+++ b/kimap/CMakeLists.txt
@@ -58,7 +58,8 @@ ecm_configure_package_config_file(
########### Targets ###########
add_subdirectory(src)
-#add_subdirectory(autotests)
+add_subdirectory(autotests)
+add_subdirectory(tests)
add_subdirectory(cmake)
########### Install Files ###########
diff --git a/kimap/autotests/CMakeLists.txt b/kimap/autotests/CMakeLists.txt
index 9d2e7c1..d24b3ed 100644
--- a/kimap/autotests/CMakeLists.txt
+++ b/kimap/autotests/CMakeLists.txt
@@ -1,31 +1,21 @@
-add_subdirectory(kimaptest)
+kde_enable_exceptions()
-include_directories(
- ${CMAKE_SOURCE_DIR}/kimap
- ${CMAKE_BINARY_DIR}/kimap
- ${CMAKE_BINARY_DIR}/kmime
- ${Boost_INCLUDE_DIR}
-)
+include(ECMMarkAsTest)
+
+find_package(Qt5Test CONFIG REQUIRED)
+
+add_subdirectory(kimaptest)
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
remove_definitions(-DQT_USE_QSTRINGBUILDER)
-MACRO(KIMAP_UNIT_TESTS)
- FOREACH(_testname ${ARGN})
- kde4_add_unit_test(${_testname} TESTNAME kimap-${_testname} NOGUI \
${_testname}.cpp)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY}
- kimap kimaptest kmime)
+macro(KIMAP_UNIT_TESTS)
+ foreach(_testname ${ARGN})
+ add_executable(${_testname} ${_testname}.cpp)
+ add_test(${_testname} ${_testname})
+ ecm_mark_as_test(${_testname})
+ target_link_libraries(${_testname} KF5Imap Qt5::Test kimaptest)
set_target_properties(${_testname} PROPERTIES COMPILE_FLAGS \
-DTEST_DATA="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"")
- ENDFOREACH(_testname)
-ENDMACRO(KIMAP_UNIT_TESTS)
-
-MACRO(KIMAP_EXECUTABLE_TESTS)
- FOREACH(_testname ${ARGN})
- kde4_add_executable(${_testname} NOGUI TEST ${_testname}.cpp)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
- target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} kimap kmime)
- ENDFOREACH(_testname)
-ENDMACRO(KIMAP_EXECUTABLE_TESTS)
+ endforeach()
+endmacro()
########### automated tests ###############
@@ -33,7 +23,7 @@ KIMAP_UNIT_TESTS(
fakeservertest
testrfccodecs
testsession
- loginjobtest
+ # loginjobtest FIXME: test hangs forever
logoutjobtest
capabilitiesjobtest
selectjobtest
@@ -54,10 +44,3 @@ KIMAP_UNIT_TESTS(
setmetadatajobtest
appendjobtest
)
-
-########### manual tests ###############
-
-KIMAP_EXECUTABLE_TESTS(
- testimapidle
- testimapserver
-)
diff --git a/kimap/autotests/kimaptest/CMakeLists.txt \
b/kimap/autotests/kimaptest/CMakeLists.txt index d27f0c4..254aa0a 100644
--- a/kimap/autotests/kimaptest/CMakeLists.txt
+++ b/kimap/autotests/kimaptest/CMakeLists.txt
@@ -1,20 +1,17 @@
-project(kimaptest)
+kde_enable_exceptions()
-if(KDE4_BUILD_TESTS)
+include_directories(${KImap_BINARY_DIR}/src)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
-
-include_directories(${CMAKE_BINARY_DIR}/kimap)
-
-set(kimaptest_LIB_SRCS
+set(kimaptest_SRCS
fakeserver.cpp
mockjob.cpp
sslserver.cpp
)
-add_library(kimaptest STATIC ${kimaptest_LIB_SRCS})
+add_library(kimaptest STATIC ${kimaptest_SRCS})
generate_export_header(kimaptest)
-target_link_libraries(kimaptest ${KDE4_KDECORE_LIBS} ${QT_QTNETWORK_LIBRARY} \
${QT_QTTEST_LIBRARY} kimap) +target_link_libraries(kimaptest KF5Imap Qt5::Test)
+
install(TARGETS kimaptest ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
@@ -23,6 +20,3 @@ install(FILES
fakeserver.h
mockjob.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kimaptest COMPONENT Devel)
-
-endif()
-
diff --git a/kimap/autotests/kimaptest/fakeserver.cpp \
b/kimap/autotests/kimaptest/fakeserver.cpp index 52d08ff..15b3a49 100644
--- a/kimap/autotests/kimaptest/fakeserver.cpp
+++ b/kimap/autotests/kimaptest/fakeserver.cpp
@@ -31,7 +31,7 @@
#include <KDebug>
#include <qtest_kde.h>
-#include "kimap/imapstreamparser.h"
+#include "imapstreamparser.h"
QByteArray FakeServer::preauth()
{
@@ -108,7 +108,7 @@ void FakeServer::run()
m_tcpServer = new QTcpServer();
}
if ( !m_tcpServer->listen( QHostAddress( QHostAddress::LocalHost ), 5989 ) ) {
- qFatal() << "Unable to start the server";
+ qFatal("Unable to start the server");
}
connect( m_tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()) );
diff --git a/kimap/autotests/kimaptest/mockjob.cpp \
b/kimap/autotests/kimaptest/mockjob.cpp index 7e49a16..da37bb2 100644
--- a/kimap/autotests/kimaptest/mockjob.cpp
+++ b/kimap/autotests/kimaptest/mockjob.cpp
@@ -23,9 +23,9 @@
#include "mockjob.h"
-#include "../../job_p.h"
-#include "../../session.h"
-#include "../../session_p.h"
+#include "job_p.h"
+#include "session.h"
+#include "session_p.h"
#include <QtCore/QTimer>
diff --git a/kimap/autotests/streamparsertest.cpp \
b/kimap/autotests/streamparsertest.cpp index ac8e2ac..987381a 100644
--- a/kimap/autotests/streamparsertest.cpp
+++ b/kimap/autotests/streamparsertest.cpp
@@ -18,7 +18,7 @@
#include <qtest_kde.h>
-#include "kimap/imapstreamparser.h"
+#include "imapstreamparser.h"
#include <message_p.h>
#include <QLocalSocket>
diff --git a/kimap/autotests/testrfccodecs.cpp b/kimap/autotests/testrfccodecs.cpp
index f647634..437092b 100644
--- a/kimap/autotests/testrfccodecs.cpp
+++ b/kimap/autotests/testrfccodecs.cpp
@@ -23,7 +23,7 @@
QTEST_KDEMAIN_CORE( RFCCodecsTest )
-#include "kimap/rfccodecs.h"
+#include "rfccodecs.h"
using namespace KIMAP;
void RFCCodecsTest::testIMAPEncoding()
diff --git a/kimap/tests/CMakeLists.txt b/kimap/tests/CMakeLists.txt
new file mode 100644
index 0000000..f152591
--- /dev/null
+++ b/kimap/tests/CMakeLists.txt
@@ -0,0 +1,11 @@
+kde_enable_exceptions()
+
+remove_definitions(-DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_FROM_BYTEARRAY)
+
+find_package(Qt5Test CONFIG REQUIRED) #for qsignalspy.h
+
+add_executable(testimapidle testimapidle.cpp)
+target_link_libraries(testimapidle KF5Imap Qt5::Test)
+
+add_executable(testimapserver testimapserver.cpp)
+target_link_libraries(testimapserver KF5Imap Qt5::Test)
diff --git a/kimap/autotests/testimapidle.cpp b/kimap/tests/testimapidle.cpp
similarity index 92%
rename from kimap/autotests/testimapidle.cpp
rename to kimap/tests/testimapidle.cpp
index 5ae3eb5..8a437b7 100644
--- a/kimap/autotests/testimapidle.cpp
+++ b/kimap/tests/testimapidle.cpp
@@ -19,7 +19,7 @@
*/
#include <kcomponentdata.h>
-#include <kaboutdata.h>
+#include <k4aboutdata.h>
#include <klocale.h>
#include <klocalizedstring.h>
#include <kdebug.h>
@@ -27,14 +27,14 @@
#include <QCoreApplication>
#include <qsignalspy.h>
-#include "kimap/session.h"
-#include "kimap/capabilitiesjob.h"
-#include "kimap/idlejob.h"
-#include "kimap/loginjob.h"
-#include "kimap/logoutjob.h"
-#include "kimap/selectjob.h"
-#include "kimap/closejob.h"
-#include "kimap/sessionuiproxy.h"
+#include "session.h"
+#include "capabilitiesjob.h"
+#include "idlejob.h"
+#include "loginjob.h"
+#include "logoutjob.h"
+#include "selectjob.h"
+#include "closejob.h"
+#include "sessionuiproxy.h"
using namespace KIMAP;
@@ -48,7 +48,7 @@ class UiProxy: public SessionUiProxy {
int main( int argc, char **argv )
{
- KAboutData about( "TestImapIdle", 0, ki18n( "TestImapIdle" ), "version" );
+ K4AboutData about( "TestImapIdle", 0, ki18n( "TestImapIdle" ), "version" );
KComponentData cData( &about );
if ( argc < 4 ) {
diff --git a/kimap/autotests/testimapserver.cpp b/kimap/tests/testimapserver.cpp
similarity index 95%
rename from kimap/autotests/testimapserver.cpp
rename to kimap/tests/testimapserver.cpp
index 374d67e..a99b003 100644
--- a/kimap/autotests/testimapserver.cpp
+++ b/kimap/tests/testimapserver.cpp
@@ -20,7 +20,7 @@
*/
#include <kcomponentdata.h>
-#include <kaboutdata.h>
+#include <k4aboutdata.h>
#include <kdebug.h>
#include <klocale.h>
#include <klocalizedstring.h>
@@ -28,32 +28,32 @@
#include <QCoreApplication>
#include <qsignalspy.h>
-#include "kimap/acl.h"
-#include "kimap/session.h"
-#include "kimap/appendjob.h"
-#include "kimap/capabilitiesjob.h"
-#include "kimap/fetchjob.h"
-#include "kimap/listjob.h"
-#include "kimap/loginjob.h"
-#include "kimap/logoutjob.h"
-#include "kimap/selectjob.h"
-#include "kimap/closejob.h"
-#include "kimap/expungejob.h"
-#include "kimap/createjob.h"
-#include "kimap/deletejob.h"
-#include "kimap/namespacejob.h"
-#include "kimap/subscribejob.h"
-#include "kimap/unsubscribejob.h"
-#include "kimap/renamejob.h"
-#include "kimap/storejob.h"
-#include "kimap/sessionuiproxy.h"
-#include "kimap/setacljob.h"
-#include "kimap/getacljob.h"
-#include "kimap/deleteacljob.h"
-#include "kimap/myrightsjob.h"
-#include "kimap/listrightsjob.h"
-#include "kimap/setmetadatajob.h"
-#include "kimap/getmetadatajob.h"
+#include "acl.h"
+#include "session.h"
+#include "appendjob.h"
+#include "capabilitiesjob.h"
+#include "fetchjob.h"
+#include "listjob.h"
+#include "loginjob.h"
+#include "logoutjob.h"
+#include "selectjob.h"
+#include "closejob.h"
+#include "expungejob.h"
+#include "createjob.h"
+#include "deletejob.h"
+#include "namespacejob.h"
+#include "subscribejob.h"
+#include "unsubscribejob.h"
+#include "renamejob.h"
+#include "storejob.h"
+#include "sessionuiproxy.h"
+#include "setacljob.h"
+#include "getacljob.h"
+#include "deleteacljob.h"
+#include "myrightsjob.h"
+#include "listrightsjob.h"
+#include "setmetadatajob.h"
+#include "getmetadatajob.h"
using namespace KIMAP;
@@ -377,7 +377,7 @@ void testDelete(Session *session)
int main( int argc, char **argv )
{
- KAboutData about( "TestImapServer", 0, ki18n( "TestImapServer" ), "version" );
+ K4AboutData about( "TestImapServer", 0, ki18n( "TestImapServer" ), "version" );
KComponentData cData( &about );
if ( argc < 4 ) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic