From d793ea8b18527009ddd47816afbf52ada6ae7736 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Mon, 6 Feb 2012 20:13:06 +0000 Subject: make QXmppMessage carry a receipt ID for XEP-0184 --- tests/tests.cpp | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'tests/tests.cpp') diff --git a/tests/tests.cpp b/tests/tests.cpp index 82dbcd4b..b7582486 100644 --- a/tests/tests.cpp +++ b/tests/tests.cpp @@ -324,6 +324,7 @@ void TestPackets::testMessage() QCOMPARE(message.state(), QXmppMessage::None); QCOMPARE(message.isAttentionRequested(), false); QCOMPARE(message.isReceiptRequested(), false); + QCOMPARE(message.receiptId(), QString()); serializePacket(message, xml); } @@ -342,13 +343,14 @@ void TestPackets::testMessageAttention() QCOMPARE(message.body(), QString()); QCOMPARE(message.isAttentionRequested(), true); QCOMPARE(message.isReceiptRequested(), false); + QCOMPARE(message.receiptId(), QString()); serializePacket(message, xml); } -void TestPackets::testMessageDelivery() +void TestPackets::testMessageReceipt() { const QByteArray xml( - "" + "" "My lord, dispatch; read o'er these articles." "" ""); @@ -356,13 +358,31 @@ void TestPackets::testMessageDelivery() QXmppMessage message; parsePacket(message, xml); QCOMPARE(message.id(), QString("richard2-4.1.247")); - QCOMPARE(message.to(), QString("foo@example.com/QXmpp")); - QCOMPARE(message.from(), QString("bar@example.com/QXmpp")); + 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(), QLatin1String("My lord, dispatch; read o'er these articles.")); + 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); } void TestPackets::testMessageFull() -- cgit v1.2.3