From fcd8224256e38d50d4ec67b71c504dcb6e480e95 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 9 Mar 2023 18:48:21 +0100 Subject: Rename PubSubItem -> PubSubBaseItem to be able to include old PubSubItem --- tests/pubsubutil.h | 8 ++++---- tests/qxmpppubsub/tst_qxmpppubsub.cpp | 8 ++++---- tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp | 22 +++++++++++----------- tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp | 6 +++--- .../qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp | 20 ++++++++++---------- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tests') 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 #include #include -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/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(""); - 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("retractIds"); QTest::addColumn("redirectUri"); QTest::addColumn>("subscription"); - QTest::addColumn>("items"); + QTest::addColumn>("items"); QTest::addColumn>("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("ae890ac52d0df67ed7cfdf51b644e901"), + QVector() << QXmppPubSubBaseItem("ae890ac52d0df67ed7cfdf51b644e901"), std::nullopt); ROW("retract", @@ -75,7 +75,7 @@ void tst_QXmppPubSubEvent::testBasic_data() << "34324897shdfjk948577342343243243", QString(), std::nullopt, - QVector(), + QVector(), std::nullopt); ROW("configuration-notify", @@ -89,7 +89,7 @@ void tst_QXmppPubSubEvent::testBasic_data() QStringList(), QString(), std::nullopt, - QVector(), + QVector(), std::nullopt); ROW("configuration", @@ -112,7 +112,7 @@ void tst_QXmppPubSubEvent::testBasic_data() QStringList(), QString(), std::nullopt, - QVector(), + QVector(), QXmppDataForm(QXmppDataForm::Result, QList() << QXmppDataForm::Field(QXmppDataForm::Field::HiddenField, @@ -133,7 +133,7 @@ void tst_QXmppPubSubEvent::testBasic_data() QStringList(), QString(), std::nullopt, - QVector(), + QVector(), 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(), + QVector(), 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(), + QVector(), 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(), + QVector(), std::nullopt); #undef ROW @@ -194,7 +194,7 @@ void tst_QXmppPubSubEvent::testBasic() QFETCH(QStringList, retractIds); QFETCH(QString, redirectUri); QFETCH(std::optional, subscription); - QFETCH(QVector, items); + QFETCH(QVector, items); QFETCH(std::optional, 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("isPep"); QTest::addColumn("jid"); QTest::addColumn("node"); - QTest::addColumn>("items"); + QTest::addColumn>("items"); QTest::addColumn("publishOptions"); QTest::addColumn("returnIds"); @@ -434,14 +434,14 @@ void tst_QXmppPubSubManager::testPublishItems_data() item2.setArtist("Rick Astley"); item2.setTitle("Never gonna give you up"); - QVector items1 { item1 }; - QVector items2 { item1, item2 }; + QVector items1 { item1 }; + QVector items2 { item1, item2 }; QXmppPubSubPublishOptions publishOptions; publishOptions.setAccessModel(QXmppPubSubPublishOptions::Presence); auto addRow = [&](const char *name, bool isPep, QString &&jid, - QString &&node, const QVector &items) { + QString &&node, const QVector &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, items); + QFETCH(QVector, items); QFETCH(std::optional, publishOptions); QFETCH(bool, returnIds); @@ -736,7 +736,7 @@ void tst_QXmppPubSubManager::testRequestCurrentItem() "" "")); - const auto item = expectFutureVariant(future); + const auto item = expectFutureVariant(future); QCOMPARE(item.id(), QStringLiteral("current")); } @@ -892,7 +892,7 @@ void tst_QXmppPubSubManager::testRequestCurrentPepItem() "" "")); - const auto item = expectFutureVariant(future); + const auto item = expectFutureVariant(future); QCOMPARE(item.id(), QStringLiteral("current")); } @@ -915,7 +915,7 @@ void tst_QXmppPubSubManager::testRequestPepItem() "" "")); - const auto item = expectFutureVariant(future); + const auto item = expectFutureVariant(future); QCOMPARE(item.id(), QStringLiteral("ae890ac52d0df67ed7cfdf51b644e901")); } @@ -937,7 +937,7 @@ void tst_QXmppPubSubManager::testRequestPepItems() "" "")); - const auto items = expectFutureVariant>(future); + const auto items = expectFutureVariant>(future); QCOMPARE(items.items.first().id(), QStringLiteral("368866411b877c30064a5f62b917cffe")); QCOMPARE(items.items.last().id(), QStringLiteral("3300659945416e274474e469a1f0154c")); } -- cgit v1.2.3