split QXmppStreamInitiationIq tests

3 files changed, 16 insertions, 8 deletions

diff --git a/tests/all/tests.cpp b/tests/all/tests.cpp
index 82f007f5..3375e15c 100644
--- a/tests/all/tests.cpp
+++ b/tests/all/tests.cpp
@@ -47,14 +47,12 @@
 #include "codec.h"
 #include "dataform.h"
 #include "jingle.h"
-#include "message.h"
 #include "register.h"
 #include "roster.h"
 #include "rpc.h"
 #include "rsm.h"
 #include "rtp.h"
 #include "sasl.h"
-#include "si.h"
 #include "stanza.h"
 #include "stun.h"
 #include "tests.h"
@@ -900,9 +898,6 @@ int main(int argc, char *argv[])
     TestJingle testJingle;
     errors += QTest::qExec(&testJingle);
 
-    tst_QXmppMessage testMessage;
-    errors += QTest::qExec(&testMessage);
-
     TestPubSub testPubSub;
     errors += QTest::qExec(&testPubSub);
 
diff --git a/tests/all/si.cpp b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
index cdfc4568..f80b0423 100644
--- a/tests/all/si.cpp
+++ b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
@@ -24,10 +24,19 @@
 
 #include "QXmppStreamInitiationIq_p.h"
 #include "QXmppTransferManager.h"
-
-#include "si.h"
 #include "util.h"
 
+class tst_QXmppStreamInitiationIq : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testFileInfo_data();
+    void testFileInfo();
+    void testOffer();
+    void testResult();
+};
+
 void tst_QXmppStreamInitiationIq::testFileInfo_data()
 {
     QTest::addColumn<QByteArray>("xml");
@@ -124,3 +133,6 @@ void tst_QXmppStreamInitiationIq::testResult()
     QVERIFY(iq.fileInfo().isNull());
     serializePacket(iq, xml);
 }
+
+QTEST_MAIN(tst_QXmppStreamInitiationIq)
+#include "tst_qxmppstreaminitiationiq.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index 8bfcef6c..c7f6bcb8 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -3,4 +3,5 @@ SUBDIRS = \
     all \
     qxmppiq \
     qxmppmessage \
-    qxmpppresence
+    qxmpppresence \
+    qxmppstreaminitiationiq