From 1ba4eb02f5015a0fcc5d7bdce03bac62e4b0f183 Mon Sep 17 00:00:00 2001 From: Juan Aragon Date: Tue, 20 May 2014 14:52:45 +0100 Subject: XEP-0333: Chat Markers --- tests/qxmppmessage/tst_qxmppmessage.cpp | 180 ++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) (limited to 'tests/qxmppmessage/tst_qxmppmessage.cpp') diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index 218ff962..d97f45c6 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -43,6 +43,7 @@ private slots: void testState(); void testXhtml(); void testSubextensions(); + void testChatMarkers(); }; void tst_QXmppMessage::testBasic_data() @@ -331,5 +332,184 @@ void tst_QXmppMessage::testSubextensions() serializePacket(message, xml); } +void tst_QXmppMessage::testChatMarkers() +{ + const QByteArray markableXml( + "" + "sleeping" + "My lord, dispatch; read o'er these articles." + "" + ""); + + QXmppMessage markableMessage; + parsePacket(markableMessage, markableXml); + QCOMPARE(markableMessage.isMarkable(), true); + QCOMPARE(markableMessage.marker(), QXmppMessage::NoMarker); + QCOMPARE(markableMessage.id(), QString("message-1")); + QCOMPARE(markableMessage.markedId(), QString()); + QCOMPARE(markableMessage.thread(), QString("sleeping")); + QCOMPARE(markableMessage.markedThread(), QString()); + + const QByteArray receivedXml( + "" + "" + ""); + + QXmppMessage receivedMessage; + parsePacket(receivedMessage, receivedXml); + QCOMPARE(receivedMessage.isMarkable(), false); + QCOMPARE(receivedMessage.marker(), QXmppMessage::Received); + QCOMPARE(receivedMessage.id(), QString("message-2")); + QCOMPARE(receivedMessage.markedId(), QString("message-1")); + QCOMPARE(receivedMessage.thread(), QString()); + QCOMPARE(receivedMessage.markedThread(), QString("sleeping")); + + const QByteArray displayedXml( + "" + "" + ""); + + QXmppMessage displayedMessage; + parsePacket(displayedMessage, displayedXml); + QCOMPARE(displayedMessage.isMarkable(), false); + QCOMPARE(displayedMessage.marker(), QXmppMessage::Displayed); + QCOMPARE(displayedMessage.id(), QString("message-2")); + QCOMPARE(displayedMessage.markedId(), QString("message-1")); + QCOMPARE(displayedMessage.thread(), QString()); + QCOMPARE(displayedMessage.markedThread(), QString("sleeping")); + + const QByteArray acknowledgedXml( + "" + "" + ""); + + QXmppMessage acknowledgedMessage; + parsePacket(acknowledgedMessage, acknowledgedXml); + QCOMPARE(acknowledgedMessage.isMarkable(), false); + QCOMPARE(acknowledgedMessage.marker(), QXmppMessage::Acknowledged); + QCOMPARE(acknowledgedMessage.id(), QString("message-2")); + QCOMPARE(acknowledgedMessage.markedId(), QString("message-1")); + QCOMPARE(acknowledgedMessage.thread(), QString()); + QCOMPARE(acknowledgedMessage.markedThread(), QString("sleeping")); + + const QByteArray emptyThreadXml( + "" + "" + ""); + + QXmppMessage emptyThreadMessage; + parsePacket(emptyThreadMessage, emptyThreadXml); + QCOMPARE(emptyThreadMessage.isMarkable(), false); + QCOMPARE(emptyThreadMessage.marker(), QXmppMessage::Received); + QCOMPARE(emptyThreadMessage.id(), QString("message-2")); + QCOMPARE(emptyThreadMessage.markedId(), QString("message-1")); + QCOMPARE(emptyThreadMessage.thread(), QString()); + QCOMPARE(emptyThreadMessage.markedThread(), QString()); + + const QByteArray notMarkableSerialisation( + ""); + + QXmppMessage serialisationMessage; + serialisationMessage.setFrom("kingrichard@royalty.england.lit/throne"); + serialisationMessage.setTo("northumberland@shakespeare.lit/westminster"); + serialisationMessage.setId("message-3"); + serialisationMessage.setMarkable(false); + serializePacket(serialisationMessage, notMarkableSerialisation); + + const QByteArray markableSerialisation( + "" + "" + ""); + + serialisationMessage.setMarkable(true); + serializePacket(serialisationMessage, markableSerialisation); + + const QByteArray receivedSerialisation( + "" + "" + ""); + + serialisationMessage.setMarkable(false); + serialisationMessage.setMarker(QXmppMessage::Received, "message-2"); + serializePacket(serialisationMessage, receivedSerialisation); + + const QByteArray receivedThreadSerialisation( + "" + "" + ""); + + serialisationMessage.setMarker(QXmppMessage::Received, "message-2", "sleeping"); + serializePacket(serialisationMessage, receivedThreadSerialisation); + + const QByteArray displayedThreadSerialisation( + "" + "" + ""); + + serialisationMessage.setMarker(QXmppMessage::Displayed, "message-2", "sleeping"); + serializePacket(serialisationMessage, displayedThreadSerialisation); + + const QByteArray acknowledgedThreadSerialisation( + "" + "" + ""); + + serialisationMessage.setMarker(QXmppMessage::Acknowledged, "message-2", "sleeping"); + serializePacket(serialisationMessage, acknowledgedThreadSerialisation); +} + QTEST_MAIN(tst_QXmppMessage) #include "tst_qxmppmessage.moc" -- cgit v1.2.3 From 599cf81e6a785d8c748db375f9959547392e4467 Mon Sep 17 00:00:00 2001 From: Juan Aragon Date: Wed, 21 May 2014 16:09:23 +0100 Subject: XEP-0333 updated: -Methods documented -Symmetrical getters/setters -Unit tests updated --- src/base/QXmppMessage.cpp | 48 ++++++++++++++++++++++++++------- src/base/QXmppMessage.h | 11 +++++--- tests/qxmppmessage/tst_qxmppmessage.cpp | 15 ++++++++--- 3 files changed, 58 insertions(+), 16 deletions(-) (limited to 'tests/qxmppmessage/tst_qxmppmessage.cpp') diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index c4743b98..4bdc6329 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -379,38 +379,68 @@ namespace } } +/// Returns true if a message is markable, as defined +/// XEP-0333: Chat Markers. + bool QXmppMessage::isMarkable() const { return d->markable; } +/// Sets if the message is markable, as defined +/// XEP-0333: Chat Markers. + void QXmppMessage::setMarkable(const bool markable) { d->markable = markable; } -QXmppMessage::Marker QXmppMessage::marker() const -{ - return d->marker; -} +/// Returns the message's marker id, as defined +/// XEP-0333: Chat Markers. QString QXmppMessage::markedId() const { return d->markedId; } +/// Sets the message's marker id, as defined +/// XEP-0333: Chat Markers. + +void QXmppMessage::setMarkerId(const QString &markerId) +{ + d->markedId = markerId; +} + +/// Returns the message's marker thread, as defined +/// XEP-0333: Chat Markers. + QString QXmppMessage::markedThread() const { return d->markedThread; } -void QXmppMessage::setMarker(const Marker marker, - const QString& id, - const QString& thread) +/// Sets the message's marked thread, as defined +/// XEP-0333: Chat Markers. + +void QXmppMessage::setMarkedThread(const QString &markedThread) +{ + d->markedThread = markedThread; +} + +/// Returns the message's marker, as defined +/// XEP-0333: Chat Markers. + +QXmppMessage::Marker QXmppMessage::marker() const +{ + return d->marker; +} + +/// Sets the message's marker, as defined +/// XEP-0333: Chat Markers + +void QXmppMessage::setMarker(const Marker marker) { d->marker = marker; - d->markedId = id; - d->markedThread = thread; } /// \cond diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h index 193ac6d2..119dba3e 100644 --- a/src/base/QXmppMessage.h +++ b/src/base/QXmppMessage.h @@ -119,11 +119,16 @@ public: // XEP-0333 bool isMarkable() const; void setMarkable(const bool); - Marker marker() const; + QString markedId() const; + void setMarkerId(const QString&); + QString markedThread() const; - void setMarker(const Marker, const QString& id, const QString& thread = QString()); - + void setMarkedThread(const QString&); + + Marker marker() const; + void setMarker(const Marker); + /// \cond void parse(const QDomElement &element); void toXml(QXmlStreamWriter *writer) const; diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index d97f45c6..1ec4f18b 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -465,7 +465,8 @@ void tst_QXmppMessage::testChatMarkers() ""); serialisationMessage.setMarkable(false); - serialisationMessage.setMarker(QXmppMessage::Received, "message-2"); + serialisationMessage.setMarker(QXmppMessage::Received); + serialisationMessage.setMarkerId("message-2"); serializePacket(serialisationMessage, receivedSerialisation); const QByteArray receivedThreadSerialisation( @@ -479,7 +480,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Received, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Received); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, receivedThreadSerialisation); const QByteArray displayedThreadSerialisation( @@ -493,7 +496,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Displayed, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Displayed); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, displayedThreadSerialisation); const QByteArray acknowledgedThreadSerialisation( @@ -507,7 +512,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Acknowledged, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Acknowledged); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, acknowledgedThreadSerialisation); } -- cgit v1.2.3