diff options
| author | fbeutel <fbeutel@users.noreply.github.com> | 2016-09-04 22:56:15 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2016-09-04 22:56:15 +0200 |
| commit | 78a3b26a36a720bf5bbeb86622a17588a1d881b5 (patch) | |
| tree | 8795a95058740b95dbb8f324183bed441748325f /tests | |
| parent | 8606658a9c9eef83e89e6f62fffd913bffb99b0f (diff) | |
| download | qxmpp-78a3b26a36a720bf5bbeb86622a17588a1d881b5.tar.gz | |
Merge pull request #88 from fbeutel/carbons
* Implemented XEP-0280: Message Carbons
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro | 3 | ||||
| -rw-r--r-- | tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp | 219 | ||||
| -rw-r--r-- | tests/qxmppmessage/tst_qxmppmessage.cpp | 30 | ||||
| -rw-r--r-- | tests/tests.pro | 1 |
4 files changed, 253 insertions, 0 deletions
diff --git a/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro b/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro new file mode 100644 index 00000000..da75db12 --- /dev/null +++ b/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro @@ -0,0 +1,3 @@ +include(../tests.pri) +TARGET = tst_qxmppcarbonsmanager +SOURCES += tst_qxmppcarbonsmanager.cpp diff --git a/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp b/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp new file mode 100644 index 00000000..1a681305 --- /dev/null +++ b/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp @@ -0,0 +1,219 @@ +/* + * Copyright (C) 2008-2014 The QXmpp developers + * + * Authors: + * Jeremy Lainé + * Manjeet Dahiya + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + +#include <QObject> +#include "QXmppMessage.h" +#include "QXmppCarbonsManager.h" +#include "util.h" + +class QXmppCarbonsTestHelper : public QObject +{ + Q_OBJECT + +public slots: + void messageSent(const QXmppMessage& msg); + void messageReceived(const QXmppMessage& msg); + +public: + QXmppMessage m_expectedMessage; + bool m_expectSent; + bool m_signalTriggered; + + void compareMessages(const QXmppMessage& lhs, const QXmppMessage& rhs); +}; + +class tst_QXmppCarbonsManager : public QObject +{ + Q_OBJECT + +private slots: + void initTestCase(); + + void testHandleStanza_data(); + void testHandleStanza(); + + + +private: + QXmppCarbonsTestHelper m_helper; + QXmppCarbonsManager m_manager; +}; + +void tst_QXmppCarbonsManager::initTestCase() +{ + connect(&m_manager, SIGNAL(messageSent(const QXmppMessage&)), + &m_helper, SLOT(messageSent(const QXmppMessage&))); + + connect(&m_manager, SIGNAL(messageReceived(const QXmppMessage&)), + &m_helper, SLOT(messageReceived(const QXmppMessage&))); +} + +void tst_QXmppCarbonsManager::testHandleStanza_data() +{ + QTest::addColumn<QByteArray>("xml"); + QTest::addColumn<bool>("accept"); + QTest::addColumn<bool>("sent"); + QTest::addColumn<QByteArray>("forwardedxml"); + + QTest::newRow("received1") + << QByteArray("<message xmlns='jabber:client'" + "from='romeo@montague.example'" + "to='romeo@montague.example/home'" + "type='chat'>" + "<received xmlns='urn:xmpp:carbons:2'>" + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<message xmlns='jabber:client'" + "from='juliet@capulet.example/balcony'" + "to='romeo@montague.example/garden'" + "type='chat'>" + "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>" + "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>" + "</message>" + "</forwarded>" + "</received>" + "</message>") + << true << false + << QByteArray("<message xmlns='jabber:client'" + "from='juliet@capulet.example/balcony'" + "to='romeo@montague.example/garden'" + "type='chat'>" + "<body>What man art thou that, thus bescreen'd in night, so stumblest on my counsel?</body>" + "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>" + "</message>"); + + QTest::newRow("sent1") + << QByteArray("<message xmlns='jabber:client'" + "from='romeo@montague.example'" + "to='romeo@montague.example/garden'" + "type='chat'>" + "<sent xmlns='urn:xmpp:carbons:2'>" + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<message xmlns='jabber:client'" + "to='juliet@capulet.example/balcony'" + "from='romeo@montague.example/home'" + "type='chat'>" + "<body>Neither, fair saint, if either thee dislike.</body>" + "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>" + "</message>" + "</forwarded>" + "</sent>" + "</message>") + << true << true + << QByteArray("<message xmlns='jabber:client'" + "to='juliet@capulet.example/balcony'" + "from='romeo@montague.example/home'" + "type='chat'>" + "<body>Neither, fair saint, if either thee dislike.</body>" + "<thread>0e3141cd80894871a68e6fe6b1ec56fa</thread>" + "</message>"); + + + QTest::newRow("forwarded_normal") + << QByteArray("<message to='mercutio@verona.lit' from='romeo@montague.lit/orchard' type='chat' id='28gs'>" + "<body>A most courteous exposition!</body>" + "<forwarded xmlns='urn:xmpp:forward:0'>" + "<delay xmlns='urn:xmpp:delay' stamp='2010-07-10T23:08:25Z'/>" + "<message from='juliet@capulet.lit/orchard'" + "id='0202197'" + "to='romeo@montague.lit'" + "type='chat'" + "xmlns='jabber:client'>" + "<body>Yet I should kill thee with much cherishing.</body>" + "<mood xmlns='http://jabber.org/protocol/mood'>" + "<amorous/>" + "</mood>" + "</message>" + "</forwarded>" + "</message>") + << false << false + << QByteArray(); + +} + +void tst_QXmppCarbonsManager::testHandleStanza() +{ + QFETCH(QByteArray, xml); + QFETCH(bool, accept); + QFETCH(bool, sent); + QFETCH(QByteArray, forwardedxml); + + m_helper.m_expectedMessage = QXmppMessage(); + + if(!forwardedxml.isEmpty()) + parsePacket(m_helper.m_expectedMessage, forwardedxml); + + m_helper.m_expectSent = sent; + m_helper.m_signalTriggered = false; + + QDomDocument doc; + QCOMPARE(doc.setContent(xml, true), true); + QDomElement element = doc.documentElement(); + + bool accepted = m_manager.handleStanza(element); + + QCOMPARE(accepted, accept); + QCOMPARE(m_helper.m_signalTriggered, accept); +} + + + + + + + + +void QXmppCarbonsTestHelper::messageSent(const QXmppMessage &msg) +{ + m_signalTriggered = true; + QCOMPARE(m_expectSent, true); + + compareMessages(m_expectedMessage, msg); +} + +void QXmppCarbonsTestHelper::messageReceived(const QXmppMessage &msg) +{ + m_signalTriggered = true; + QCOMPARE(m_expectSent, false); + + compareMessages(m_expectedMessage, msg); +} + +void QXmppCarbonsTestHelper::compareMessages(const QXmppMessage &lhs, const QXmppMessage &rhs) +{ + QCOMPARE(lhs.body(), rhs.body()); + QCOMPARE(lhs.from(), rhs.from()); + QCOMPARE(lhs.id(), rhs.id()); + QCOMPARE(lhs.isAttentionRequested(), rhs.isAttentionRequested()); + QCOMPARE(lhs.isMarkable(), rhs.isMarkable()); + QCOMPARE(lhs.isPrivate(), rhs.isPrivate()); + QCOMPARE(lhs.isReceiptRequested(), rhs.isReceiptRequested()); + QCOMPARE(lhs.lang(), rhs.lang()); + QCOMPARE(lhs.to(), rhs.to()); + QCOMPARE(lhs.thread(), rhs.thread()); + QCOMPARE(lhs.stamp(), rhs.stamp()); + QCOMPARE(lhs.type(), rhs.type()); +} + +QTEST_MAIN(tst_QXmppCarbonsManager) +#include "tst_qxmppcarbonsmanager.moc" diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index 6be13140..9d3ff652 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -45,6 +45,7 @@ private slots: void testXhtml(); void testSubextensions(); void testChatMarkers(); + void testPrivateMessage(); }; void tst_QXmppMessage::testBasic_data() @@ -539,5 +540,34 @@ void tst_QXmppMessage::testChatMarkers() serializePacket(serialisationMessage, acknowledgedThreadSerialisation); } + +void tst_QXmppMessage::testPrivateMessage() +{ + const QByteArray privateXml( + "<message " + "id=\"message-3\" " + "to=\"northumberland@shakespeare.lit/westminster\" " + "from=\"kingrichard@royalty.england.lit/throne\" " + "type=\"chat\">" + "<body>My lord, dispatch; read o'er these articles.</body>" + "<private xmlns='urn:xmpp:carbons:2'/>" + "</message>"); + + QXmppMessage privateMessage; + parsePacket(privateMessage, privateXml); + QCOMPARE(privateMessage.isPrivate(), true); + privateMessage.setPrivate(true); + QCOMPARE(privateMessage.isPrivate(), true); + + privateMessage.setPrivate(false); + QCOMPARE(privateMessage.isPrivate(), false); + + QBuffer buffer; + buffer.open(QIODevice::ReadWrite); + QXmlStreamWriter writer(&buffer); + privateMessage.toXml(&writer); + QVERIFY(!buffer.data().contains("private")); +} + QTEST_MAIN(tst_QXmppMessage) #include "tst_qxmppmessage.moc" diff --git a/tests/tests.pro b/tests/tests.pro index bbc59899..193f51aa 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -3,6 +3,7 @@ SUBDIRS = \ qxmpparchiveiq \ qxmppbindiq \ qxmppcallmanager \ + qxmppcarbonsmanager \ qxmppdataform \ qxmppdiscoveryiq \ qxmppentitytimeiq \ |
