aboutsummaryrefslogtreecommitdiff
path: root/tests/tests.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-02-06 20:13:06 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2012-02-06 20:13:06 +0000
commitd793ea8b18527009ddd47816afbf52ada6ae7736 (patch)
tree64beacd1ca0188b14c08f93f8f13b6c0edafd27d /tests/tests.cpp
parent78711c314a4cc20aaf276e519d9db1d91cf22fa7 (diff)
downloadqxmpp-d793ea8b18527009ddd47816afbf52ada6ae7736.tar.gz
make QXmppMessage carry a receipt ID for XEP-0184
Diffstat (limited to 'tests/tests.cpp')
-rw-r--r--tests/tests.cpp30
1 files changed, 25 insertions, 5 deletions
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(
- "<message id=\"richard2-4.1.247\" to=\"foo@example.com/QXmpp\" from=\"bar@example.com/QXmpp\" type=\"normal\">"
+ "<message id=\"richard2-4.1.247\" to=\"kingrichard@royalty.england.lit/throne\" from=\"northumberland@shakespeare.lit/westminster\" type=\"normal\">"
"<body>My lord, dispatch; read o'er these articles.</body>"
"<request xmlns=\"urn:xmpp:receipts\"/>"
"</message>");
@@ -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(
+ "<message id=\"bi29sg183b4v\" to=\"northumberland@shakespeare.lit/westminster\" from=\"kingrichard@royalty.england.lit/throne\" type=\"normal\">"
+ "<received xmlns=\"urn:xmpp:receipts\" id=\"richard2-4.1.247\"/>"
+ "</message>");
+
+ 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()