diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-09-27 15:45:43 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-09-27 15:45:43 +0200 |
| commit | 082df1fbef37e5adc5619fe2a99b014507490bf5 (patch) | |
| tree | 0593ba45c9c30d11265b962c39b44f3126d613eb /tests | |
| parent | c09d5ee9926474526d91b7d7d3686c71bab8f26a (diff) | |
| download | qxmpp-082df1fbef37e5adc5619fe2a99b014507490bf5.tar.gz | |
split QXmppStanza tests out
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/all/all.pro | 2 | ||||
| -rw-r--r-- | tests/all/stanza.h | 34 | ||||
| -rw-r--r-- | tests/all/tests.cpp | 4 | ||||
| -rw-r--r-- | tests/qxmppstanza/qxmppstanza.pro | 3 | ||||
| -rw-r--r-- | tests/qxmppstanza/tst_qxmppstanza.cpp (renamed from tests/all/stanza.cpp) | 15 | ||||
| -rw-r--r-- | tests/tests.pro | 1 |
6 files changed, 17 insertions, 42 deletions
diff --git a/tests/all/all.pro b/tests/all/all.pro index 334f40dd..f2895f9c 100644 --- a/tests/all/all.pro +++ b/tests/all/all.pro @@ -9,7 +9,6 @@ SOURCES += \ roster.cpp \ rpc.cpp \ rsm.cpp \ - stanza.cpp \ stun.cpp \ tests.cpp HEADERS += \ @@ -18,7 +17,6 @@ HEADERS += \ roster.h \ rpc.h \ rsm.h \ - stanza.h \ stun.h \ tests.h diff --git a/tests/all/stanza.h b/tests/all/stanza.h deleted file mode 100644 index 8bd57d90..00000000 --- a/tests/all/stanza.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_QXmppStanza : public QObject -{ - Q_OBJECT - -private slots: - void testExtendedAddress_data(); - void testExtendedAddress(); -}; - diff --git a/tests/all/tests.cpp b/tests/all/tests.cpp index dd7bf82c..3f3df8ed 100644 --- a/tests/all/tests.cpp +++ b/tests/all/tests.cpp @@ -51,7 +51,6 @@ #include "rpc.h" #include "rsm.h" #include "sasl.h" -#include "stanza.h" #include "stun.h" #include "tests.h" #include "util.h" @@ -918,9 +917,6 @@ int main(int argc, char *argv[]) TestServer testServer; errors += QTest::qExec(&testServer); - tst_QXmppStanza testStanza; - errors += QTest::qExec(&testStanza); - TestStun testStun; errors += QTest::qExec(&testStun); diff --git a/tests/qxmppstanza/qxmppstanza.pro b/tests/qxmppstanza/qxmppstanza.pro new file mode 100644 index 00000000..a43df6ed --- /dev/null +++ b/tests/qxmppstanza/qxmppstanza.pro @@ -0,0 +1,3 @@ +include(../tests.pri) +TARGET = tst_qxmppstanza +SOURCES += tst_qxmppstanza.cpp diff --git a/tests/all/stanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp index f1de73a4..5bc20587 100644 --- a/tests/all/stanza.cpp +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -21,11 +21,19 @@ * */ +#include <QObject> #include "QXmppStanza.h" - -#include "stanza.h" #include "util.h" +class tst_QXmppStanza : public QObject +{ + Q_OBJECT + +private slots: + void testExtendedAddress_data(); + void testExtendedAddress(); +}; + void tst_QXmppStanza::testExtendedAddress_data() { QTest::addColumn<QByteArray>("xml"); @@ -65,3 +73,6 @@ void tst_QXmppStanza::testExtendedAddress() QCOMPARE(address.type(), type); serializePacket(address, xml); } + +QTEST_MAIN(tst_QXmppStanza) +#include "tst_qxmppstanza.moc" diff --git a/tests/tests.pro b/tests/tests.pro index 188cffcb..20f2e8b2 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -6,6 +6,7 @@ SUBDIRS = \ qxmppmessage \ qxmpppresence \ qxmpprtppacket \ + qxmppstanza \ qxmppvcardiq !isEmpty(QXMPP_AUTOTEST_INTERNAL) { |
