10 files changed, 39 insertions, 87 deletions
diff --git a/tests/all/all.pro b/tests/all/all.pro
index a9dd56b0..978d108e 100644
--- a/tests/all/all.pro
+++ b/tests/all/all.pro
@@ -5,15 +5,11 @@ TARGET = tst_all
 RESOURCES += tests.qrc
 SOURCES += \
     jingle.cpp \
-    register.cpp \
-    roster.cpp \
     rpc.cpp \
     stun.cpp \
     tests.cpp
 HEADERS += \
     jingle.h \
-    register.h \
-    roster.h \
     rpc.h \
     stun.h \
     tests.h
diff --git a/tests/all/register.h b/tests/all/register.h
deleted file mode 100644
index 4c54e8c7..00000000
--- a/tests/all/register.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The QXmpp developers
- *
- * Author:
- *  Jeremy Lainé
- *
- * Source:
- *  http://code.google.com/p/qxmpp
- *
- * This file is a part of QXmpp library.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- */
-
-#include <QObject>
-
-class tst_QXmppRegisterIq : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testGet();
-    void testResult();
-    void testResultWithForm();
-    void testSet();
-    void testSetWithForm();
-};
-
diff --git a/tests/all/roster.h b/tests/all/roster.h
deleted file mode 100644
index 83240ec3..00000000
--- a/tests/all/roster.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The QXmpp developers
- *
- * Author:
- *  Jeremy Lainé
- *
- * Source:
- *  http://code.google.com/p/qxmpp
- *
- * This file is a part of QXmpp library.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- */
-
-#include <QObject>
-
-class tst_QXmppRosterIq : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testItem_data();
-    void testItem();
-};
-
diff --git a/tests/all/tests.cpp b/tests/all/tests.cpp
index 6a17ce18..7e772550 100644
--- a/tests/all/tests.cpp
+++ b/tests/all/tests.cpp
@@ -46,8 +46,6 @@
 
 #include "codec.h"
 #include "jingle.h"
-#include "register.h"
-#include "roster.h"
 #include "rpc.h"
 #include "sasl.h"
 #include "stun.h"
@@ -893,12 +891,6 @@ int main(int argc, char *argv[])
     TestPubSub testPubSub;
     errors += QTest::qExec(&testPubSub);
 
-    tst_QXmppRegisterIq testRegister;
-    errors += QTest::qExec(&testRegister);
-
-    tst_QXmppRosterIq testRoster;
-    errors += QTest::qExec(&testRoster);
-
 #ifdef QXMPP_AUTOTEST_INTERNAL
     tst_QXmppSasl testSasl;
     errors += QTest::qExec(&testSasl);
diff --git a/tests/qxmppregisteriq/qxmppregisteriq.pro b/tests/qxmppregisteriq/qxmppregisteriq.pro
new file mode 100644
index 00000000..4a2b98f5
--- /dev/null
+++ b/tests/qxmppregisteriq/qxmppregisteriq.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmppregisteriq
+SOURCES += tst_qxmppregisteriq.cpp
diff --git a/tests/all/register.cpp b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp
index 9dfe2fcb..93ac7a85 100644
--- a/tests/all/register.cpp
+++ b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp
@@ -21,10 +21,21 @@
  *
  */
 
+#include <QObject>
 #include "QXmppRegisterIq.h"
-
 #include "util.h"
-#include "register.h"
+
+class tst_QXmppRegisterIq : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testGet();
+    void testResult();
+    void testResultWithForm();
+    void testSet();
+    void testSetWithForm();
+};
 
 void tst_QXmppRegisterIq::testGet()
 {
@@ -184,3 +195,6 @@ void tst_QXmppRegisterIq::testSetWithForm()
     QVERIFY(!iq.form().isNull());
     serializePacket(iq, xml);
 }
+
+QTEST_MAIN(tst_QXmppRegisterIq)
+#include "tst_qxmppregisteriq.moc"
diff --git a/tests/qxmppresultset/qxmppresultset.pro b/tests/qxmppresultset/qxmppresultset.pro
new file mode 100644
index 00000000..f3b394d5
--- /dev/null
+++ b/tests/qxmppresultset/qxmppresultset.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmppresultset
+SOURCES += tst_qxmppresultset.cpp
diff --git a/tests/qxmpprosteriq/qxmpprosteriq.pro b/tests/qxmpprosteriq/qxmpprosteriq.pro
new file mode 100644
index 00000000..94828f4f
--- /dev/null
+++ b/tests/qxmpprosteriq/qxmpprosteriq.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmpprosteriq
+SOURCES += tst_qxmpprosteriq.cpp
diff --git a/tests/all/roster.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
index 2b664212..561d8098 100644
--- a/tests/all/roster.cpp
+++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
@@ -21,11 +21,19 @@
  *
  */
 
+#include <QObject>
 #include "QXmppRosterIq.h"
-
-#include "roster.h"
 #include "util.h"
 
+class tst_QXmppRosterIq : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testItem_data();
+    void testItem();
+};
+
 void tst_QXmppRosterIq::testItem_data()
 {
     QTest::addColumn<QByteArray>("xml");
@@ -79,3 +87,5 @@ void tst_QXmppRosterIq::testItem()
     serializePacket(item, xml);
 }
 
+QTEST_MAIN(tst_QXmppRosterIq)
+#include "tst_qxmpprosteriq.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index 03285789..ff6c99e3 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -5,7 +5,9 @@ SUBDIRS = \
     qxmppiq \
     qxmppmessage \
     qxmpppresence \
+    qxmppregisteriq \
     qxmppresultset \
+    qxmpprosteriq \
     qxmpprtppacket \
     qxmppstanza \
     qxmppvcardiq