Port tests to the new build system

39 files changed, 56 insertions, 157 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 00000000..bd2fc16a
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,50 @@
+include_directories(.)
+
+find_package(Qt5 REQUIRED COMPONENTS Test)
+
+macro(add_simple_test TEST_NAME)
+    add_executable(tst_${TEST_NAME} ${TEST_NAME}/tst_${TEST_NAME}.cpp)
+    add_test(tst_${TEST_NAME} tst_${TEST_NAME})
+    target_link_libraries(tst_${TEST_NAME} Qt5::Test qxmpp)
+endmacro()
+
+include_directories(../src/base)
+include_directories(../src/client)
+include_directories(../src/server)
+
+add_simple_test(qxmpparchiveiq)
+add_simple_test(qxmppbindiq)
+add_simple_test(qxmppcallmanager)
+add_simple_test(qxmppcarbonmanager)
+add_simple_test(qxmppcodec)
+add_simple_test(qxmppdataform)
+add_simple_test(qxmppdiscoveryiq)
+add_simple_test(qxmppentitytimeiq)
+add_simple_test(qxmppiceconnection)
+add_simple_test(qxmppiq)
+add_simple_test(qxmppjingleiq)
+add_simple_test(qxmppmammanager)
+add_simple_test(qxmppmessage)
+add_simple_test(qxmppnonsaslauthiq)
+add_simple_test(qxmpppresence)
+add_simple_test(qxmpppubsubiq)
+add_simple_test(qxmppregisteriq)
+add_simple_test(qxmppresultset)
+add_simple_test(qxmpprosteriq)
+add_simple_test(qxmpprpciq)
+add_simple_test(qxmpprtcppacket)
+add_simple_test(qxmpprtppacket)
+add_simple_test(qxmppsasl)
+add_simple_test(qxmppserver)
+add_simple_test(qxmppsessioniq)
+add_simple_test(qxmppsocks)
+add_simple_test(qxmppstanza)
+add_simple_test(qxmppstreamfeatures)
+add_simple_test(qxmppstreaminitiationiq)
+add_simple_test(qxmppstunmessage)
+add_simple_test(qxmppvcardiq)
+add_simple_test(qxmppversioniq)
+
+add_subdirectory(qxmpptransfermanager)
+add_subdirectory(qxmpputils)
+
diff --git a/tests/qxmpparchiveiq/qxmpparchiveiq.pro b/tests/qxmpparchiveiq/qxmpparchiveiq.pro
deleted file mode 100644
index 53b38e14..00000000
--- a/tests/qxmpparchiveiq/qxmpparchiveiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpparchiveiq
-SOURCES += tst_qxmpparchiveiq.cpp
diff --git a/tests/qxmppbindiq/qxmppbindiq.pro b/tests/qxmppbindiq/qxmppbindiq.pro
deleted file mode 100644
index 8e5d580f..00000000
--- a/tests/qxmppbindiq/qxmppbindiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppbindiq
-SOURCES += tst_qxmppbindiq.cpp
diff --git a/tests/qxmppcallmanager/qxmppcallmanager.pro b/tests/qxmppcallmanager/qxmppcallmanager.pro
deleted file mode 100644
index 27465093..00000000
--- a/tests/qxmppcallmanager/qxmppcallmanager.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppcallmanager
-SOURCES += tst_qxmppcallmanager.cpp
diff --git a/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro b/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
deleted file mode 100644
index 7f118000..00000000
--- a/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppcarbonmanager
-SOURCES += tst_qxmppcarbonmanager.cpp
diff --git a/tests/qxmppcodec/qxmppcodec.pro b/tests/qxmppcodec/qxmppcodec.pro
deleted file mode 100644
index 28fc1031..00000000
--- a/tests/qxmppcodec/qxmppcodec.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppcodec
-SOURCES += tst_qxmppcodec.cpp
diff --git a/tests/qxmppdataform/qxmppdataform.pro b/tests/qxmppdataform/qxmppdataform.pro
deleted file mode 100644
index ab92935a..00000000
--- a/tests/qxmppdataform/qxmppdataform.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppdataform
-SOURCES += tst_qxmppdataform.cpp
diff --git a/tests/qxmppdiscoveryiq/qxmppdiscoveryiq.pro b/tests/qxmppdiscoveryiq/qxmppdiscoveryiq.pro
deleted file mode 100644
index 01016e8c..00000000
--- a/tests/qxmppdiscoveryiq/qxmppdiscoveryiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppdiscoveryiq
-SOURCES += tst_qxmppdiscoveryiq.cpp
diff --git a/tests/qxmppentitytimeiq/qxmppentitytimeiq.pro b/tests/qxmppentitytimeiq/qxmppentitytimeiq.pro
deleted file mode 100644
index c6b6e91c..00000000
--- a/tests/qxmppentitytimeiq/qxmppentitytimeiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppentitytimeiq
-SOURCES += tst_qxmppentitytimeiq.cpp
diff --git a/tests/qxmppiceconnection/qxmppiceconnection.pro b/tests/qxmppiceconnection/qxmppiceconnection.pro
deleted file mode 100644
index 5f2eaeb9..00000000
--- a/tests/qxmppiceconnection/qxmppiceconnection.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppiceconnection
-SOURCES += tst_qxmppiceconnection.cpp
diff --git a/tests/qxmppiq/qxmppiq.pro b/tests/qxmppiq/qxmppiq.pro
deleted file mode 100644
index 5a2e162a..00000000
--- a/tests/qxmppiq/qxmppiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppiq
-SOURCES += tst_qxmppiq.cpp
diff --git a/tests/qxmppjingleiq/qxmppjingleiq.pro b/tests/qxmppjingleiq/qxmppjingleiq.pro
deleted file mode 100644
index 9518df55..00000000
--- a/tests/qxmppjingleiq/qxmppjingleiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppjingleiq
-SOURCES += tst_qxmppjingleiq.cpp
diff --git a/tests/qxmppmammanager/qxmppmammanager.pro b/tests/qxmppmammanager/qxmppmammanager.pro
deleted file mode 100644
index 685ea4ee..00000000
--- a/tests/qxmppmammanager/qxmppmammanager.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppmammanager
-SOURCES += tst_qxmppmammanager.cpp
diff --git a/tests/qxmppmessage/qxmppmessage.pro b/tests/qxmppmessage/qxmppmessage.pro
deleted file mode 100644
index 3ab73fc9..00000000
--- a/tests/qxmppmessage/qxmppmessage.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppmessage
-SOURCES += tst_qxmppmessage.cpp
diff --git a/tests/qxmppnonsaslauthiq/qxmppnonsaslauthiq.pro b/tests/qxmppnonsaslauthiq/qxmppnonsaslauthiq.pro
deleted file mode 100644
index 29cf99e9..00000000
--- a/tests/qxmppnonsaslauthiq/qxmppnonsaslauthiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppnonsaslauthiq
-SOURCES += tst_qxmppnonsaslauthiq.cpp
diff --git a/tests/qxmpppresence/qxmpppresence.pro b/tests/qxmpppresence/qxmpppresence.pro
deleted file mode 100644
index 222054a6..00000000
--- a/tests/qxmpppresence/qxmpppresence.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpppresence
-SOURCES += tst_qxmpppresence.cpp
diff --git a/tests/qxmpppubsubiq/qxmpppubsubiq.pro b/tests/qxmpppubsubiq/qxmpppubsubiq.pro
deleted file mode 100644
index 0847c919..00000000
--- a/tests/qxmpppubsubiq/qxmpppubsubiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpppubsubiq
-SOURCES += tst_qxmpppubsubiq.cpp
diff --git a/tests/qxmppregisteriq/qxmppregisteriq.pro b/tests/qxmppregisteriq/qxmppregisteriq.pro
deleted file mode 100644
index 4a2b98f5..00000000
--- a/tests/qxmppregisteriq/qxmppregisteriq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppregisteriq
-SOURCES += tst_qxmppregisteriq.cpp
diff --git a/tests/qxmppresultset/qxmppresultset.pro b/tests/qxmppresultset/qxmppresultset.pro
deleted file mode 100644
index f3b394d5..00000000
--- a/tests/qxmppresultset/qxmppresultset.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppresultset
-SOURCES += tst_qxmppresultset.cpp
diff --git a/tests/qxmpprosteriq/qxmpprosteriq.pro b/tests/qxmpprosteriq/qxmpprosteriq.pro
deleted file mode 100644
index 94828f4f..00000000
--- a/tests/qxmpprosteriq/qxmpprosteriq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpprosteriq
-SOURCES += tst_qxmpprosteriq.cpp
diff --git a/tests/qxmpprpciq/qxmpprpciq.pro b/tests/qxmpprpciq/qxmpprpciq.pro
deleted file mode 100644
index e818b0a3..00000000
--- a/tests/qxmpprpciq/qxmpprpciq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpprpciq
-SOURCES += tst_qxmpprpciq.cpp
diff --git a/tests/qxmpprtcppacket/qxmpprtcppacket.pro b/tests/qxmpprtcppacket/qxmpprtcppacket.pro
deleted file mode 100644
index a20db449..00000000
--- a/tests/qxmpprtcppacket/qxmpprtcppacket.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpprtcppacket
-SOURCES += tst_qxmpprtcppacket.cpp
diff --git a/tests/qxmpprtppacket/qxmpprtppacket.pro b/tests/qxmpprtppacket/qxmpprtppacket.pro
deleted file mode 100644
index afd4d804..00000000
--- a/tests/qxmpprtppacket/qxmpprtppacket.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpprtppacket
-SOURCES += tst_qxmpprtppacket.cpp
diff --git a/tests/qxmppsasl/qxmppsasl.pro b/tests/qxmppsasl/qxmppsasl.pro
deleted file mode 100644
index d5720c2f..00000000
--- a/tests/qxmppsasl/qxmppsasl.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppsasl
-SOURCES += tst_qxmppsasl.cpp
diff --git a/tests/qxmppserver/qxmppserver.pro b/tests/qxmppserver/qxmppserver.pro
deleted file mode 100644
index 1ddd94a6..00000000
--- a/tests/qxmppserver/qxmppserver.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppserver
-SOURCES += tst_qxmppserver.cpp
diff --git a/tests/qxmppsessioniq/qxmppsessioniq.pro b/tests/qxmppsessioniq/qxmppsessioniq.pro
deleted file mode 100644
index 7156defb..00000000
--- a/tests/qxmppsessioniq/qxmppsessioniq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppsessioniq
-SOURCES += tst_qxmppsessioniq.cpp
diff --git a/tests/qxmppsocks/qxmppsocks.pro b/tests/qxmppsocks/qxmppsocks.pro
deleted file mode 100644
index fed3fa2e..00000000
--- a/tests/qxmppsocks/qxmppsocks.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppsocks
-SOURCES += tst_qxmppsocks.cpp
diff --git a/tests/qxmppstanza/qxmppstanza.pro b/tests/qxmppstanza/qxmppstanza.pro
deleted file mode 100644
index a43df6ed..00000000
--- a/tests/qxmppstanza/qxmppstanza.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppstanza
-SOURCES += tst_qxmppstanza.cpp
diff --git a/tests/qxmppstreamfeatures/qxmppstreamfeatures.pro b/tests/qxmppstreamfeatures/qxmppstreamfeatures.pro
deleted file mode 100644
index 62b50008..00000000
--- a/tests/qxmppstreamfeatures/qxmppstreamfeatures.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppstreamfeatures
-SOURCES += tst_qxmppstreamfeatures.cpp
diff --git a/tests/qxmppstreaminitiationiq/qxmppstreaminitiationiq.pro b/tests/qxmppstreaminitiationiq/qxmppstreaminitiationiq.pro
deleted file mode 100644
index d19f5c41..00000000
--- a/tests/qxmppstreaminitiationiq/qxmppstreaminitiationiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppstreaminitiationiq
-SOURCES += tst_qxmppstreaminitiationiq.cpp
diff --git a/tests/qxmppstunmessage/qxmppstunmessage.pro b/tests/qxmppstunmessage/qxmppstunmessage.pro
deleted file mode 100644
index 64fbbf6e..00000000
--- a/tests/qxmppstunmessage/qxmppstunmessage.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppstunmessage
-SOURCES += tst_qxmppstunmessage.cpp
diff --git a/tests/qxmpptransfermanager/CMakeLists.txt b/tests/qxmpptransfermanager/CMakeLists.txt
new file mode 100644
index 00000000..f6f2c99d
--- /dev/null
+++ b/tests/qxmpptransfermanager/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(tst_qxmpptransfermanager tst_qxmpptransfermanager.cpp tst_qxmpptransfermanager.qrc)
+add_test(tst_qxmpptransfermanager tst_qxmpptransfermanager)
+target_link_libraries(tst_qxmpptransfermanager Qt5::Test qxmpp)
diff --git a/tests/qxmpptransfermanager/qxmpptransfermanager.pro b/tests/qxmpptransfermanager/qxmpptransfermanager.pro
deleted file mode 100644
index 325daa09..00000000
--- a/tests/qxmpptransfermanager/qxmpptransfermanager.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpptransfermanager
-RESOURCES += tst_qxmpptransfermanager.qrc
-SOURCES += tst_qxmpptransfermanager.cpp
diff --git a/tests/qxmpputils/CMakeLists.txt b/tests/qxmpputils/CMakeLists.txt
new file mode 100644
index 00000000..fbab1e64
--- /dev/null
+++ b/tests/qxmpputils/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_executable(tst_qxmpputils tst_qxmpputils.cpp tst_qxmpputils.qrc)
+add_test(tst_qxmpputils tst_qxmpputils)
+target_link_libraries(tst_qxmpputils Qt5::Test qxmpp)
diff --git a/tests/qxmpputils/qxmpputils.pro b/tests/qxmpputils/qxmpputils.pro
deleted file mode 100644
index 70c1b9bf..00000000
--- a/tests/qxmpputils/qxmpputils.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmpputils
-RESOURCES += tst_qxmpputils.qrc
-SOURCES += tst_qxmpputils.cpp
diff --git a/tests/qxmppvcardiq/qxmppvcardiq.pro b/tests/qxmppvcardiq/qxmppvcardiq.pro
deleted file mode 100644
index ca5081e6..00000000
--- a/tests/qxmppvcardiq/qxmppvcardiq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppvcardiq
-SOURCES += tst_qxmppvcardiq.cpp
diff --git a/tests/qxmppversioniq/qxmppversioniq.pro b/tests/qxmppversioniq/qxmppversioniq.pro
deleted file mode 100644
index f018fe01..00000000
--- a/tests/qxmppversioniq/qxmppversioniq.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppversioniq
-SOURCES += tst_qxmppversioniq.cpp
diff --git a/tests/tests.pri b/tests/tests.pri
deleted file mode 100644
index 364d28bb..00000000
--- a/tests/tests.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-include(../qxmpp.pri)
-
-QT -= gui
-QT += testlib
-CONFIG -= app_bundle
-CONFIG += testcase
-
-QMAKE_LIBDIR += ../../src
-QMAKE_RPATHDIR += $$OUT_PWD/../../src
-INCLUDEPATH += $$PWD $$QXMPP_INCLUDEPATH
-LIBS += $$QXMPP_LIBS
-
-# do not install testcases
-target.CONFIG += no_default_install
diff --git a/tests/tests.pro b/tests/tests.pro
deleted file mode 100644
index 987ac7ee..00000000
--- a/tests/tests.pro
+++ /dev/null
@@ -1,39 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = \
-    qxmpparchiveiq \
-    qxmppbindiq \
-    qxmppcallmanager \
-    qxmppcarbonmanager \
-    qxmppdataform \
-    qxmppdiscoveryiq \
-    qxmppentitytimeiq \
-    qxmppiceconnection \
-    qxmppiq \
-    qxmppjingleiq \
-    qxmppmammanager \
-    qxmppmessage \
-    qxmppnonsaslauthiq \
-    qxmpppresence \
-    qxmpppubsubiq \
-    qxmppregisteriq \
-    qxmppresultset \
-    qxmpprosteriq \
-    qxmpprpciq \
-    qxmpprtcppacket \
-    qxmpprtppacket \
-    qxmppserver \
-    qxmppsessioniq \
-    qxmppsocks \
-    qxmppstanza \
-    qxmppstreamfeatures \
-    qxmppstunmessage \
-    qxmpptransfermanager \
-    qxmpputils \
-    qxmppvcardiq \
-    qxmppversioniq
-
-!isEmpty(QXMPP_AUTOTEST_INTERNAL) {
-    SUBDIRS += qxmppcodec
-    SUBDIRS += qxmppsasl
-    SUBDIRS += qxmppstreaminitiationiq
-}