Merge branch '1.5'

8 files changed, 48 insertions, 51 deletions

diff --git a/tests/pubsubutil.h b/tests/pubsubutil.h
index 20b02785..f8059a6c 100644
--- a/tests/pubsubutil.h
+++ b/tests/pubsubutil.h
@@ -5,17 +5,17 @@
 #ifndef PUBSUBUTIL_H
 #define PUBSUBUTIL_H
 
-#include "QXmppPubSubItem.h"
+#include "QXmppPubSubBaseItem.h"
 
 #include <QDomElement>
 #include <QXmlStreamWriter>
 #include <QtTest/QTest>
 
-class TestItem : public QXmppPubSubItem
+class TestItem : public QXmppPubSubBaseItem
 {
 public:
     TestItem(const QString &id = {})
-        : QXmppPubSubItem(id)
+        : QXmppPubSubBaseItem(id)
     {
     }
 
@@ -34,7 +34,7 @@ public:
     static bool isItem(const QDomElement &element)
     {
         isItemCalled = true;
-        return QXmppPubSubItem::isItem(element, [](const QDomElement &payload) {
+        return QXmppPubSubBaseItem::isItem(element, [](const QDomElement &payload) {
             return payload.tagName() == "test-payload";
         });
     }
diff --git a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp
index d276a626..b1046391 100644
--- a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp
+++ b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp
@@ -6,17 +6,15 @@
 #include "QXmppAtmTrustMemoryStorage.h"
 #include "QXmppBitsOfBinaryContentId.h"
 #include "QXmppBitsOfBinaryIq.h"
-#include "QXmppCarbonManager.h"
+#include "QXmppCarbonManagerV2.h"
 #include "QXmppClient.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppE2eeMetadata.h"
 #include "QXmppMessage.h"
 #include "QXmppOmemoElement_p.h"
-#include "QXmppOmemoEnvelope_p.h"
 #include "QXmppOmemoManager.h"
 #include "QXmppOmemoManager_p.h"
 #include "QXmppOmemoMemoryStorage.h"
-#include "QXmppPubSubItem.h"
 #include "QXmppPubSubManager.h"
 
 #include "IntegrationTesting.h"
@@ -31,7 +29,7 @@ struct OmemoUser
     QXmppClient client;
     QXmppLogger logger;
     QXmppOmemoManager *manager;
-    QXmppCarbonManager *carbonManager;
+    QXmppCarbonManagerV2 *carbonManager;
     QXmppDiscoveryManager *discoveryManager;
     QXmppPubSubManager *pubSubManager;
     std::unique_ptr<QXmppOmemoMemoryStorage> omemoStorage;
@@ -151,12 +149,9 @@ void tst_QXmppOmemoManager::initOmemoUser(OmemoUser &omemoUser)
     omemoUser.manager = new QXmppOmemoManager(omemoUser.omemoStorage.get());
     omemoUser.client.addExtension(omemoUser.manager);
 
-    omemoUser.carbonManager = new QXmppCarbonManager;
+    omemoUser.carbonManager = new QXmppCarbonManagerV2;
     omemoUser.client.addExtension(omemoUser.carbonManager);
 
-    connect(omemoUser.carbonManager, &QXmppCarbonManager::messageSent, omemoUser.manager, &QXmppOmemoManager::handleMessage);
-    connect(omemoUser.carbonManager, &QXmppCarbonManager::messageReceived, omemoUser.manager, &QXmppOmemoManager::handleMessage);
-
     omemoUser.logger.setLoggingType(QXmppLogger::SignalLogging);
     omemoUser.client.setLogger(&omemoUser.logger);
 }
@@ -231,7 +226,7 @@ void tst_QXmppOmemoManager::testLoad()
     QVERIFY(result);
 
     const auto storedOwnDevice = m_alice1.manager->ownDevice();
-    //    QCOMPARE(storedOwnDevice.keyId(), m_alice1.manager->d->createKeyId(ownDevice.publicIdentityKey));
+    //    QCOMPARE(storedOwnDevice.keyId(), ownDevice.publicIdentityKey);
     QCOMPARE(storedOwnDevice.label(), ownDevice.label);
 
     m_alice1.omemoStorage->resetAll();
@@ -268,8 +263,6 @@ void tst_QXmppOmemoManager::testSendMessage()
         auto future = m_alice1.manager->setUp();
         future.then(this, [=](bool isSetUp) {
             if (isSetUp) {
-                m_alice1.carbonManager->setCarbonsEnabled(true);
-
                 auto future = m_alice1.manager->setSecurityPolicy(Toakafa);
                 future.then(this, [=]() {
                     auto future = m_alice2.manager->setSecurityPolicy(Toakafa);
@@ -282,12 +275,7 @@ void tst_QXmppOmemoManager::testSendMessage()
     });
 
     connect(&m_alice2.client, &QXmppClient::connected, &context, [=]() {
-        auto future = m_alice2.manager->setUp();
-        future.then(this, [=](bool isSetUp) {
-            if (isSetUp) {
-                m_alice2.carbonManager->setCarbonsEnabled(true);
-            }
-        });
+        m_alice2.manager->setUp();
     });
 
     connect(&m_alice2.logger, &QXmppLogger::message, &context, [=](QXmppLogger::MessageType type, const QString &text) {
diff --git a/tests/qxmpppubsub/tst_qxmpppubsub.cpp b/tests/qxmpppubsub/tst_qxmpppubsub.cpp
index b34f34cf..ca1d6640 100644
--- a/tests/qxmpppubsub/tst_qxmpppubsub.cpp
+++ b/tests/qxmpppubsub/tst_qxmpppubsub.cpp
@@ -211,7 +211,7 @@ void tst_QXmppPubSub::testItem()
 {
     const auto xml = QByteArrayLiteral("<item id=\"abc1337\" publisher=\"lnj@qxmpp.org\"/>");
 
-    QXmppPubSubItem item;
+    QXmppPubSubBaseItem item;
     parsePacket(item, xml);
 
     QCOMPARE(item.id(), QStringLiteral("abc1337"));
@@ -221,11 +221,11 @@ void tst_QXmppPubSub::testItem()
     serializePacket(item, xml);
 
     // test serialization with constructor values
-    item = QXmppPubSubItem("abc1337", "lnj@qxmpp.org");
+    item = QXmppPubSubBaseItem("abc1337", "lnj@qxmpp.org");
     serializePacket(item, xml);
 
     // test serialization with setters
-    item = QXmppPubSubItem();
+    item = QXmppPubSubBaseItem();
     item.setId("abc1337");
     item.setPublisher("lnj@qxmpp.org");
     serializePacket(item, xml);
@@ -261,7 +261,7 @@ void tst_QXmppPubSub::testIsItem()
     QFETCH(QByteArray, xml);
     QFETCH(bool, valid);
 
-    QCOMPARE(QXmppPubSubItem::isItem(xmlToDom(xml)), valid);
+    QCOMPARE(QXmppPubSubBaseItem::isItem(xmlToDom(xml)), valid);
 }
 
 void tst_QXmppPubSub::testTestItem()
diff --git a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp
index a3b457e9..8f37d943 100644
--- a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp
+++ b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp
@@ -4,7 +4,7 @@
 
 #include "QXmppDataForm.h"
 #include "QXmppPubSubEvent.h"
-#include "QXmppPubSubItem.h"
+#include "QXmppPubSubBaseItem.h"
 
 #include "pubsubutil.h"
 #include "util.h"
@@ -31,7 +31,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
     QTest::addColumn<QStringList>("retractIds");
     QTest::addColumn<QString>("redirectUri");
     QTest::addColumn<std::optional<QXmppPubSubSubscription>>("subscription");
-    QTest::addColumn<QVector<QXmppPubSubItem>>("items");
+    QTest::addColumn<QVector<QXmppPubSubBaseItem>>("items");
     QTest::addColumn<std::optional<QXmppDataForm>>("configurationForm");
 
 #define ROW(name, xml, type, node, retractIds, redirectUri, subscription, items, configForm) \
@@ -57,7 +57,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
         QStringList(),
         QString(),
         std::nullopt,
-        QVector<QXmppPubSubItem>() << QXmppPubSubItem("ae890ac52d0df67ed7cfdf51b644e901"),
+        QVector<QXmppPubSubBaseItem>() << QXmppPubSubBaseItem("ae890ac52d0df67ed7cfdf51b644e901"),
         std::nullopt);
 
     ROW("retract",
@@ -75,7 +75,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
                       << "34324897shdfjk948577342343243243",
         QString(),
         std::nullopt,
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         std::nullopt);
 
     ROW("configuration-notify",
@@ -89,7 +89,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
         QStringList(),
         QString(),
         std::nullopt,
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         std::nullopt);
 
     ROW("configuration",
@@ -112,7 +112,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
         QStringList(),
         QString(),
         std::nullopt,
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         QXmppDataForm(QXmppDataForm::Result,
                       QList<QXmppDataForm::Field>()
                           << QXmppDataForm::Field(QXmppDataForm::Field::HiddenField,
@@ -133,7 +133,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
         QStringList(),
         QString(),
         std::nullopt,
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         std::nullopt);
 
     ROW("subscription-subscribed",
@@ -147,7 +147,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
         QStringList(),
         QString(),
         QXmppPubSubSubscription("horatio@denmark.lit", "princely_musings", {}, QXmppPubSubSubscription::Subscribed),
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         std::nullopt);
 
     ROW("subscription-none",
@@ -161,7 +161,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
         QStringList(),
         QString(),
         QXmppPubSubSubscription("polonius@denmark.lit", "princely_musings", {}, QXmppPubSubSubscription::None),
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         std::nullopt);
 
     ROW("subscription-expiry",
@@ -180,7 +180,7 @@ void tst_QXmppPubSubEvent::testBasic_data()
                                 QXmppPubSubSubscription::Subscribed,
                                 QXmppPubSubSubscription::Unavailable,
                                 QDateTime({ 2006, 02, 28 }, { 23, 59, 59 }, Qt::UTC)),
-        QVector<QXmppPubSubItem>(),
+        QVector<QXmppPubSubBaseItem>(),
         std::nullopt);
 
 #undef ROW
@@ -194,7 +194,7 @@ void tst_QXmppPubSubEvent::testBasic()
     QFETCH(QStringList, retractIds);
     QFETCH(QString, redirectUri);
     QFETCH(std::optional<QXmppPubSubSubscription>, subscription);
-    QFETCH(QVector<QXmppPubSubItem>, items);
+    QFETCH(QVector<QXmppPubSubBaseItem>, items);
     QFETCH(std::optional<QXmppDataForm>, configurationForm);
 
     // parse
diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
index 2d59124f..bb6c0768 100644
--- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
+++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 #include "QXmppPubSubIq_p.h"
-#include "QXmppPubSubItem.h"
+#include "QXmppPubSubBaseItem.h"
 #include "QXmppPubSubSubscription.h"
 #include "QXmppResultSet.h"
 
@@ -193,7 +193,7 @@ void tst_QXmppPubSubIq::testPublish()
     serializePacket(iq, xml);
 
     // serialize using setters
-    QXmppPubSubItem item(QStringLiteral("current"));
+    QXmppPubSubBaseItem item(QStringLiteral("current"));
 
     iq = PubSubIq();
     iq.setId(QLatin1String("items1"));
@@ -245,7 +245,7 @@ void tst_QXmppPubSubIq::testRetractItem()
     iq.setQueryJid({});
     iq.setQueryNode(QLatin1String("princely_musings"));
 
-    QXmppPubSubItem item;
+    QXmppPubSubBaseItem item;
     item.setId(QStringLiteral("ae890ac52d0df67ed7cfdf51b644e901"));
     iq.setItems({ item });
 
diff --git a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
index eef1912e..6589b92e 100644
--- a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
+++ b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
@@ -8,7 +8,7 @@
 #include "QXmppMessage.h"
 #include "QXmppPubSubAffiliation.h"
 #include "QXmppPubSubEventHandler.h"
-#include "QXmppPubSubItem.h"
+#include "QXmppPubSubBaseItem.h"
 #include "QXmppPubSubManager.h"
 #include "QXmppPubSubPublishOptions.h"
 #include "QXmppPubSubSubscribeOptions.h"
@@ -421,7 +421,7 @@ void tst_QXmppPubSubManager::testPublishItems_data()
     QTest::addColumn<bool>("isPep");
     QTest::addColumn<QString>("jid");
     QTest::addColumn<QString>("node");
-    QTest::addColumn<QVector<QXmppPubSubItem>>("items");
+    QTest::addColumn<QVector<QXmppPubSubBaseItem>>("items");
     QTest::addColumn<OptionsOpt>("publishOptions");
     QTest::addColumn<bool>("returnIds");
 
@@ -434,14 +434,14 @@ void tst_QXmppPubSubManager::testPublishItems_data()
     item2.setArtist("Rick Astley");
     item2.setTitle("Never gonna give you up");
 
-    QVector<QXmppPubSubItem> items1 { item1 };
-    QVector<QXmppPubSubItem> items2 { item1, item2 };
+    QVector<QXmppPubSubBaseItem> items1 { item1 };
+    QVector<QXmppPubSubBaseItem> items2 { item1, item2 };
 
     QXmppPubSubPublishOptions publishOptions;
     publishOptions.setAccessModel(QXmppPubSubPublishOptions::Presence);
 
     auto addRow = [&](const char *name, bool isPep, QString &&jid,
-                      QString &&node, const QVector<QXmppPubSubItem> &items) {
+                      QString &&node, const QVector<QXmppPubSubBaseItem> &items) {
         QTest::addRow("%s", name) << isPep << jid << node << items << OptionsOpt() << false;
         QTest::addRow("%s%s", name, "ReturnIds") << isPep << jid << node << items << OptionsOpt() << true;
         QTest::addRow("%s%s", name, "WithOptions") << isPep << jid << node << items << std::make_optional(publishOptions) << false;
@@ -459,7 +459,7 @@ void tst_QXmppPubSubManager::testPublishItems()
     QFETCH(bool, isPep);
     QFETCH(QString, jid);
     QFETCH(QString, node);
-    QFETCH(QVector<QXmppPubSubItem>, items);
+    QFETCH(QVector<QXmppPubSubBaseItem>, items);
     QFETCH(std::optional<QXmppPubSubPublishOptions>, publishOptions);
     QFETCH(bool, returnIds);
 
@@ -736,7 +736,7 @@ void tst_QXmppPubSubManager::testRequestCurrentItem()
                                "</items>"
                                "</pubsub></iq>"));
 
-    const auto item = expectFutureVariant<QXmppPubSubItem>(future);
+    const auto item = expectFutureVariant<QXmppPubSubBaseItem>(future);
     QCOMPARE(item.id(), QStringLiteral("current"));
 }
 
@@ -892,7 +892,7 @@ void tst_QXmppPubSubManager::testRequestCurrentPepItem()
                                "</items>"
                                "</pubsub></iq>"));
 
-    const auto item = expectFutureVariant<QXmppPubSubItem>(future);
+    const auto item = expectFutureVariant<QXmppPubSubBaseItem>(future);
     QCOMPARE(item.id(), QStringLiteral("current"));
 }
 
@@ -915,7 +915,7 @@ void tst_QXmppPubSubManager::testRequestPepItem()
                                "</items>"
                                "</pubsub></iq>"));
 
