-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests: pubsubmanager: Fix odr-violation
- Loading branch information
Showing
1 changed file
with
7 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,8 +25,8 @@ using PSManager = QXmppPubSubManager; | |
| using Affiliation = QXmppPubSubAffiliation; | ||
| using AffiliationType = QXmppPubSubAffiliation::Affiliation; | ||
|
|
||
| const char *ns_pubsub = "http://jabber.org/protocol/pubsub"; | ||
| const char *ns_pubsub_auto_create = "http://jabber.org/protocol/pubsub#auto-create"; | ||
| const char *XMLNS_PUBSUB = "http://jabber.org/protocol/pubsub"; | ||
| const char *XMLNS_PUBSUB_AUTO_CREATE = "http://jabber.org/protocol/pubsub#auto-create"; | ||
|
|
||
| class TestEventManager : public QXmppClientExtension, public QXmppPubSubEventHandler | ||
| { | ||
|
|
@@ -148,7 +148,7 @@ void tst_QXmppPubSubManager::testRequestFeatures() | |
| "</query></iq>")); | ||
|
|
||
| auto features = expectFutureVariant<QVector<QString>>(future); | ||
| QCOMPARE(features, (QVector<QString> { ns_pubsub, ns_pubsub_auto_create })); | ||
| QCOMPARE(features, (QVector<QString> { XMLNS_PUBSUB, XMLNS_PUBSUB_AUTO_CREATE })); | ||
|
|
||
| future = psManager->requestFeatures("[email protected]"); | ||
| test.expect(QStringLiteral("<iq id='qxmpp1' to='[email protected]' type='get'>" | ||
|
|
@@ -162,7 +162,7 @@ void tst_QXmppPubSubManager::testRequestFeatures() | |
| "</query></iq>")); | ||
|
|
||
| features = expectFutureVariant<QVector<QString>>(future); | ||
| QCOMPARE(features, (QVector<QString> { ns_pubsub, ns_pubsub_auto_create })); | ||
| QCOMPARE(features, (QVector<QString> { XMLNS_PUBSUB, XMLNS_PUBSUB_AUTO_CREATE })); | ||
|
|
||
| future = psManager->requestFeatures("[email protected]", QXmppPubSubManager::PubSub); | ||
| test.expect(QStringLiteral("<iq id='qxmpp1' to='[email protected]' type='get'>" | ||
|
|
@@ -189,7 +189,7 @@ void tst_QXmppPubSubManager::testRequestFeatures() | |
| "</query></iq>")); | ||
|
|
||
| features = expectFutureVariant<QVector<QString>>(future); | ||
| QCOMPARE(features, (QVector<QString> { ns_pubsub, ns_pubsub_auto_create })); | ||
| QCOMPARE(features, (QVector<QString> { XMLNS_PUBSUB, XMLNS_PUBSUB_AUTO_CREATE })); | ||
|
|
||
| future = psManager->requestFeatures("pubsub.shakespeare.lit", QXmppPubSubManager::Pep); | ||
| test.expect(QStringLiteral("<iq id='qxmpp1' to='pubsub.shakespeare.lit' type='get'>" | ||
|
|
@@ -216,7 +216,7 @@ void tst_QXmppPubSubManager::testRequestFeatures() | |
| "</query></iq>")); | ||
|
|
||
| features = expectFutureVariant<QVector<QString>>(future); | ||
| QCOMPARE(features, (QVector<QString> { ns_pubsub, ns_pubsub_auto_create })); | ||
| QCOMPARE(features, (QVector<QString> { XMLNS_PUBSUB, XMLNS_PUBSUB_AUTO_CREATE })); | ||
| } | ||
|
|
||
| void tst_QXmppPubSubManager::testRequestPepFeatures() | ||
|
|
@@ -236,7 +236,7 @@ void tst_QXmppPubSubManager::testRequestPepFeatures() | |
| "</query></iq>")); | ||
|
|
||
| auto features = expectFutureVariant<QVector<QString>>(future); | ||
| QCOMPARE(features, (QVector<QString> { ns_pubsub, ns_pubsub_auto_create })); | ||
| QCOMPARE(features, (QVector<QString> { XMLNS_PUBSUB, XMLNS_PUBSUB_AUTO_CREATE })); | ||
| } | ||
|
|
||
| void tst_QXmppPubSubManager::testFetchNodes() | ||
|
|
||