From 4fb81e112fe2d334b0627359ff02015d514abae7 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Wed, 18 Jul 2012 11:46:20 +0200 Subject: re-order tests --- tests/tests.cpp | 261 +++++++++++++++++++++++++++----------------------------- 1 file changed, 128 insertions(+), 133 deletions(-) (limited to 'tests/tests.cpp') diff --git a/tests/tests.cpp b/tests/tests.cpp index 3c3dcfbf..008968f9 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -1393,6 +1393,131 @@ void TestRtp::testWithCsrc() QCOMPARE(packet.encode(), data); } +void TestRsm::testQuery_data() +{ + QTest::addColumn("xml"); + QTest::addColumn("max"); + QTest::addColumn("index"); + QTest::addColumn("before"); + QTest::addColumn("after"); + + QTest::newRow("Example 3") << + QByteArray("" + "10" + "") + << 10 << -1 << QString() << QString(); + + QTest::newRow("Example 5") << + QByteArray("" + "10" + "peterpan@neverland.lit" + "") + << 10 << -1 << QString() << QString("peterpan@neverland.lit"); + + QTest::newRow("Example 5") << + QByteArray("" + "10" + "peter@pixyland.org" + "") + << 10 << -1 << QString("peter@pixyland.org") << QString(); + + QTest::newRow("Example 11") << + QByteArray("" + "10" + "" + "") + << 10 << -1 << QString("") << QString(); + + QTest::newRow("Example 12") << + QByteArray("" + "10" + "371" + "") + << 10 << 371 << QString() << QString(); + + + QTest::newRow("Example 15") << + QByteArray("" + "0" + "") + << 0 << -1 << QString() << QString(); +} + +void TestRsm::testQuery() +{ + QFETCH(QByteArray, xml); + QFETCH(int, max); + QFETCH(int, index); + QFETCH(QString, before); + QFETCH(QString, after); + + QXmppResultSetQuery iq; + parsePacket(iq, xml); + QCOMPARE(iq.max(), max); + QCOMPARE(iq.index(), index); + QCOMPARE(iq.before(), before); + QCOMPARE(iq.before().isNull(), before.isNull()); + QCOMPARE(iq.after(), after); + QCOMPARE(iq.after().isNull(), after.isNull()); + serializePacket(iq, xml); +} + +void TestRsm::testReply_data() +{ + QTest::addColumn("xml"); + QTest::addColumn("count"); + QTest::addColumn("index"); + QTest::addColumn("first"); + QTest::addColumn("last"); + + QTest::newRow("Example 4") << + QByteArray( "" + "stpeter@jabber.org" + "peterpan@neverland.lit" + "800" + "") + << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit"); + + QTest::newRow("Example 6") << + QByteArray( "" + "stpeter@jabber.org" + "peterpan@neverland.lit" + "800" + "") + << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit"); + QTest::newRow("Example 4") << + QByteArray( "" + "peter@pixyland.org" + "peter@rabbit.lit" + "800" + "") + << 800 << 10 << QString("peter@pixyland.org") << QString("peter@rabbit.lit"); + + QTest::newRow("Example 7") << + QByteArray( "" + "790" + "") + << 790 << -1 << QString() << QString(); +} + +void TestRsm::testReply() +{ + QFETCH(QByteArray, xml); + QFETCH(int, count); + QFETCH(int, index); + QFETCH(QString, first); + QFETCH(QString, last); + + QXmppResultSetReply iq; + parsePacket(iq, xml); + QCOMPARE(iq.count(), count); + QCOMPARE(iq.index(), index); + QCOMPARE(iq.first(), first); + QCOMPARE(iq.first().isNull(), first.isNull()); + QCOMPARE(iq.last(), last); + QCOMPARE(iq.last().isNull(), last.isNull()); + serializePacket(iq, xml); +} void TestServer::testConnect() { @@ -1720,136 +1845,6 @@ void TestXmlRpc::testResponseFault() serializePacket(iq, xml); } -void TestRsm::testQuery_data() -{ - QTest::addColumn("xml"); - QTest::addColumn("max"); - QTest::addColumn("index"); - QTest::addColumn("before"); - QTest::addColumn("after"); - - QTest::newRow("Example 3") << - QByteArray("" - "10" - "") - << 10 << -1 << QString() << QString(); - - QTest::newRow("Example 5") << - QByteArray("" - "10" - "peterpan@neverland.lit" - "") - << 10 << -1 << QString() << QString("peterpan@neverland.lit"); - - QTest::newRow("Example 5") << - QByteArray("" - "10" - "peter@pixyland.org" - "") - << 10 << -1 << QString("peter@pixyland.org") << QString(); - - QTest::newRow("Example 11") << - QByteArray("" - "10" - "" - "") - << 10 << -1 << QString("") << QString(); - - QTest::newRow("Example 12") << - QByteArray("" - "10" - "371" - "") - << 10 << 371 << QString() << QString(); - - - QTest::newRow("Example 15") << - QByteArray("" - "0" - "") - << 0 << -1 << QString() << QString(); -} - -void TestRsm::testQuery() -{ - QFETCH(QByteArray, xml); - QFETCH(int, max); - QFETCH(int, index); - QFETCH(QString, before); - QFETCH(QString, after); - - QXmppResultSetQuery iq; - parsePacket(iq, xml); - QCOMPARE(iq.max(), max); - QCOMPARE(iq.index(), index); - QCOMPARE(iq.before(), before); - QCOMPARE(iq.before().isNull(), before.isNull()); - QCOMPARE(iq.after(), after); - QCOMPARE(iq.after().isNull(), after.isNull()); - serializePacket(iq, xml); -} - -void TestRsm::testReply_data() -{ - QTest::addColumn("xml"); - QTest::addColumn("count"); - QTest::addColumn("index"); - QTest::addColumn("first"); - QTest::addColumn("last"); - - QTest::newRow("Example 4") << - QByteArray( "" - "stpeter@jabber.org" - "peterpan@neverland.lit" - "800" - "") - << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit"); - - QTest::newRow("Example 6") << - QByteArray( "" - "stpeter@jabber.org" - "peterpan@neverland.lit" - "800" - "") - << 800 << 0 << QString("stpeter@jabber.org") << QString("peterpan@neverland.lit"); - QTest::newRow("Example 4") << - QByteArray( "" - "peter@pixyland.org" - "peter@rabbit.lit" - "800" - "") - << 800 << 10 << QString("peter@pixyland.org") << QString("peter@rabbit.lit"); - - QTest::newRow("Example 7") << - QByteArray( "" - "790" - "") - << 790 << -1 << QString() << QString(); -} - - -void TestRsm::testReply() -{ - QFETCH(QByteArray, xml); - QFETCH(int, count); - QFETCH(int, index); - QFETCH(QString, first); - QFETCH(QString, last); - - QXmppResultSetReply iq; - parsePacket(iq, xml); - QCOMPARE(iq.count(), count); - QCOMPARE(iq.index(), index); - QCOMPARE(iq.first(), first); - QCOMPARE(iq.first().isNull(), first.isNull()); - QCOMPARE(iq.last(), last); - QCOMPARE(iq.last().isNull(), last.isNull()); - serializePacket(iq, xml); -} - - - - int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); @@ -1875,6 +1870,9 @@ int main(int argc, char *argv[]) TestPubSub testPubSub; errors += QTest::qExec(&testPubSub); + TestRsm testRsm; + errors += QTest::qExec(&testRsm); + TestRtp testRtp; errors += QTest::qExec(&testRtp); @@ -1887,9 +1885,6 @@ int main(int argc, char *argv[]) TestXmlRpc testXmlRpc; errors += QTest::qExec(&testXmlRpc); - TestRsm testRsm; - errors += QTest::qExec(&testRsm); - if (errors) { qWarning() << "Total failed tests:" << errors; -- cgit v1.2.3