-    const auto item = expectFutureVariant<QXmppPubSubItem>(future);
+    const auto item = expectFutureVariant<QXmppPubSubBaseItem>(future);
     QCOMPARE(item.id(), QStringLiteral("ae890ac52d0df67ed7cfdf51b644e901"));
 }
 
@@ -937,7 +937,7 @@ void tst_QXmppPubSubManager::testRequestPepItems()
                                "</items>"
                                "</pubsub></iq>"));
 
-    const auto items = expectFutureVariant<QXmppPubSubManager::Items<QXmppPubSubItem>>(future);
+    const auto items = expectFutureVariant<QXmppPubSubManager::Items<QXmppPubSubBaseItem>>(future);
     QCOMPARE(items.items.first().id(), QStringLiteral("368866411b877c30064a5f62b917cffe"));
     QCOMPARE(items.items.last().id(), QStringLiteral("3300659945416e274474e469a1f0154c"));
 }
diff --git a/tests/qxmppsasl/tst_qxmppsasl.cpp b/tests/qxmppsasl/tst_qxmppsasl.cpp
index 951af0b4..88dd5673 100644
--- a/tests/qxmppsasl/tst_qxmppsasl.cpp
+++ b/tests/qxmppsasl/tst_qxmppsasl.cpp
@@ -28,6 +28,7 @@ private:
     Q_SLOT void testClientAnonymous();
     Q_SLOT void testClientDigestMd5();
     Q_SLOT void testClientDigestMd5_data();
