From 06faf77bf82cfe4afe092dd1c91f4815bf5c5763 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Sun, 4 Sep 2016 23:23:26 +0200
Subject: [carbons] rename QXmppCarbonsManager to QXmppCarbonManager

---
 src/client/QXmppCarbonManager.cpp                  | 115 +++++++++++
 src/client/QXmppCarbonManager.h                    |  71 +++++++
 src/client/QXmppCarbonsManager.cpp                 | 115 -----------
 src/client/QXmppCarbonsManager.h                   |  71 -------
 src/client/client.pri                              |   4 +-
 tests/qxmppcarbonmanager/qxmppcarbonmanager.pro    |   3 +
 .../qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp  | 212 ++++++++++++++++++++
 tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro  |   3 -
 .../tst_qxmppcarbonsmanager.cpp                    | 219 ---------------------
 tests/tests.pro                                    |   2 +-
 10 files changed, 404 insertions(+), 411 deletions(-)
 create mode 100644 src/client/QXmppCarbonManager.cpp
 create mode 100644 src/client/QXmppCarbonManager.h
 delete mode 100644 src/client/QXmppCarbonsManager.cpp
 delete mode 100644 src/client/QXmppCarbonsManager.h
 create mode 100644 tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
 create mode 100644 tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
 delete mode 100644 tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro
 delete mode 100644 tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp

diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp
new file mode 100644
index 00000000..106e8ef5
--- /dev/null
+++ b/src/client/QXmppCarbonManager.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2008-2014 The QXmpp developers
+ *
+ * Author:
+ *  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 <QDomElement>
+
+#include "QXmppCarbonManager.h"
+#include "QXmppConstants.h"
+#include "QXmppClient.h"
+#include "QXmppDiscoveryManager.h"
+#include "QXmppMessage.h"
+#include "QXmppUtils.h"
+
+
+QXmppCarbonManager::QXmppCarbonManager()
+    : m_carbonsEnabled(false)
+{
+
+}
+
+QXmppCarbonManager::~QXmppCarbonManager()
+{
+
+}
+
+/// Returns whether message carbons are currently enabled
+
+bool QXmppCarbonManager::carbonsEnabled() const
+{
+    return m_carbonsEnabled;
+}
+
+/// Enable or disable message carbons.
+/// This function does not check whether the server supports
+/// message carbons, but just sends the corresponding stanza
+/// to the server, so one must check in advance by using the
+/// discovery manager.
+///
+/// By default, carbon copies are disabled.
+
+void QXmppCarbonManager::setCarbonsEnabled(bool enabled)
+{
+    if(m_carbonsEnabled == enabled)
+        return;
+
+    m_carbonsEnabled = enabled;
+
+    if(client()) {
+        QXmppIq iq(QXmppIq::Set);
+        QXmppElement carbonselement;
+        carbonselement.setTagName(m_carbonsEnabled ? "enable" : "disable");
+        carbonselement.setAttribute("xmlns", ns_carbons);
+
+        iq.setExtensions(QXmppElementList() << carbonselement);
+        client()->sendPacket(iq);
+    }
+}
+
+QStringList QXmppCarbonManager::discoveryFeatures() const
+{
+    return QStringList() << ns_carbons;
+}
+
+bool QXmppCarbonManager::handleStanza(const QDomElement &element)
+{
+    if(element.tagName() != "message")
+        return false;
+
+    bool sent = true;
+    QDomElement carbon = element.firstChildElement("sent");
+    if(carbon.isNull()) {
+        carbon = element.firstChildElement("received");
+        sent = false;
+    }
+
+    if(carbon.isNull() || carbon.namespaceURI() != ns_carbons)
+        return false;   // Neither sent nor received -> no carbon message
+
+    QDomElement forwarded = carbon.firstChildElement("forwarded");
+    if(forwarded.isNull())
+        return false;
+
+    QDomElement messageelement = forwarded.firstChildElement("message");
+    if(messageelement.isNull())
+        return false;
+
+    QXmppMessage message;
+    message.parse(messageelement);
+
+    if(sent)
+        emit messageSent(message);
+    else
+        emit messageReceived(message);
+
+    return true;
+}
diff --git a/src/client/QXmppCarbonManager.h b/src/client/QXmppCarbonManager.h
new file mode 100644
index 00000000..923f55ee
--- /dev/null
+++ b/src/client/QXmppCarbonManager.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2008-2014 The QXmpp developers
+ *
+ * Author:
+ *  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.
+ *
+ */
+
+
+#ifndef QXMPPCARBONMANAGER_H
+#define QXMPPCARBONMANAGER_H
+
+#include "QXmppClientExtension.h"
+
+class QXmppMessage;
+
+/// \brief The QXmppCarbonManager class handles message carbons
+/// as described in XEP-0280: Message Carbons.
+///
+/// This class emits signals whenever another resource of the
+/// currently connected client account sent or received a message.
+///
+/// \ingroup Managers
+
+class QXMPP_EXPORT QXmppCarbonManager : public QXmppClientExtension
+{
+    Q_OBJECT
+
+public:
+    QXmppCarbonManager();
+    ~QXmppCarbonManager();
+
+    bool carbonsEnabled() const;
+    void setCarbonsEnabled(bool enabled);
+
+    /// \cond
+    QStringList discoveryFeatures() const;
+    bool handleStanza(const QDomElement &element);
+    /// \endcond
+
+signals:
+    /// \brief Emitted when a message was received from someone else
+    /// and directed to another resource.
+    /// If you connect this signal to the \s QXmppClient::messageReceived
+    /// signal, they will appear as normal messages.
+    void messageReceived(const QXmppMessage&);
+
+    /// \brief Emitted when another resource sent a message to
+    /// someone else
+    void messageSent(const QXmppMessage&);
+
+private:
+    bool m_carbonsEnabled;
+};
+
+#endif // QXMPPCARBONMANAGER_H
diff --git a/src/client/QXmppCarbonsManager.cpp b/src/client/QXmppCarbonsManager.cpp
deleted file mode 100644
index f09e149c..00000000
--- a/src/client/QXmppCarbonsManager.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2008-2014 The QXmpp developers
- *
- * Author:
- *  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 <QDomElement>
-
-#include "QXmppCarbonsManager.h"
-#include "QXmppConstants.h"
-#include "QXmppClient.h"
-#include "QXmppDiscoveryManager.h"
-#include "QXmppMessage.h"
-#include "QXmppUtils.h"
-
-
-QXmppCarbonsManager::QXmppCarbonsManager()
-    : m_carbonsEnabled(false)
-{
-
-}
-
-QXmppCarbonsManager::~QXmppCarbonsManager()
-{
-
-}
-
-/// Returns whether message carbons are currently enabled
-
-bool QXmppCarbonsManager::carbonsEnabled() const
-{
-    return m_carbonsEnabled;
-}
-
-/// Enable or disable message carbons.
-/// This function does not check whether the server supports
-/// message carbons, but just sends the corresponding stanza
-/// to the server, so one must check in advance by using the
-/// discovery manager.
-///
-/// By default, carbon copies are disabled.
-
-void QXmppCarbonsManager::setCarbonsEnabled(bool enabled)
-{
-    if(m_carbonsEnabled == enabled)
-        return;
-
-    m_carbonsEnabled = enabled;
-
-    if(client()) {
-        QXmppIq iq(QXmppIq::Set);
-        QXmppElement carbonselement;
-        carbonselement.setTagName(m_carbonsEnabled ? "enable" : "disable");
-        carbonselement.setAttribute("xmlns", ns_carbons);
-
-        iq.setExtensions(QXmppElementList() << carbonselement);
-        client()->sendPacket(iq);
-    }
-}
-
-QStringList QXmppCarbonsManager::discoveryFeatures() const
-{
-    return QStringList() << ns_carbons;
-}
-
-bool QXmppCarbonsManager::handleStanza(const QDomElement &element)
-{
-    if(element.tagName() != "message")
-        return false;
-
-    bool sent = true;
-    QDomElement carbon = element.firstChildElement("sent");
-    if(carbon.isNull()) {
-        carbon = element.firstChildElement("received");
-        sent = false;
-    }
-
-    if(carbon.isNull() || carbon.namespaceURI() != ns_carbons)
-        return false;   // Neither sent nor received -> no carbon message
-
-    QDomElement forwarded = carbon.firstChildElement("forwarded");
-    if(forwarded.isNull())
-        return false;
-
-    QDomElement messageelement = forwarded.firstChildElement("message");
-    if(messageelement.isNull())
-        return false;
-
-    QXmppMessage message;
-    message.parse(messageelement);
-
-    if(sent)
-        emit messageSent(message);
-    else
-        emit messageReceived(message);
-
-    return true;
-}
diff --git a/src/client/QXmppCarbonsManager.h b/src/client/QXmppCarbonsManager.h
deleted file mode 100644
index eab8c658..00000000
--- a/src/client/QXmppCarbonsManager.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2008-2014 The QXmpp developers
- *
- * Author:
- *  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.
- *
- */
-
-
-#ifndef QXMPPCARBONSMANAGER_H
-#define QXMPPCARBONSMANAGER_H
-
-#include "QXmppClientExtension.h"
-
-class QXmppMessage;
-
-/// \brief The QXmppCarbonsManager class handles message carbons
-/// as described in XEP-0280: Message Carbons.
-///
-/// This class emits signals whenever another resource of the
-/// currently connected client account sent or received a message.
-///
-/// \ingroup Managers
-
-class QXMPP_EXPORT QXmppCarbonsManager : public QXmppClientExtension
-{
-    Q_OBJECT
-
-public:
-    QXmppCarbonsManager();
-    ~QXmppCarbonsManager();
-
-    bool carbonsEnabled() const;
-    void setCarbonsEnabled(bool enabled);
-
-    /// \cond
-    QStringList discoveryFeatures() const;
-    bool handleStanza(const QDomElement &element);
-    /// \endcond
-
-signals:
-    /// \brief Emitted when a message was received from someone else
-    /// and directed to another resource.
-    /// If you connect this signal to the \s QXmppClient::messageReceived
-    /// signal, they will appear as normal messages.
-    void messageReceived(const QXmppMessage&);
-
-    /// \brief Emitted when another resource sent a message to
-    /// someone else
-    void messageSent(const QXmppMessage&);
-
-private:
-    bool m_carbonsEnabled;
-};
-
-#endif // QXMPPCARBONSMANAGER_H
diff --git a/src/client/client.pri b/src/client/client.pri
index 6479a81f..650300be 100644
--- a/src/client/client.pri
+++ b/src/client/client.pri
@@ -3,7 +3,7 @@ INSTALL_HEADERS += \
     client/QXmppArchiveManager.h \
     client/QXmppBookmarkManager.h \
     client/QXmppCallManager.h \
