RosterManager: Add unit tests for QFuture requests

2 files changed, 52 insertions, 2 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2022b75a..10f07464 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -43,7 +43,7 @@ add_simple_test(qxmppregisteriq)
 add_simple_test(qxmppregistrationmanager)
 add_simple_test(qxmppresultset)
 add_simple_test(qxmpprosteriq)
-add_simple_test(qxmpprostermanager)
+add_simple_test(qxmpprostermanager TestClient.h)
 add_simple_test(qxmpprpciq)
 add_simple_test(qxmppserver)
 add_simple_test(qxmppsessioniq)
diff --git a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp
index 1cee09b1..a3cd82ab 100644
--- a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp
+++ b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp
@@ -26,7 +26,7 @@
 #include "QXmppDiscoveryManager.h"
 #include "QXmppRosterManager.h"
 
-#include "util.h"
+#include "TestClient.h"
 
 class tst_QXmppRosterManager : public QObject
 {
@@ -38,6 +38,8 @@ private slots:
     void testDiscoFeatures();
     void testRenameItem();
     void subscriptionRequestReceived();
+    Q_SLOT void testAddItem();
+    Q_SLOT void testRemoveItem();
 
 private:
     QXmppClient client;
@@ -127,5 +129,53 @@ void tst_QXmppRosterManager::subscriptionRequestReceived()
     QVERIFY(subscriptionRequestReceived);
 }
 
+void tst_QXmppRosterManager::testAddItem()
+{
+    TestClient test;
+    auto *rosterManager = test.addNewExtension<QXmppRosterManager>(&test);
+
+    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'/>");
+    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"(
+<iq id='qxmpp1' type='error'>
+    <error type='modify'>
+        <not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+        <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>This is not allowed</text>
+    </error>
+</iq>)");
+    auto error = expectFutureVariant<QXmppStanza::Error>(future);
+    QCOMPARE(error.type(), QXmppStanza::Error::Modify);
+    QCOMPARE(error.text(), QStringLiteral("This is not allowed"));
+}
+
+void tst_QXmppRosterManager::testRemoveItem()
+{
+    TestClient test;
+    auto *rosterManager = test.addNewExtension<QXmppRosterManager>(&test);
+
+    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'/>");
+    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"(
+<iq id='qxmpp1' type='error'>
+    <error type='cancel'>
+        <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+        <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Not found</text>
+    </error>
+</iq>)");
+    auto error = expectFutureVariant<QXmppStanza::Error>(future);
+    QCOMPARE(error.type(), QXmppStanza::Error::Cancel);
+    QCOMPARE(error.text(), QStringLiteral("Not found"));
+}
+
 QTEST_MAIN(tst_QXmppRosterManager)
 #include "tst_qxmpprostermanager.moc"