diff options
| -rw-r--r-- | tests/TestClient.h | 3 | ||||
| -rw-r--r-- | tests/qxmppdiscoverymanager/tst_qxmppdiscoverymanager.cpp | 4 | ||||
| -rw-r--r-- | tests/qxmpprostermanager/tst_qxmpprostermanager.cpp | 8 | ||||
| -rw-r--r-- | tests/util.h | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/tests/TestClient.h b/tests/TestClient.h index d11e1398..2dda4055 100644 --- a/tests/TestClient.h +++ b/tests/TestClient.h @@ -54,7 +54,8 @@ public: { } - void inject(const QByteArray &xml) + template<typename String> + void inject(const String &xml) { d->stream->handleIqResponse(xmlToDom(xml)); QCoreApplication::processEvents(); diff --git a/tests/qxmppdiscoverymanager/tst_qxmppdiscoverymanager.cpp b/tests/qxmppdiscoverymanager/tst_qxmppdiscoverymanager.cpp index 43dfd836..676b000c 100644 --- a/tests/qxmppdiscoverymanager/tst_qxmppdiscoverymanager.cpp +++ b/tests/qxmppdiscoverymanager/tst_qxmppdiscoverymanager.cpp @@ -40,7 +40,7 @@ void tst_QXmppDiscoveryManager::testInfo() auto future = discoManager->requestDiscoInfo("user@example.org"); test.expect("<iq id='qxmpp1' to='user@example.org' type='get'><query xmlns='http://jabber.org/protocol/disco#info'/></iq>"); - test.inject(R"( + test.inject<QString>(R"( <iq id='qxmpp1' from='user@example.org' type='result'> <query xmlns='http://jabber.org/protocol/disco#info'> <identity category='pubsub' type='service'/> @@ -64,7 +64,7 @@ void tst_QXmppDiscoveryManager::testItems() auto future = discoManager->requestDiscoItems("user@example.org"); test.expect("<iq id='qxmpp1' to='user@example.org' type='get'><query xmlns='http://jabber.org/protocol/disco#items'/></iq>"); qDebug() << "Moin"; - test.inject(R"( + test.inject<QString>(R"( <iq type='result' from='user@example.org' id='qxmpp1'> diff --git a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp index a3cd82ab..8b1ed5be 100644 --- a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp +++ b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp @@ -136,12 +136,12 @@ void tst_QXmppRosterManager::testAddItem() auto future = rosterManager->addRosterItem("contact@example.org"); test.expect("<iq id='qxmpp1' type='set'><query xmlns='jabber:iq:roster'><item jid='contact@example.org'/></query></iq>"); - test.inject("<iq id='qxmpp1' type='result'/>"); + test.inject<QString>("<iq id='qxmpp1' type='result'/>"); expectFutureVariant<QXmpp::Success>(future); future = rosterManager->addRosterItem("contact@example.org"); test.expect("<iq id='qxmpp1' type='set'><query xmlns='jabber:iq:roster'><item jid='contact@example.org'/></query></iq>"); - test.inject(R"( + test.inject<QString>(R"( <iq id='qxmpp1' type='error'> <error type='modify'> <not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> @@ -160,12 +160,12 @@ void tst_QXmppRosterManager::testRemoveItem() auto future = rosterManager->removeRosterItem("contact@example.org"); test.expect("<iq id='qxmpp1' type='set'><query xmlns='jabber:iq:roster'><item jid='contact@example.org' subscription='remove'/></query></iq>"); - test.inject("<iq id='qxmpp1' type='result'/>"); + test.inject<QString>("<iq id='qxmpp1' type='result'/>"); expectFutureVariant<QXmpp::Success>(future); future = rosterManager->removeRosterItem("contact@example.org"); test.expect("<iq id='qxmpp1' type='set'><query xmlns='jabber:iq:roster'><item jid='contact@example.org' subscription='remove'/></query></iq>"); - test.inject(R"( + test.inject<QString>(R"( <iq id='qxmpp1' type='error'> <error type='cancel'> <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> diff --git a/tests/util.h b/tests/util.h index dc36e7af..035c8293 100644 --- a/tests/util.h +++ b/tests/util.h @@ -38,7 +38,8 @@ if (!QTest::qVerify(statement, #statement, description, __FILE__, __LINE__)) \ return {}; -inline QDomElement xmlToDom(const QByteArray &xml) +template<typename String> +inline QDomElement xmlToDom(const String &xml) { QDomDocument doc; QVERIFY_RV(doc.setContent(xml, true), "XML is not valid"); |