-    client/QXmppCarbonsManager.h \
+    client/QXmppCarbonManager.h \
     client/QXmppClient.h \
     client/QXmppClientExtension.h \
     client/QXmppConfiguration.h \
@@ -27,7 +27,7 @@ SOURCES += \
     client/QXmppArchiveManager.cpp \
     client/QXmppBookmarkManager.cpp \
     client/QXmppCallManager.cpp \
-    client/QXmppCarbonsManager.cpp \
+    client/QXmppCarbonManager.cpp \
     client/QXmppClient.cpp \
     client/QXmppClientExtension.cpp \
     client/QXmppConfiguration.cpp \
diff --git a/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro b/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
new file mode 100644
index 00000000..7f118000
--- /dev/null
+++ b/tests/qxmppcarbonmanager/qxmppcarbonmanager.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmppcarbonmanager
+SOURCES += tst_qxmppcarbonmanager.cpp
diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
new file mode 100644
index 00000000..b26416f7
--- /dev/null
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -0,0 +1,212 @@
+/*
+ * 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 "QXmppCarbonManager.h"
+#include "util.h"
+
+class QXmppCarbonTestHelper  : 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_QXmppCarbonManager : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+
+    void testHandleStanza_data();
+    void testHandleStanza();
+
+
+
+private:
+    QXmppCarbonTestHelper m_helper;
+    QXmppCarbonManager m_manager;
+};
+
+void tst_QXmppCarbonManager::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_QXmppCarbonManager::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_QXmppCarbonManager::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 QXmppCarbonTestHelper::messageSent(const QXmppMessage &msg)
+{
+    m_signalTriggered = true;
+    QCOMPARE(m_expectSent, true);
+
+    compareMessages(m_expectedMessage, msg);
+}
+
+void QXmppCarbonTestHelper::messageReceived(const QXmppMessage &msg)
+{
+    m_signalTriggered = true;
+    QCOMPARE(m_expectSent, false);
+
+    compareMessages(m_expectedMessage, msg);
+}
+
+void QXmppCarbonTestHelper::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_QXmppCarbonManager)
+#include "tst_qxmppcarbonmanager.moc"
diff --git a/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro b/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro
deleted file mode 100644
index da75db12..00000000
--- a/tests/qxmppcarbonsmanager/qxmppcarbonsmanager.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-include(../tests.pri)
-TARGET = tst_qxmppcarbonsmanager
-SOURCES += tst_qxmppcarbonsmanager.cpp
diff --git a/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp b/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp
deleted file mode 100644
index 1a681305..00000000
--- a/tests/qxmppcarbonsmanager/tst_qxmppcarbonsmanager.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * 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/tests.pro b/tests/tests.pro
index 193f51aa..69418ade 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -3,7 +3,7 @@ SUBDIRS = \
     qxmpparchiveiq \
     qxmppbindiq \
     qxmppcallmanager \
-    qxmppcarbonsmanager \
+    qxmppcarbonmanager \
     qxmppdataform \
     qxmppdiscoveryiq \
     qxmppentitytimeiq \
-- 
cgit v1.2.3