aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-09-27 15:41:13 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-09-27 15:41:13 +0200
commitc09d5ee9926474526d91b7d7d3686c71bab8f26a (patch)
tree50b6ae62c11e79091e4787247ba22d93206bf002 /tests
parent42b6f0eca69e5ca1b23750a6baba3fb9b66e7b26 (diff)
downloadqxmpp-c09d5ee9926474526d91b7d7d3686c71bab8f26a.tar.gz
split QXmppRtpPacket tests
Diffstat (limited to 'tests')
-rw-r--r--tests/all/all.pro2
-rw-r--r--tests/all/rtp.h35
-rw-r--r--tests/all/tests.cpp4
-rw-r--r--tests/qxmpprtppacket/qxmpprtppacket.pro3
-rw-r--r--tests/qxmpprtppacket/tst_qxmpprtppacket.cpp (renamed from tests/all/rtp.cpp)17
-rw-r--r--tests/tests.pro1
6 files changed, 17 insertions, 45 deletions
diff --git a/tests/all/all.pro b/tests/all/all.pro
index 68ebce94..334f40dd 100644
--- a/tests/all/all.pro
+++ b/tests/all/all.pro
@@ -9,7 +9,6 @@ SOURCES += \
roster.cpp \
rpc.cpp \
rsm.cpp \
- rtp.cpp \
stanza.cpp \
stun.cpp \
tests.cpp
@@ -19,7 +18,6 @@ HEADERS += \
roster.h \
rpc.h \
rsm.h \
- rtp.h \
stanza.h \
stun.h \
tests.h
diff --git a/tests/all/rtp.h b/tests/all/rtp.h
deleted file mode 100644
index 479a1a87..00000000
--- a/tests/all/rtp.h
+++ /dev/null
@@ -1,35 +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_QXmppRtpPacket : public QObject
-{
- Q_OBJECT
-
-private slots:
- void testBad();
- void testSimple();
- void testWithCsrc();
-};
-
diff --git a/tests/all/tests.cpp b/tests/all/tests.cpp
index 36073a83..dd7bf82c 100644
--- a/tests/all/tests.cpp
+++ b/tests/all/tests.cpp
@@ -50,7 +50,6 @@
#include "roster.h"
#include "rpc.h"
#include "rsm.h"
-#include "rtp.h"
#include "sasl.h"
#include "stanza.h"
#include "stun.h"
@@ -905,9 +904,6 @@ int main(int argc, char *argv[])
tst_QXmppRosterIq testRoster;
errors += QTest::qExec(&testRoster);
- tst_QXmppRtpPacket testRtp;
- errors += QTest::qExec(&testRtp);
-
#ifdef QXMPP_AUTOTEST_INTERNAL
tst_QXmppSasl testSasl;
errors += QTest::qExec(&testSasl);
diff --git a/tests/qxmpprtppacket/qxmpprtppacket.pro b/tests/qxmpprtppacket/qxmpprtppacket.pro
new file mode 100644
index 00000000..afd4d804
--- /dev/null
+++ b/tests/qxmpprtppacket/qxmpprtppacket.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmpprtppacket
+SOURCES += tst_qxmpprtppacket.cpp
diff --git a/tests/all/rtp.cpp b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp
index cc7ee112..94f7d417 100644
--- a/tests/all/rtp.cpp
+++ b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp
@@ -21,11 +21,19 @@
*
*/
-#include <QtTest/QtTest>
-
+#include <QObject>
+#include <QtTest>
#include "QXmppRtpChannel.h"
-#include "rtp.h"
+class tst_QXmppRtpPacket : public QObject
+{
+ Q_OBJECT
+
+private slots:
+ void testBad();
+ void testSimple();
+ void testWithCsrc();
+};
void tst_QXmppRtpPacket::testBad()
{
@@ -73,4 +81,5 @@ void tst_QXmppRtpPacket::testWithCsrc()
QCOMPARE(packet.encode(), data);
}
-
+QTEST_MAIN(tst_QXmppRtpPacket)
+#include "tst_qxmpprtppacket.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index bcfe6825..188cffcb 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -5,6 +5,7 @@ SUBDIRS = \
qxmppiq \
qxmppmessage \
qxmpppresence \
+ qxmpprtppacket \
qxmppvcardiq
!isEmpty(QXMPP_AUTOTEST_INTERNAL) {