From 082df1fbef37e5adc5619fe2a99b014507490bf5 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 27 Sep 2012 15:45:43 +0200 Subject: split QXmppStanza tests out --- tests/all/all.pro | 2 - tests/all/stanza.cpp | 67 ------------------------------ tests/all/stanza.h | 34 --------------- tests/all/tests.cpp | 4 -- tests/qxmppstanza/qxmppstanza.pro | 3 ++ tests/qxmppstanza/tst_qxmppstanza.cpp | 78 +++++++++++++++++++++++++++++++++++ tests/tests.pro | 1 + 7 files changed, 82 insertions(+), 107 deletions(-) delete mode 100644 tests/all/stanza.cpp delete mode 100644 tests/all/stanza.h create mode 100644 tests/qxmppstanza/qxmppstanza.pro create mode 100644 tests/qxmppstanza/tst_qxmppstanza.cpp (limited to 'tests') 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.cpp b/tests/all/stanza.cpp deleted file mode 100644 index f1de73a4..00000000 --- a/tests/all/stanza.cpp +++ /dev/null @@ -1,67 +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 "QXmppStanza.h" - -#include "stanza.h" -#include "util.h" - -void tst_QXmppStanza::testExtendedAddress_data() -{ - QTest::addColumn("xml"); - QTest::addColumn("delivered"); - QTest::addColumn("description"); - QTest::addColumn("jid"); - QTest::addColumn("type"); - - QTest::newRow("simple") - << QByteArray("
") - << false - << QString() - << QString("foo@example.com/QXmpp") - << QString("bcc"); - - QTest::newRow("full") - << QByteArray("
") - << true - << QString("some description") - << QString("foo@example.com/QXmpp") - << QString("bcc"); -} - -void tst_QXmppStanza::testExtendedAddress() -{ - QFETCH(QByteArray, xml); - QFETCH(bool, delivered); - QFETCH(QString, description); - QFETCH(QString, jid); - QFETCH(QString, type); - - QXmppExtendedAddress address; - parsePacket(address, xml); - QCOMPARE(address.isDelivered(), delivered); - QCOMPARE(address.description(), description); - QCOMPARE(address.jid(), jid); - QCOMPARE(address.type(), type); - serializePacket(address, xml); -} 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 - -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/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp new file mode 100644 index 00000000..5bc20587 --- /dev/null +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -0,0 +1,78 @@ +/* + * 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 +#include "QXmppStanza.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("xml"); + QTest::addColumn("delivered"); + QTest::addColumn("description"); + QTest::addColumn("jid"); + QTest::addColumn("type"); + + QTest::newRow("simple") + << QByteArray("
") + << false + << QString() + << QString("foo@example.com/QXmpp") + << QString("bcc"); + + QTest::newRow("full") + << QByteArray("
") + << true + << QString("some description") + << QString("foo@example.com/QXmpp") + << QString("bcc"); +} + +void tst_QXmppStanza::testExtendedAddress() +{ + QFETCH(QByteArray, xml); + QFETCH(bool, delivered); + QFETCH(QString, description); + QFETCH(QString, jid); + QFETCH(QString, type); + + QXmppExtendedAddress address; + parsePacket(address, xml); + QCOMPARE(address.isDelivered(), delivered); + QCOMPARE(address.description(), description); + QCOMPARE(address.jid(), jid); + 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) { -- cgit v1.2.3