+    Q_SLOT void testDigestMd5ParseMessage();
     Q_SLOT void testClientFacebook();
     Q_SLOT void testClientGoogle();
     Q_SLOT void testClientPlain();
@@ -220,6 +221,15 @@ void tst_QXmppSasl::testClientDigestMd5_data()
     QTest::newRow("qop-multi") << QByteArray(",qop=\"auth,auth-int\"");
 }
 
+void tst_QXmppSasl::testDigestMd5ParseMessage()
+{
+    auto result = QXmppSaslDigestMd5::parseMessage("charset=utf-8,digest-uri=\"xmpp/0.0.0.0\",nc=00000001,qop=auth,realm=0.0.0.0,response=9c3ee0a919d714c9d72853ff51c0a4f3,username=");
+    QCOMPARE(result["username"], QByteArray());
+
+    result = QXmppSaslDigestMd5::parseMessage("nc=00000001,username=,qop=auth,realm=0.0.0.0,response=9c3ee0a919d714c9d72853ff51c0a4f3");
+    QCOMPARE(result["username"], QByteArray());
+}
+
 void tst_QXmppSasl::testClientDigestMd5()
 {
     QFETCH(QByteArray, qop);
diff --git a/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp b/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp
index a490a5c0..30c6d493 100644
--- a/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp
+++ b/tests/qxmppsceenvelope/tst_qxmppsceenvelope.cpp
@@ -26,9 +26,8 @@ void tst_QXmppSceEnvelope::testReader()
         "<from jid=\"opportunity@mars.planet\"/>"
         "<rpad>C1DHN9HK-9A25tSmwK4hU!Jji9%GKYK^syIlHJT9TnI4</rpad>"
         "</envelope>");
-    const auto dom = xmlToDom(xml);
 
-    QXmppSceEnvelopeReader reader(dom);
+    QXmppSceEnvelopeReader reader(xmlToDom(xml));
     QCOMPARE(reader.from(), QStringLiteral("opportunity@mars.planet"));
     QCOMPARE(reader.to(), QStringLiteral("missioncontrol@houston.nasa.gov"));
     QCOMPARE(reader.timestamp(), QDateTime({ 2004, 01, 25 }, { 05, 05, 00 }, Qt::UTC));