aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMelvin Keskin <melvo@olomono.de>2022-03-07 20:47:31 +0100
committerLinus Jahn <lnj@kaidan.im>2022-03-16 17:41:16 +0100
commit5b682269631a14d707b5cf1a2893bfd72ba5a011 (patch)
treecdb9fc9cf6b650db0d9f3d2039acf205aee1669a /tests
parente69f1033436ee0de77e7185a4d2dc394b48f14b7 (diff)
downloadqxmpp-5b682269631a14d707b5cf1a2893bfd72ba5a011.tar.gz
Use QVERIFY instead of QCOMPARE for 'doc.setContent(xml, true)'
Diffstat (limited to 'tests')
-rw-r--r--tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp6
-rw-r--r--tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp2
-rw-r--r--tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp4
-rw-r--r--tests/qxmppmammanager/tst_qxmppmammanager.cpp4
-rw-r--r--tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp2
-rw-r--r--tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp6
-rw-r--r--tests/qxmppmixitems/tst_qxmppmixitems.cpp8
-rw-r--r--tests/qxmppomemodata/tst_qxmppomemodata.cpp10
-rw-r--r--tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp2
-rw-r--r--tests/qxmpprpciq/tst_qxmpprpciq.cpp2
-rw-r--r--tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp2
-rw-r--r--tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp6
12 files changed, 27 insertions, 27 deletions
diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
index c159d164..8f71efb0 100644
--- a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
+++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
@@ -165,7 +165,7 @@ void tst_QXmppBitsOfBinaryIq::testIsBobIq()
"type=\"get\">"
"<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
"</iq>");
- QCOMPARE(doc.setContent(xmlSimple, true), true);
+ QVERIFY(doc.setContent(xmlSimple, true));
QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), true);
const QByteArray xmlMultipleElements(
@@ -176,7 +176,7 @@ void tst_QXmppBitsOfBinaryIq::testIsBobIq()
"<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
"<data xmlns=\"urn:xmpp:bob\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
"</iq>");
- QCOMPARE(doc.setContent(xmlMultipleElements, true), true);
+ QVERIFY(doc.setContent(xmlMultipleElements, true));
QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), true);
const QByteArray xmlWithoutBobData(
@@ -186,7 +186,7 @@ void tst_QXmppBitsOfBinaryIq::testIsBobIq()
"type=\"get\">"
"<data xmlns=\"urn:xmpp:other-data-format:0\" cid=\"sha1+8f35fef110ffc5df08d579a50083ff9308fb6242@bob.xmpp.org\"></data>"
"</iq>");
- QCOMPARE(doc.setContent(xmlWithoutBobData, true), true);
+ QVERIFY(doc.setContent(xmlWithoutBobData, true));
QCOMPARE(QXmppBitsOfBinaryIq::isBitsOfBinaryIq(doc.documentElement()), false);
}
diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index 81230d6c..6f7aff62 100644
--- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -206,7 +206,7 @@ void tst_QXmppCarbonManager::testHandleStanza()
m_helper.m_signalTriggered = false;
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
bool accepted = m_manager->handleStanza(element);
diff --git a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
index 6aa4c4b4..6c44b94e 100644
--- a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
+++ b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
@@ -74,7 +74,7 @@ void tst_QXmppHttpUploadIq::testIsRequest()
QFETCH(bool, isRequest);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QCOMPARE(QXmppHttpUploadRequestIq::isHttpUploadRequestIq(doc.documentElement()), isRequest);
}
@@ -143,7 +143,7 @@ void tst_QXmppHttpUploadIq::testIsSlot()
QFETCH(bool, isSlot);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QCOMPARE(QXmppHttpUploadSlotIq::isHttpUploadSlotIq(doc.documentElement()), isSlot);
}
diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
index bee3e42f..828a2cb6 100644
--- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp
+++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
@@ -129,7 +129,7 @@ void tst_QXmppMamManager::testHandleStanza()
QFETCH(QString, expectedQueryId);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
m_helper.m_signalTriggered = false;
@@ -192,7 +192,7 @@ void tst_QXmppMamManager::testHandleResultIq()
QFETCH(bool, expectedComplete);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
m_helper.m_signalTriggered = false;
diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
index cd9b42f6..8bababc6 100644
--- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
+++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
@@ -164,7 +164,7 @@ void tst_QXmppMessageReceiptManager::testReceipt()
QFETCH(bool, handled);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
QCOMPARE(m_manager->handleStanza(element), handled);
diff --git a/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp b/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp
index 04c316e9..a455903a 100644
--- a/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp
+++ b/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp
@@ -60,7 +60,7 @@ void tst_QXmppMixInvitation::testIsInvitation()
"<channel>coven@mix.shakespeare.example</channel>"
"<token>ABCDEF</token>"
"</invitation>");
- QCOMPARE(doc.setContent(correctInvitationWithNamespace, true), true);
+ QVERIFY(doc.setContent(correctInvitationWithNamespace, true));
element = doc.documentElement();
QVERIFY(QXmppMixInvitation::isMixInvitation(element));
@@ -71,7 +71,7 @@ void tst_QXmppMixInvitation::testIsInvitation()
"<channel>coven@mix.shakespeare.example</channel>"
"<token>ABCDEF</token>"
"</invitation>");
- QCOMPARE(doc.setContent(invitationWithoutNamespace, true), true);
+ QVERIFY(doc.setContent(invitationWithoutNamespace, true));
element = doc.documentElement();
QVERIFY(!QXmppMixInvitation::isMixInvitation(element));
@@ -82,7 +82,7 @@ void tst_QXmppMixInvitation::testIsInvitation()
"<channel>coven@mix.shakespeare.example</channel>"
"<token>ABCDEF</token>"
"</invitation>");
- QCOMPARE(doc.setContent(invitationWithIncorrectNamespace, true), true);
+ QVERIFY(doc.setContent(invitationWithIncorrectNamespace, true));
element = doc.documentElement();
QVERIFY(!QXmppMixInvitation::isMixInvitation(element));
}
diff --git a/tests/qxmppmixitems/tst_qxmppmixitems.cpp b/tests/qxmppmixitems/tst_qxmppmixitems.cpp
index 9affbbbf..9eedee9a 100644
--- a/tests/qxmppmixitems/tst_qxmppmixitems.cpp
+++ b/tests/qxmppmixitems/tst_qxmppmixitems.cpp
@@ -73,7 +73,7 @@ void tst_QXmppMixItem::testIsInfoItem()
"</field>"
"</x>"
"</item>");
- QCOMPARE(doc.setContent(xmlCorrect, true), true);
+ QVERIFY(doc.setContent(xmlCorrect, true));
element = doc.documentElement();
QVERIFY(QXmppMixInfoItem::isItem(element));
@@ -85,7 +85,7 @@ void tst_QXmppMixItem::testIsInfoItem()
"</field>"
"</x>"
"</item>");
- QCOMPARE(doc.setContent(xmlWrong, true), true);
+ QVERIFY(doc.setContent(xmlWrong, true));
element = doc.documentElement();
QVERIFY(!QXmppMixInfoItem::isItem(element));
}
@@ -125,7 +125,7 @@ void tst_QXmppMixItem::testIsParticipantItem()
"<participant xmlns=\"urn:xmpp:mix:core:1\">"
"</participant>"
"</item>");
- QCOMPARE(doc.setContent(xmlCorrect, true), true);
+ QVERIFY(doc.setContent(xmlCorrect, true));
element = doc.documentElement();
QVERIFY(QXmppMixParticipantItem::isItem(element));
@@ -134,7 +134,7 @@ void tst_QXmppMixItem::testIsParticipantItem()
"<participant xmlns=\"other:namespace:1\">"
"</participant>"
"</item>");
- QCOMPARE(doc.setContent(xmlWrong, true), true);
+ QVERIFY(doc.setContent(xmlWrong, true));
element = doc.documentElement();
QVERIFY(!QXmppMixParticipantItem::isItem(element));
}
diff --git a/tests/qxmppomemodata/tst_qxmppomemodata.cpp b/tests/qxmppomemodata/tst_qxmppomemodata.cpp
index c9f1eac5..4c4ed8e9 100644
--- a/tests/qxmppomemodata/tst_qxmppomemodata.cpp
+++ b/tests/qxmppomemodata/tst_qxmppomemodata.cpp
@@ -58,7 +58,7 @@ void tst_QXmppOmemoData::testIsOmemoDeviceElement()
QFETCH(bool, isValid);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
const QDomElement element = doc.documentElement();
QCOMPARE(QXmppOmemoDeviceElement::isOmemoDeviceElement(element), isValid);
}
@@ -121,7 +121,7 @@ void tst_QXmppOmemoData::testIsOmemoDeviceList()
QFETCH(bool, isValid);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
const QDomElement element = doc.documentElement();
QCOMPARE(QXmppOmemoDeviceList::isOmemoDeviceList(element), isValid);
}
@@ -179,7 +179,7 @@ void tst_QXmppOmemoData::testIsOmemoDeviceBundle()
QFETCH(bool, isValid);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
const QDomElement element = doc.documentElement();
QCOMPARE(QXmppOmemoDeviceBundle::isOmemoDeviceBundle(element), isValid);
}
@@ -247,7 +247,7 @@ void tst_QXmppOmemoData::testIsOmemoEnvelope()
QFETCH(bool, isValid);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
const QDomElement element = doc.documentElement();
QCOMPARE(QXmppOmemoEnvelope::isOmemoEnvelope(element), isValid);
}
@@ -317,7 +317,7 @@ void tst_QXmppOmemoData::testIsOmemoElement()
QFETCH(bool, isValid);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
const QDomElement element = doc.documentElement();
QCOMPARE(QXmppOmemoElement::isOmemoElement(element), isValid);
}
diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
index 56da94e3..aeca633b 100644
--- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
+++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
@@ -372,7 +372,7 @@ void tst_QXmppPubSubIq::testIsPubSubIq()
QFETCH(bool, isValid);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
QCOMPARE(QXmppPubSubIq<>::isPubSubIq(element), isValid);
diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp
index 05c1d0f0..a83f6999 100644
--- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp
+++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp
@@ -20,7 +20,7 @@ static void checkVariant(const QVariant &value, const QByteArray &xml)
// parse
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
QStringList errors;
QVariant test = QXmppRpcMarshaller::demarshall(element, errors);
diff --git a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
index e1f3ec3c..238c9164 100644
--- a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
+++ b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
@@ -44,7 +44,7 @@ void tst_QXmppStartTlsPacket::testBasic()
QFETCH(QXmppStartTlsPacket::Type, type);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QCOMPARE(QXmppStartTlsPacket::isStartTlsPacket(doc.documentElement()), valid);
QCOMPARE(QXmppStartTlsPacket::isStartTlsPacket(doc.documentElement(), type), valid);
diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
index f172c482..ee143018 100644
--- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
+++ b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
@@ -97,7 +97,7 @@ void tst_QXmppUploadRequestManager::onLoggerMessage(QXmppLogger::MessageType typ
QCOMPARE(type, QXmppLogger::SentMessage);
QDomDocument doc;
- QCOMPARE(doc.setContent(text, true), true);
+ QVERIFY(doc.setContent(text, true));
QDomElement element = doc.documentElement();
QXmppHttpUploadRequestIq iq;
@@ -194,7 +194,7 @@ void tst_QXmppUploadRequestManager::testHandleStanza()
connect(manager, &QXmppUploadRequestManager::requestFailed, &helper, &TestHelper::onRequestFailed);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
bool realAccepted = manager->handleStanza(element);
@@ -242,7 +242,7 @@ void tst_QXmppUploadRequestManager::testDiscoveryService()
QFETCH(bool, discovered);
QDomDocument doc;
- QCOMPARE(doc.setContent(xml, true), true);
+ QVERIFY(doc.setContent(xml, true));
QDomElement element = doc.documentElement();
bool accepted = discovery->handleStanza(element);