Use QXmppError in all IQ results instead of StanzaError

This allows us to report different error types with more information and
makes it possible to distinguish stanza errors and errors generated
locally.

Part of #501.

2 files changed, 10 insertions, 6 deletions

diff --git a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
index 0e316c9f..43e846ff 100644
--- a/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
+++ b/tests/qxmpppubsubmanager/tst_qxmpppubsubmanager.cpp
@@ -953,9 +953,10 @@ void tst_QXmppPubSubManager::testRequestItemNotFound()
                                "<pubsub xmlns='http://jabber.org/protocol/pubsub'>"
                                "<items node='features'/>"
                                "</pubsub></iq>"));
-    const auto error = expectFutureVariant<QXmppStanza::Error>(future);
-    QCOMPARE(error.type(), QXmppStanza::Error::Cancel);
-    QCOMPARE(error.condition(), QXmppStanza::Error::ItemNotFound);
+    auto error = expectFutureVariant<QXmppError>(future);
+    auto err = error.value<QXmppStanza::Error>().value();
+    QCOMPARE(err.type(), QXmppStanza::Error::Cancel);
+    QCOMPARE(err.condition(), QXmppStanza::Error::ItemNotFound);
 }
 
 void tst_QXmppPubSubManager::testRequestNodeAffiliations()
@@ -1089,7 +1090,8 @@ void tst_QXmppPubSubManager::testRequestOptionsError()
                          "<value>chat</value>"
                          "<value>online</value></field>"
                          "</x></options></pubsub></iq>");
-    const auto error = expectFutureVariant<QXmppStanza::Error>(future);
+    auto err = expectFutureVariant<QXmppError>(future);
+    auto error = err.value<QXmppStanza::Error>().value();
     QCOMPARE(error.type(), QXmppStanza::Error::Cancel);
     QCOMPARE(error.condition(), QXmppStanza::Error::InternalServerError);
     QVERIFY(!error.text().isEmpty());
diff --git a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp
index fe9d6181..13cd3cb7 100644
--- a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp
+++ b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp
@@ -130,7 +130,8 @@ void tst_QXmppRosterManager::testAddItem()
         <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>This is not allowed</text>
     </error>
 </iq>)");
-    auto error = expectFutureVariant<QXmppStanza::Error>(future);
+    auto err = expectFutureVariant<QXmppError>(future);
+    auto error = err.value<QXmppStanza::Error>().value();
     QCOMPARE(error.type(), QXmppStanza::Error::Modify);
     QCOMPARE(error.text(), QStringLiteral("This is not allowed"));
 }
@@ -155,7 +156,8 @@ void tst_QXmppRosterManager::testRemoveItem()
         <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Not found</text>
     </error>
 </iq>)");
-    auto error = expectFutureVariant<QXmppStanza::Error>(future);
+    auto err = expectFutureVariant<QXmppError>(future);
+    auto error = err.value<QXmppStanza::Error>().value();
     QCOMPARE(error.type(), QXmppStanza::Error::Cancel);
     QCOMPARE(error.text(), QStringLiteral("Not found"));
 }