split QXmppResultSet tests out

5 files changed, 15 insertions, 45 deletions

diff --git a/tests/all/all.pro b/tests/all/all.pro
index f2895f9c..a9dd56b0 100644
--- a/tests/all/all.pro
+++ b/tests/all/all.pro
@@ -8,7 +8,6 @@ SOURCES += \
     register.cpp \
     roster.cpp \
     rpc.cpp \
-    rsm.cpp \
     stun.cpp \
     tests.cpp
 HEADERS += \
@@ -16,7 +15,6 @@ HEADERS += \
     register.h \
     roster.h \
     rpc.h \
-    rsm.h \
     stun.h \
     tests.h
 
diff --git a/tests/all/rsm.h b/tests/all/rsm.h
deleted file mode 100644
index 120ea625..00000000
--- a/tests/all/rsm.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The QXmpp developers
- *
- * Authors:
- *  Olivier Goffart
- *  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_QXmppResultSet : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testQuery_data();
-    void testQuery();
-    void testReply_data();
-    void testReply();
-};
-
diff --git a/tests/all/tests.cpp b/tests/all/tests.cpp
index 3f3df8ed..6a17ce18 100644
--- a/tests/all/tests.cpp
+++ b/tests/all/tests.cpp
@@ -49,7 +49,6 @@
 #include "register.h"
 #include "roster.h"
 #include "rpc.h"
-#include "rsm.h"
 #include "sasl.h"
 #include "stun.h"
 #include "tests.h"
@@ -897,9 +896,6 @@ int main(int argc, char *argv[])
     tst_QXmppRegisterIq testRegister;
     errors += QTest::qExec(&testRegister);
 
-    tst_QXmppResultSet testRsm;
-    errors += QTest::qExec(&testRsm);
-
     tst_QXmppRosterIq testRoster;
     errors += QTest::qExec(&testRoster);
 
diff --git a/tests/all/rsm.cpp b/tests/qxmppresultset/tst_qxmppresultset.cpp
index ca5438ad..72e59fb4 100644
--- a/tests/all/rsm.cpp
+++ b/tests/qxmppresultset/tst_qxmppresultset.cpp
@@ -22,11 +22,21 @@
  *
  */
 
+#include <QObject>
 #include "QXmppResultSet.h"
-
-#include "rsm.h"
 #include "util.h"
 
+class tst_QXmppResultSet : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testQuery_data();
+    void testQuery();
+    void testReply_data();
+    void testReply();
+};
+
 void tst_QXmppResultSet::testQuery_data()
 {
     QTest::addColumn<QByteArray>("xml");
@@ -153,3 +163,5 @@ void tst_QXmppResultSet::testReply()
     serializePacket(iq, xml);
 }
 
+QTEST_MAIN(tst_QXmppResultSet)
+#include "tst_qxmppresultset.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index 20f2e8b2..03285789 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -5,6 +5,7 @@ SUBDIRS = \
     qxmppiq \
     qxmppmessage \
     qxmpppresence \
+    qxmppresultset \
     qxmpprtppacket \
     qxmppstanza \
     qxmppvcardiq