From f880bbd5f96f505d8c00cdfe9d3ad46160d7c34c Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Wed, 18 Jul 2012 16:39:39 +0200 Subject: split QXmppMessage tests --- tests/tests.cpp | 145 ++------------------------------------------------------ 1 file changed, 4 insertions(+), 141 deletions(-) (limited to 'tests/tests.cpp') diff --git a/tests/tests.cpp b/tests/tests.cpp index c4178e94..b2683999 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -54,6 +54,7 @@ #include "QXmppEntityTimeIq.h" #include "dataform.h" +#include "message.h" #include "presence.h" #include "register.h" #include "rsm.h" @@ -444,147 +445,6 @@ void TestPackets::testDiscoveryWithForm() serializePacket(disco, xml); } -void TestPackets::testMessage() -{ - const QByteArray xml( - ""); - - QXmppMessage message; - parsePacket(message, xml); - QCOMPARE(message.to(), QString("foo@example.com/QXmpp")); - QCOMPARE(message.from(), QString("bar@example.com/QXmpp")); - QCOMPARE(message.type(), QXmppMessage::Normal); - QCOMPARE(message.body(), QString()); - QCOMPARE(message.subject(), QString()); - QCOMPARE(message.thread(), QString()); - QCOMPARE(message.state(), QXmppMessage::None); - QCOMPARE(message.isAttentionRequested(), false); - QCOMPARE(message.isReceiptRequested(), false); - QCOMPARE(message.receiptId(), QString()); - serializePacket(message, xml); -} - -void TestPackets::testMessageAttention() -{ - const QByteArray xml( - "" - "" - ""); - - QXmppMessage message; - parsePacket(message, xml); - QCOMPARE(message.to(), QString("foo@example.com/QXmpp")); - QCOMPARE(message.from(), QString("bar@example.com/QXmpp")); - QCOMPARE(message.type(), QXmppMessage::Normal); - QCOMPARE(message.body(), QString()); - QCOMPARE(message.isAttentionRequested(), true); - QCOMPARE(message.isReceiptRequested(), false); - QCOMPARE(message.receiptId(), QString()); - serializePacket(message, xml); -} - -void TestPackets::testMessageReceipt() -{ - const QByteArray xml( - "" - "My lord, dispatch; read o'er these articles." - "" - ""); - - QXmppMessage message; - parsePacket(message, xml); - QCOMPARE(message.id(), QString("richard2-4.1.247")); - QCOMPARE(message.to(), QString("kingrichard@royalty.england.lit/throne")); - QCOMPARE(message.from(), QString("northumberland@shakespeare.lit/westminster")); - QCOMPARE(message.type(), QXmppMessage::Normal); - QCOMPARE(message.body(), QString("My lord, dispatch; read o'er these articles.")); - QCOMPARE(message.isAttentionRequested(), false); - QCOMPARE(message.isReceiptRequested(), true); - QCOMPARE(message.receiptId(), QString()); - serializePacket(message, xml); - - const QByteArray receiptXml( - "" - "" - ""); - - QXmppMessage receipt; - parsePacket(receipt, receiptXml); - QCOMPARE(receipt.id(), QString("bi29sg183b4v")); - QCOMPARE(receipt.to(), QString("northumberland@shakespeare.lit/westminster")); - QCOMPARE(receipt.from(), QString("kingrichard@royalty.england.lit/throne")); - QCOMPARE(receipt.type(), QXmppMessage::Normal); - QCOMPARE(receipt.body(), QString()); - QCOMPARE(receipt.isAttentionRequested(), false); - QCOMPARE(receipt.isReceiptRequested(), false); - QCOMPARE(receipt.receiptId(), QString("richard2-4.1.247")); - serializePacket(receipt, receiptXml); - - const QByteArray oldXml( - "" - "" - ""); - - QXmppMessage old; - parsePacket(old, oldXml); - QCOMPARE(old.id(), QString("richard2-4.1.247")); - QCOMPARE(old.to(), QString("northumberland@shakespeare.lit/westminster")); - QCOMPARE(old.from(), QString("kingrichard@royalty.england.lit/throne")); - QCOMPARE(old.type(), QXmppMessage::Normal); - QCOMPARE(old.body(), QString()); - QCOMPARE(old.isAttentionRequested(), false); - QCOMPARE(old.isReceiptRequested(), false); - QCOMPARE(old.receiptId(), QString("richard2-4.1.247")); -} - -void TestPackets::testMessageFull() -{ - const QByteArray xml( - "" - "test subject" - "test body & stuff" - "test thread" - "" - ""); - - QXmppMessage message; - parsePacket(message, xml); - QCOMPARE(message.to(), QString("foo@example.com/QXmpp")); - QCOMPARE(message.from(), QString("bar@example.com/QXmpp")); - QCOMPARE(message.type(), QXmppMessage::Normal); - QCOMPARE(message.body(), QString("test body & stuff")); - QCOMPARE(message.subject(), QString("test subject")); - QCOMPARE(message.thread(), QString("test thread")); - QCOMPARE(message.state(), QXmppMessage::Composing); - serializePacket(message, xml); -} - -void TestPackets::testMessageDelay() -{ - const QByteArray xml( - "" - "" - ""); - - QXmppMessage message; - parsePacket(message, xml); - QCOMPARE(message.stamp(), QDateTime(QDate(2010, 06, 29), QTime(8, 23, 6), Qt::UTC)); - serializePacket(message, xml); -} - -void TestPackets::testMessageLegacyDelay() -{ - const QByteArray xml( - "" - "" - ""); - - QXmppMessage message; - parsePacket(message, xml); - QCOMPARE(message.stamp(), QDateTime(QDate(2010, 06, 29), QTime(8, 23, 6), Qt::UTC)); - serializePacket(message, xml); -} - void TestPackets::testNonSaslAuth() { // Client Requests Authentication Fields from Server @@ -1499,6 +1359,9 @@ int main(int argc, char *argv[]) TestJingle testJingle; errors += QTest::qExec(&testJingle); + tst_QXmppMessage testMessage; + errors += QTest::qExec(&testMessage); + tst_QXmppPresence testPresence; errors += QTest::qExec(&testPresence); -- cgit v1.2.3