diff options
Diffstat (limited to 'tests')
52 files changed, 482 insertions, 499 deletions
diff --git a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp index 69e4f5c8..1190ab51 100644 --- a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp +++ b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp @@ -11,14 +11,14 @@ class tst_QXmppArchiveIq : public QObject { Q_OBJECT -private slots: - void testArchiveList_data(); - void testArchiveList(); - void testArchiveChat_data(); - void testArchiveChat(); - void testArchiveRemove(); - void testArchiveRetrieve_data(); - void testArchiveRetrieve(); +private: + Q_SLOT void testArchiveList_data(); + Q_SLOT void testArchiveList(); + Q_SLOT void testArchiveChat_data(); + Q_SLOT void testArchiveChat(); + Q_SLOT void testArchiveRemove(); + Q_SLOT void testArchiveRetrieve_data(); + Q_SLOT void testArchiveRetrieve(); }; void tst_QXmppArchiveIq::testArchiveList_data() diff --git a/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp b/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp index c31190e0..40ec02ec 100644 --- a/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp +++ b/tests/qxmppatmmanager/tst_qxmppatmmanager.cpp @@ -31,32 +31,31 @@ class tst_QXmppAtmManager : public QObject { Q_OBJECT -signals: - void unexpectedTrustMessageSent(); - -private slots: - void initTestCase(); - void testSendTrustMessage(); - void testMakePostponedTrustDecisions(); - void testDistrustAutomaticallyTrustedKeys(); - void testDistrust(); - void testAuthenticate_data(); - void testAuthenticate(); - void testMakeTrustDecisions(); - void testHandleMessage_data(); - void testHandleMessage(); - void testMakeTrustDecisionsNoKeys(); - void testMakeTrustDecisionsOwnKeys(); - void testMakeTrustDecisionsOwnKeysNoOwnEndpoints(); - void testMakeTrustDecisionsOwnKeysNoOwnEndpointsWithAuthenticatedKeys(); - void testMakeTrustDecisionsOwnKeysNoContactsWithAuthenticatedKeys(); - void testMakeTrustDecisionsSoleOwnKeyDistrusted(); - void testMakeTrustDecisionsContactKeys(); - void testMakeTrustDecisionsContactKeysNoOwnEndpoints(); - void testMakeTrustDecisionsContactKeysNoOwnEndpointsWithAuthenticatedKeys(); - void testMakeTrustDecisionsSoleContactKeyDistrusted(); +public: + Q_SIGNAL void unexpectedTrustMessageSent(); private: + Q_SLOT void initTestCase(); + Q_SLOT void testSendTrustMessage(); + Q_SLOT void testMakePostponedTrustDecisions(); + Q_SLOT void testDistrustAutomaticallyTrustedKeys(); + Q_SLOT void testDistrust(); + Q_SLOT void testAuthenticate_data(); + Q_SLOT void testAuthenticate(); + Q_SLOT void testMakeTrustDecisions(); + Q_SLOT void testHandleMessage_data(); + Q_SLOT void testHandleMessage(); + Q_SLOT void testMakeTrustDecisionsNoKeys(); + Q_SLOT void testMakeTrustDecisionsOwnKeys(); + Q_SLOT void testMakeTrustDecisionsOwnKeysNoOwnEndpoints(); + Q_SLOT void testMakeTrustDecisionsOwnKeysNoOwnEndpointsWithAuthenticatedKeys(); + Q_SLOT void testMakeTrustDecisionsOwnKeysNoContactsWithAuthenticatedKeys(); + Q_SLOT void testMakeTrustDecisionsSoleOwnKeyDistrusted(); + Q_SLOT void testMakeTrustDecisionsContactKeys(); + Q_SLOT void testMakeTrustDecisionsContactKeysNoOwnEndpoints(); + Q_SLOT void testMakeTrustDecisionsContactKeysNoOwnEndpointsWithAuthenticatedKeys(); + Q_SLOT void testMakeTrustDecisionsSoleContactKeyDistrusted(); + void testMakeTrustDecisionsOwnKeysDone(); void testMakeTrustDecisionsContactKeysDone(); void clearTrustStorage(); @@ -1023,7 +1022,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsNoKeys() // unexpected trust message connect(&m_logger, &QXmppLogger::message, &context, [=](QXmppLogger::MessageType type, const QString &) { if (type == QXmppLogger::SentMessage) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } }); @@ -1669,7 +1668,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsSoleOwnKeyDistrusted() parsePacket(message, text.toUtf8()); if (message.to() == QStringLiteral("alice@example.org")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); @@ -1800,7 +1799,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsContactKeys() parsePacket(message, text.toUtf8()); if (message.to() == QStringLiteral("carol@example.net")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); @@ -1850,7 +1849,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsContactKeysNoOwnEndpoints() QXmppMessage message; parsePacket(message, text.toUtf8()); - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } }); @@ -1929,7 +1928,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsContactKeysNoOwnEndpointsWithAut parsePacket(message, text.toUtf8()); if (message.to() != QStringLiteral("bob@example.com")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); @@ -2013,7 +2012,7 @@ void tst_QXmppAtmManager::testMakeTrustDecisionsSoleContactKeyDistrusted() parsePacket(message, text.toUtf8()); if (message.to() != QStringLiteral("alice@example.org")) { - emit unexpectedTrustMessageSent(); + Q_EMIT unexpectedTrustMessageSent(); } } }); diff --git a/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp b/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp index dce277a2..81ff522f 100644 --- a/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp +++ b/tests/qxmppattentionmanager/tst_qxmppattentionmanager.cpp @@ -15,16 +15,15 @@ class tst_QXmppAttentionManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testDiscoFeatures(); - void testReceived_data(); - void testReceived(); - void testRateLimiting(); - void testSendRequest(); + Q_SLOT void testDiscoFeatures(); + Q_SLOT void testReceived_data(); + Q_SLOT void testReceived(); + Q_SLOT void testRateLimiting(); + Q_SLOT void testSendRequest(); -private: void setOwnJid(const QString &jid); void addToRoster(const QString &jid); @@ -100,7 +99,7 @@ void tst_QXmppAttentionManager::testReceived() limitedCalled = true; }); - emit client.messageReceived(msg); + Q_EMIT client.messageReceived(msg); QCOMPARE(signalCalled, accepted); QVERIFY(!limitedCalled); @@ -133,7 +132,7 @@ void tst_QXmppAttentionManager::testRateLimiting() msg.setAttentionRequested(true); for (int i = 0; i < count; i++) { - emit client.messageReceived(msg); + Q_EMIT client.messageReceived(msg); } QCOMPARE(signalCalled, allowed); @@ -144,7 +143,7 @@ void tst_QXmppAttentionManager::testRateLimiting() QCoreApplication::processEvents(); for (int i = 0; i < count; i++) { - emit client.messageReceived(msg); + Q_EMIT client.messageReceived(msg); } QCOMPARE(signalCalled, allowed * 2); diff --git a/tests/qxmppbindiq/tst_qxmppbindiq.cpp b/tests/qxmppbindiq/tst_qxmppbindiq.cpp index e0af1e63..66b4b018 100644 --- a/tests/qxmppbindiq/tst_qxmppbindiq.cpp +++ b/tests/qxmppbindiq/tst_qxmppbindiq.cpp @@ -12,10 +12,10 @@ class tst_QXmppBindIq : public QObject { Q_OBJECT -private slots: - void testNoResource(); - void testResource(); - void testResult(); +private: + Q_SLOT void testNoResource(); + Q_SLOT void testResource(); + Q_SLOT void testResult(); }; void tst_QXmppBindIq::testNoResource() diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp index 361253ff..f5aaa44c 100644 --- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp +++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp @@ -13,24 +13,24 @@ class tst_QXmppBitsOfBinaryContentId : public QObject { Q_OBJECT -private slots: - void testBasic(); +private: + Q_SLOT void testBasic(); - void testFromContentId_data(); - void testFromContentId(); + Q_SLOT void testFromContentId_data(); + Q_SLOT void testFromContentId(); - void testFromCidUrl_data(); - void testFromCidUrl(); + Q_SLOT void testFromCidUrl_data(); + Q_SLOT void testFromCidUrl(); - void testEmpty(); + Q_SLOT void testEmpty(); - void testIsValid_data(); - void testIsValid(); + Q_SLOT void testIsValid_data(); + Q_SLOT void testIsValid(); - void testIsBobContentId_data(); - void testIsBobContentId(); + Q_SLOT void testIsBobContentId_data(); + Q_SLOT void testIsBobContentId(); - void testUnsupportedAlgorithm(); + Q_SLOT void testUnsupportedAlgorithm(); }; void tst_QXmppBitsOfBinaryContentId::testBasic() diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp index 1fa2896f..34020edf 100644 --- a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp +++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp @@ -13,11 +13,11 @@ class tst_QXmppBitsOfBinaryIq : public QObject { Q_OBJECT -private slots: - void testBasic(); - void testResult(); - void testOtherSubelement(); - void testIsBobIq(); +private: + Q_SLOT void testBasic(); + Q_SLOT void testResult(); + Q_SLOT void testOtherSubelement(); + Q_SLOT void testIsBobIq(); Q_SLOT void fromByteArray(); }; diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp index c167586a..29b9da15 100644 --- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp +++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp @@ -35,15 +35,15 @@ class QXmppCarbonTestHelper : public QObject { Q_OBJECT -public slots: - void messageSent(const QXmppMessage &msg) +public: + Q_SLOT void messageSent(const QXmppMessage &msg) { m_signalTriggered = true; QCOMPARE(m_expectSent, true); compareMessages(m_expectedMessage, msg); } - void messageReceived(const QXmppMessage &msg) + Q_SLOT void messageReceived(const QXmppMessage &msg) { m_signalTriggered = true; QCOMPARE(m_expectSent, false); @@ -51,7 +51,6 @@ public slots: compareMessages(m_expectedMessage, msg); } -public: QXmppMessage m_expectedMessage; bool m_expectSent; bool m_signalTriggered; @@ -73,13 +72,12 @@ class tst_QXmppCarbonManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testHandleStanza_data(); - void testHandleStanza(); + Q_SLOT void testHandleStanza_data(); + Q_SLOT void testHandleStanza(); -private: QXmppCarbonTestHelper m_helper; MessageHandler *m_messageHandler; QXmppCarbonManager *m_managerV1; diff --git a/tests/qxmppclient/tst_qxmppclient.cpp b/tests/qxmppclient/tst_qxmppclient.cpp index 841e9ed4..dc34dc71 100644 --- a/tests/qxmppclient/tst_qxmppclient.cpp +++ b/tests/qxmppclient/tst_qxmppclient.cpp @@ -21,17 +21,16 @@ class tst_QXmppClient : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void handleMessageSent(QXmppLogger::MessageType type, const QString &text) const; - void testSendMessage(); + Q_SLOT void handleMessageSent(QXmppLogger::MessageType type, const QString &text) const; + Q_SLOT void testSendMessage(); - void testIndexOfExtension(); + Q_SLOT void testIndexOfExtension(); - void testE2eeExtension(); + Q_SLOT void testE2eeExtension(); -private: QXmppClient *client; }; diff --git a/tests/qxmppdataform/tst_qxmppdataform.cpp b/tests/qxmppdataform/tst_qxmppdataform.cpp index 2cc7f068..fa35f49b 100644 --- a/tests/qxmppdataform/tst_qxmppdataform.cpp +++ b/tests/qxmppdataform/tst_qxmppdataform.cpp @@ -19,12 +19,12 @@ class tst_QXmppDataForm : public QObject { Q_OBJECT -private slots: - void testSimple(); - void testSubmit(); - void testMedia(); - void testMediaSource(); - void testFormType(); +private: + Q_SLOT void testSimple(); + Q_SLOT void testSubmit(); + Q_SLOT void testMedia(); + Q_SLOT void testMediaSource(); + Q_SLOT void testFormType(); }; void tst_QXmppDataForm::testSimple() diff --git a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp index 58d49e3c..9c86a888 100644 --- a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp +++ b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp @@ -12,9 +12,9 @@ class tst_QXmppDiscoveryIq : public QObject { Q_OBJECT -private slots: - void testDiscovery(); - void testDiscoveryWithForm(); +private: + Q_SLOT void testDiscovery(); + Q_SLOT void testDiscoveryWithForm(); }; void tst_QXmppDiscoveryIq::testDiscovery() diff --git a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp index 960d3519..546bfb82 100644 --- a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp +++ b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp @@ -12,9 +12,9 @@ class tst_QXmppEntityTimeIq : public QObject { Q_OBJECT -private slots: - void testEntityTimeGet(); - void testEntityTimeResult(); +private: + Q_SLOT void testEntityTimeGet(); + Q_SLOT void testEntityTimeResult(); }; void tst_QXmppEntityTimeIq::testEntityTimeGet() diff --git a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp index 6c44b94e..3d1932c9 100644 --- a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp +++ b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp @@ -11,13 +11,13 @@ class tst_QXmppHttpUploadIq : public QObject { Q_OBJECT -private slots: - void testRequest(); - void testIsRequest_data(); - void testIsRequest(); - void testSlot(); - void testIsSlot_data(); - void testIsSlot(); +private: + Q_SLOT void testRequest(); + Q_SLOT void testIsRequest_data(); + Q_SLOT void testIsRequest(); + Q_SLOT void testSlot(); + Q_SLOT void testIsSlot_data(); + Q_SLOT void testIsSlot(); }; void tst_QXmppHttpUploadIq::testRequest() diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp index 1c8c5775..502c28ff 100644 --- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp +++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp @@ -11,10 +11,10 @@ class tst_QXmppIceConnection : public QObject { Q_OBJECT -private slots: - void testBind(); - void testBindStun(); - void testConnect(); +private: + Q_SLOT void testBind(); + Q_SLOT void testBindStun(); + Q_SLOT void testConnect(); }; void tst_QXmppIceConnection::testBind() diff --git a/tests/qxmppiq/tst_qxmppiq.cpp b/tests/qxmppiq/tst_qxmppiq.cpp index a96ee318..8337779a 100644 --- a/tests/qxmppiq/tst_qxmppiq.cpp +++ b/tests/qxmppiq/tst_qxmppiq.cpp @@ -11,9 +11,9 @@ class tst_QXmppIq : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); }; void tst_QXmppIq::testBasic_data() diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp index 3deb49fb..b27d7454 100644 --- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp +++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp @@ -12,49 +12,49 @@ class tst_QXmppJingleIq : public QObject { Q_OBJECT -private slots: - void testIsSdpParameter_data(); - void testIsSdpParameter(); - void testSdpParameter(); - void testSdpParameterWithoutValue(); - void testIsRtpCryptoElement_data(); - void testIsRtpCryptoElement(); - void testRtpCryptoElement_data(); - void testRtpCryptoElement(); - void testIsRtpEncryption_data(); - void testIsRtpEncryption(); - void testRtpEncryption_data(); - void testRtpEncryption(); - void testIsRtpFeedbackProperty_data(); - void testIsRtpFeedbackProperty(); - void testRtpFeedbackProperty(); - void testRtpFeedbackPropertyWithParameters(); - void testIsRtpFeedbackInterval_data(); - void testIsRtpFeedbackInterval(); - void testRtpFeedbackInterval(); - void testIsRtpHeaderExtensionProperty_data(); - void testIsRtpHeaderExtensionProperty(); - void testRtpHeaderExtensionProperty(); - void testRtpHeaderExtensionPropertyWithSenders(); - void testRtpHeaderExtensionPropertyWithParameters(); - void testCandidate(); - void testContent(); - void testContentFingerprint(); - void testContentSdp(); - void testContentSdpReflexive(); - void testContentSdpFingerprint(); - void testContentSdpParameters(); - void testContentRtpFeedbackNegotiation(); - void testContentRtpHeaderExtensionsNegotiation(); - void testSession(); - void testTerminate(); - void testRtpSessionState_data(); - void testRtpSessionState(); - void testAudioPayloadType(); - void testVideoPayloadType(); - void testPayloadTypeRtpFeedbackNegotiation(); - void testRtpErrorCondition_data(); - void testRtpErrorCondition(); +private: + Q_SLOT void testIsSdpParameter_data(); + Q_SLOT void testIsSdpParameter(); + Q_SLOT void testSdpParameter(); + Q_SLOT void testSdpParameterWithoutValue(); + Q_SLOT void testIsRtpCryptoElement_data(); + Q_SLOT void testIsRtpCryptoElement(); + Q_SLOT void testRtpCryptoElement_data(); + Q_SLOT void testRtpCryptoElement(); + Q_SLOT void testIsRtpEncryption_data(); + Q_SLOT void testIsRtpEncryption(); + Q_SLOT void testRtpEncryption_data(); + Q_SLOT void testRtpEncryption(); + Q_SLOT void testIsRtpFeedbackProperty_data(); + Q_SLOT void testIsRtpFeedbackProperty(); + Q_SLOT void testRtpFeedbackProperty(); + Q_SLOT void testRtpFeedbackPropertyWithParameters(); + Q_SLOT void testIsRtpFeedbackInterval_data(); + Q_SLOT void testIsRtpFeedbackInterval(); + Q_SLOT void testRtpFeedbackInterval(); + Q_SLOT void testIsRtpHeaderExtensionProperty_data(); + Q_SLOT void testIsRtpHeaderExtensionProperty(); + Q_SLOT void testRtpHeaderExtensionProperty(); + Q_SLOT void testRtpHeaderExtensionPropertyWithSenders(); + Q_SLOT void testRtpHeaderExtensionPropertyWithParameters(); + Q_SLOT void testCandidate(); + Q_SLOT void testContent(); + Q_SLOT void testContentFingerprint(); + Q_SLOT void testContentSdp(); + Q_SLOT void testContentSdpReflexive(); + Q_SLOT void testContentSdpFingerprint(); + Q_SLOT void testContentSdpParameters(); + Q_SLOT void testContentRtpFeedbackNegotiation(); + Q_SLOT void testContentRtpHeaderExtensionsNegotiation(); + Q_SLOT void testSession(); + Q_SLOT void testTerminate(); + Q_SLOT void testRtpSessionState_data(); + Q_SLOT void testRtpSessionState(); + Q_SLOT void testAudioPayloadType(); + Q_SLOT void testVideoPayloadType(); + Q_SLOT void testPayloadTypeRtpFeedbackNegotiation(); + Q_SLOT void testRtpErrorCondition_data(); + Q_SLOT void testRtpErrorCondition(); }; void tst_QXmppJingleIq::testIsSdpParameter_data() diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp index 828a2cb6..b00748b7 100644 --- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp +++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp @@ -12,11 +12,10 @@ class QXmppMamTestHelper : public QObject { Q_OBJECT -public slots: - void archivedMessageReceived(const QString &queryId, const QXmppMessage &message); - void resultsRecieved(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete); - public: + Q_SLOT void archivedMessageReceived(const QString &queryId, const QXmppMessage &message); + Q_SLOT void resultsRecieved(const QString &queryId, const QXmppResultSetReply &resultSetReply, bool complete); + QXmppMessage m_expectedMessage; QXmppResultSetReply m_expectedResultSetReply; QString m_expectedQueryId; @@ -31,16 +30,15 @@ class tst_QXmppMamManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testHandleStanza_data(); - void testHandleStanza(); + Q_SLOT void testHandleStanza_data(); + Q_SLOT void testHandleStanza(); - void testHandleResultIq_data(); - void testHandleResultIq(); + Q_SLOT void testHandleResultIq_data(); + Q_SLOT void testHandleResultIq(); -private: QXmppMamTestHelper m_helper; QXmppMamManager m_manager; }; diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index ee964a4c..deca437e 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -22,42 +22,42 @@ class tst_QXmppMessage : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); - void testIsXmppStanza(); - void testUnknownXExtension(); - void testMessageAttention(); - void testMessageReceipt(); - void testDelay_data(); - void testDelay(); - void testDelayWithMultipleStamp(); - void testExtendedAddresses(); - void testMucInvitation(); - void testState_data(); - void testState(); - void testXhtml(); - void testSubextensions(); - void testChatMarkers(); - void testPrivateMessage(); - void testOutOfBandUrl(); - void testMessageCorrect(); - void testMessageAttaching(); - void testMix(); - void testEme(); - void testSpoiler(); - void testProcessingHints(); - void testBobData(); - void testFallbackIndication(); - void testStanzaIds(); - void testSlashMe_data(); - void testSlashMe(); - void testMixInvitation(); - void testTrustMessageElement(); - void testReaction(); - void testE2eeFallbackBody(); - void testFileSharing(); - void testEncryptedFileSource(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); + Q_SLOT void testIsXmppStanza(); + Q_SLOT void testUnknownXExtension(); + Q_SLOT void testMessageAttention(); + Q_SLOT void testMessageReceipt(); + Q_SLOT void testDelay_data(); + Q_SLOT void testDelay(); + Q_SLOT void testDelayWithMultipleStamp(); + Q_SLOT void testExtendedAddresses(); + Q_SLOT void testMucInvitation(); + Q_SLOT void testState_data(); + Q_SLOT void testState(); + Q_SLOT void testXhtml(); + Q_SLOT void testSubextensions(); + Q_SLOT void testChatMarkers(); + Q_SLOT void testPrivateMessage(); + Q_SLOT void testOutOfBandUrl(); + Q_SLOT void testMessageCorrect(); + Q_SLOT void testMessageAttaching(); + Q_SLOT void testMix(); + Q_SLOT void testEme(); + Q_SLOT void testSpoiler(); + Q_SLOT void testProcessingHints(); + Q_SLOT void testBobData(); + Q_SLOT void testFallbackIndication(); + Q_SLOT void testStanzaIds(); + Q_SLOT void testSlashMe_data(); + Q_SLOT void testSlashMe(); + Q_SLOT void testMixInvitation(); + Q_SLOT void testTrustMessageElement(); + Q_SLOT void testReaction(); + Q_SLOT void testE2eeFallbackBody(); + Q_SLOT void testFileSharing(); + Q_SLOT void testEncryptedFileSource(); }; void tst_QXmppMessage::testBasic_data() diff --git a/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp b/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp index 8acbe6c9..25f7d3ed 100644 --- a/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp +++ b/tests/qxmppmessagereaction/tst_qxmppmessagereaction.cpp @@ -11,12 +11,12 @@ class tst_QXmppMessageReaction : public QObject { Q_OBJECT -private slots: - void testIsMessageReaction_data(); - void testIsMessageReaction(); - void testMessageReaction(); - void testMessageReactionWithDuplicateEmojis(); - void testMessageReactionRemoval(); +private: + Q_SLOT void testIsMessageReaction_data(); + Q_SLOT void testIsMessageReaction(); + Q_SLOT void testMessageReaction(); + Q_SLOT void testMessageReactionWithDuplicateEmojis(); + Q_SLOT void testMessageReactionRemoval(); }; void tst_QXmppMessageReaction::testIsMessageReaction_data() diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp index 71c114b5..33ce3de5 100644 --- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp +++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp @@ -12,11 +12,11 @@ class tst_QXmppMessageReceiptManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testReceipt_data(); - void testReceipt(); + Q_SLOT void testReceipt_data(); + Q_SLOT void testReceipt(); void handleMessageDelivered(const QString &, const QString &) { @@ -27,7 +27,6 @@ private slots: m_receiptSent = true; } -private: QXmppMessageReceiptManager *m_manager; QXmppClient m_client; QXmppLogger m_logger; diff --git a/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp b/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp index a455903a..d235a992 100644 --- a/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp +++ b/tests/qxmppmixinvitation/tst_qxmppmixinvitation.cpp @@ -12,9 +12,9 @@ class tst_QXmppMixInvitation : public QObject { Q_OBJECT -private slots: - void testInvitation(); - void testIsInvitation(); +private: + Q_SLOT void testInvitation(); + Q_SLOT void testIsInvitation(); }; void tst_QXmppMixInvitation::testInvitation() diff --git a/tests/qxmppmixiq/tst_qxmppmixiq.cpp b/tests/qxmppmixiq/tst_qxmppmixiq.cpp index 70c20dcb..0983a314 100644 --- a/tests/qxmppmixiq/tst_qxmppmixiq.cpp +++ b/tests/qxmppmixiq/tst_qxmppmixiq.cpp @@ -14,13 +14,13 @@ class tst_QXmppMixIq : public QObject { Q_OBJECT -private slots: - void testBase_data(); - void testBase(); - void testDefaults(); - void testSetters(); - void testInvalidActionType(); - void testIsMixIq(); +private: + Q_SLOT void testBase_data(); + Q_SLOT void testBase(); + Q_SLOT void testDefaults(); + Q_SLOT void testSetters(); + Q_SLOT void testInvalidActionType(); + Q_SLOT void testIsMixIq(); }; void tst_QXmppMixIq::testBase_data() diff --git a/tests/qxmppmixitems/tst_qxmppmixitems.cpp b/tests/qxmppmixitems/tst_qxmppmixitems.cpp index 9eedee9a..529dfedc 100644 --- a/tests/qxmppmixitems/tst_qxmppmixitems.cpp +++ b/tests/qxmppmixitems/tst_qxmppmixitems.cpp @@ -11,11 +11,11 @@ class tst_QXmppMixItem : public QObject { Q_OBJECT -private slots: - void testInfo(); - void testIsInfoItem(); - void testParticipant(); - void testIsParticipantItem(); +private: + Q_SLOT void testInfo(); + Q_SLOT void testIsInfoItem(); + Q_SLOT void testParticipant(); + Q_SLOT void testIsParticipantItem(); }; void tst_QXmppMixItem::testInfo() diff --git a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp index d6dbc04e..3e3284d8 100644 --- a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp +++ b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp @@ -11,10 +11,10 @@ class tst_QXmppNonSASLAuthIq : public QObject { Q_OBJECT -private slots: - void testGet(); - void testSetPlain(); - void testSetDigest(); +private: + Q_SLOT void testGet(); + Q_SLOT void testSetPlain(); + Q_SLOT void testSetDigest(); }; void tst_QXmppNonSASLAuthIq::testGet() diff --git a/tests/qxmppomemodata/tst_qxmppomemodata.cpp b/tests/qxmppomemodata/tst_qxmppomemodata.cpp index 2048cfcf..23912579 100644 --- a/tests/qxmppomemodata/tst_qxmppomemodata.cpp +++ b/tests/qxmppomemodata/tst_qxmppomemodata.cpp @@ -44,26 +44,26 @@ class tst_QXmppOmemoData : public QObject { Q_OBJECT -private slots: - void testIsOmemoDeviceElement_data(); - void testIsOmemoDeviceElement(); - void testOmemoDeviceElement_data(); - void testOmemoDeviceElement(); - void testIsOmemoDeviceList_data(); - void testIsOmemoDeviceList(); - void testOmemoDeviceList(); - void testIsOmemoDeviceBundle_data(); - void testIsOmemoDeviceBundle(); - void testOmemoDeviceBundle(); - void testIsOmemoEnvelope_data(); - void testIsOmemoEnvelope(); - void testOmemoEnvelope_data(); - void testOmemoEnvelope(); - void testIsOmemoElement_data(); - void testIsOmemoElement(); - void testOmemoElement(); - void testMessageOmemoElement(); - void testOmemoIq(); +private: + Q_SLOT void testIsOmemoDeviceElement_data(); + Q_SLOT void testIsOmemoDeviceElement(); + Q_SLOT void testOmemoDeviceElement_data(); + Q_SLOT void testOmemoDeviceElement(); + Q_SLOT void testIsOmemoDeviceList_data(); + Q_SLOT void testIsOmemoDeviceList(); + Q_SLOT void testOmemoDeviceList(); + Q_SLOT void testIsOmemoDeviceBundle_data(); + Q_SLOT void testIsOmemoDeviceBundle(); + Q_SLOT void testOmemoDeviceBundle(); + Q_SLOT void testIsOmemoEnvelope_data(); + Q_SLOT void testIsOmemoEnvelope(); + Q_SLOT void testOmemoEnvelope_data(); + Q_SLOT void testOmemoEnvelope(); + Q_SLOT void testIsOmemoElement_data(); + Q_SLOT void testIsOmemoElement(); + Q_SLOT void testOmemoElement(); + Q_SLOT void testMessageOmemoElement(); + Q_SLOT void testOmemoIq(); }; void tst_QXmppOmemoData::testIsOmemoDeviceElement_data() diff --git a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp index f0cf2447..2d600a5d 100644 --- a/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp +++ b/tests/qxmppomemomanager/tst_qxmppomemomanager.cpp @@ -76,17 +76,17 @@ class tst_QXmppOmemoManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); - void testSecurityPolicies(); - void testTrustLevels(); - void initOmemoUser(OmemoUser &omemoUser); - void testInit(); - void testSetUp(); - void testLoad(); - void testSendMessage(); - void testSendIq(); - void finish(OmemoUser &omemoUser); +private: + Q_SLOT void initTestCase(); + Q_SLOT void testSecurityPolicies(); + Q_SLOT void testTrustLevels(); + Q_SLOT void initOmemoUser(OmemoUser &omemoUser); + Q_SLOT void testInit(); + Q_SLOT void testSetUp(); + Q_SLOT void testLoad(); + Q_SLOT void testSendMessage(); + Q_SLOT void testSendIq(); + Q_SLOT void finish(OmemoUser &omemoUser); private: OmemoUser m_alice1; diff --git a/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp b/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp index cb751ae5..b8bc54ca 100644 --- a/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp +++ b/tests/qxmppomemomemorystorage/tst_qxmppomemomemorystorage.cpp @@ -10,14 +10,13 @@ class tst_QXmppOmemoMemoryStorage : public QObject { Q_OBJECT -private slots: - void testOwnDevice(); - void testSignedPreKeyPairs(); - void testPreKeyPairs(); - void testDevices(); - void testResetAll(); - private: + Q_SLOT void testOwnDevice(); + Q_SLOT void testSignedPreKeyPairs(); + Q_SLOT void testPreKeyPairs(); + Q_SLOT void testDevices(); + Q_SLOT void testResetAll(); + QXmppOmemoMemoryStorage m_omemoStorage; }; diff --git a/tests/qxmpppresence/tst_qxmpppresence.cpp b/tests/qxmpppresence/tst_qxmpppresence.cpp index 95d7ee92..012939b8 100644 --- a/tests/qxmpppresence/tst_qxmpppresence.cpp +++ b/tests/qxmpppresence/tst_qxmpppresence.cpp @@ -14,18 +14,18 @@ class tst_QXmppPresence : public QObject { Q_OBJECT -private slots: - void testPresence(); - void testPresence_data(); - void testPresenceWithCapability(); - void testPresenceWithExtendedAddresses(); - void testPresenceWithMucItem(); - void testPresenceWithMucPassword(); - void testPresenceWithMucSupport(); - void testPresenceWithMuji(); - void testPresenceWithLastUserInteraction(); - void testPresenceWithMix(); - void testPresenceWithVCard(); +private: + Q_SLOT void testPresence(); + Q_SLOT void testPresence_data(); + Q_SLOT void testPresenceWithCapability(); + Q_SLOT void testPresenceWithExtendedAddresses(); + Q_SLOT void testPresenceWithMucItem(); + Q_SLOT void testPresenceWithMucPassword(); + Q_SLOT void testPresenceWithMucSupport(); + Q_SLOT void testPresenceWithMuji(); + Q_SLOT void testPresenceWithLastUserInteraction(); + Q_SLOT void testPresenceWithMix(); + Q_SLOT void testPresenceWithVCard(); }; void tst_QXmppPresence::testPresence_data() diff --git a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp index 5a76dcb0..cbf90ee5 100644 --- a/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp +++ b/tests/qxmpppubsubevent/tst_qxmpppubsubevent.cpp @@ -17,10 +17,10 @@ class tst_QXmppPubSubEvent : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); - void testCustomItem(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); + Q_SLOT void testCustomItem(); }; void tst_QXmppPubSubEvent::testBasic_data() diff --git a/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp b/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp index 0691733c..4f605d2c 100644 --- a/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp +++ b/tests/qxmpppubsubforms/tst_qxmpppubsubforms.cpp @@ -12,10 +12,8 @@ class tst_QXmppPubSubForms : public QObject { Q_OBJECT -private slots: - void subAuthorization(); - private: + Q_SLOT void subAuthorization(); }; void tst_QXmppPubSubForms::subAuthorization() diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp index 809711a9..2d59124f 100644 --- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp +++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp @@ -18,20 +18,20 @@ class tst_QXmppPubSubIq : public QObject { Q_OBJECT -private slots: - void testItems(); - void testItemsResponse(); - void testCreateNode(); - void testDeleteNode(); - void testPublish(); - void testRetractItem(); - void testSubscribe(); - void testSubscription(); - void testSubscriptions(); - void testIsPubSubIq_data(); - void testIsPubSubIq(); - - void testCustomItem(); +private: + Q_SLOT void testItems(); + Q_SLOT void testItemsResponse(); + Q_SLOT void testCreateNode(); + Q_SLOT void testDeleteNode(); + Q_SLOT void testPublish(); + Q_SLOT void testRetractItem(); + Q_SLOT void testSubscribe(); + Q_SLOT void testSubscription(); + Q_SLOT void testSubscriptions(); + Q_SLOT void testIsPubSubIq_data(); + Q_SLOT void testIsPubSubIq(); + + Q_SLOT void testCustomItem(); }; void tst_QXmppPubSubIq::testItems() diff --git a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp index 8cef930c..cf210dd4 100644 --- a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp +++ b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp @@ -12,12 +12,12 @@ class tst_QXmppPushEnableIq : public QObject { Q_OBJECT -private slots: - void testPushEnable(); - void testPushDisable(); - void testXmlNs(); - void testDataForm(); - void testIsEnableIq(); +private: + Q_SLOT void testPushEnable(); + Q_SLOT void testPushDisable(); + Q_SLOT void testXmlNs(); + Q_SLOT void testDataForm(); + Q_SLOT void testIsEnableIq(); }; void tst_QXmppPushEnableIq::testPushEnable() diff --git a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp index 909fedac..b07d4d1b 100644 --- a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp +++ b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp @@ -15,19 +15,19 @@ class tst_QXmppRegisterIq : public QObject { Q_OBJECT -private slots: - void testGet(); - void testResult(); - void testResultWithForm(); - void testResultWithRedirection(); - void testResultWithFormAndRedirection(); - void testSet(); - void testSetWithForm(); - void testBobData(); - void testRegistered(); - void testRemove(); - void testChangePassword(); - void testUnregistration(); +private: + Q_SLOT void testGet(); + Q_SLOT void testResult(); + Q_SLOT void testResultWithForm(); + Q_SLOT void testResultWithRedirection(); + Q_SLOT void testResultWithFormAndRedirection(); + Q_SLOT void testSet(); + Q_SLOT void testSetWithForm(); + Q_SLOT void testBobData(); + Q_SLOT void testRegistered(); + Q_SLOT void testRemove(); + Q_SLOT void testChangePassword(); + Q_SLOT void testUnregistration(); }; void tst_QXmppRegisterIq::testGet() diff --git a/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp b/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp index 0cd2b005..80dabe65 100644 --- a/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp +++ b/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp @@ -13,34 +13,33 @@ class tst_QXmppRegistrationManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); - - void testDiscoFeatures(); - - void testChangePassword_data(); - void testChangePassword(); - void testDeleteAccount(); - void testRequestRegistrationForm_data(); - void testRequestRegistrationForm(); - void testRegisterOnConnectGetSet(); - void testServiceDiscovery(); - void testSendCachedRegistrationForm_data(); - void testSendCachedRegistrationForm(); - void testStreamFeaturesCheck_data(); - void testStreamFeaturesCheck(); - void testRegistrationResult_data(); - void testRegistrationResult(); - void testChangePasswordResult_data(); - void testChangePasswordResult(); - void testDeleteAccountResult_data(); - void testDeleteAccountResult(); - void testRegistrationFormReceived(); - - void sendStreamFeaturesToManager(bool registrationEnabled = true); - void setManagerConfig(const QString &username, const QString &server = QStringLiteral("example.org"), const QString &password = {}); - private: + Q_SLOT void initTestCase(); + + Q_SLOT void testDiscoFeatures(); + + Q_SLOT void testChangePassword_data(); + Q_SLOT void testChangePassword(); + Q_SLOT void testDeleteAccount(); + Q_SLOT void testRequestRegistrationForm_data(); + Q_SLOT void testRequestRegistrationForm(); + Q_SLOT void testRegisterOnConnectGetSet(); + Q_SLOT void testServiceDiscovery(); + Q_SLOT void testSendCachedRegistrationForm_data(); + Q_SLOT void testSendCachedRegistrationForm(); + Q_SLOT void testStreamFeaturesCheck_data(); + Q_SLOT void testStreamFeaturesCheck(); + Q_SLOT void testRegistrationResult_data(); + Q_SLOT void testRegistrationResult(); + Q_SLOT void testChangePasswordResult_data(); + Q_SLOT void testChangePasswordResult(); + Q_SLOT void testDeleteAccountResult_data(); + Q_SLOT void testDeleteAccountResult(); + Q_SLOT void testRegistrationFormReceived(); + + Q_SLOT void sendStreamFeaturesToManager(bool registrationEnabled = true); + Q_SLOT void setManagerConfig(const QString &username, const QString &server = QStringLiteral("example.org"), const QString &password = {}); + QXmppClient client; QXmppLogger logger; QXmppRegistrationManager *manager; @@ -206,7 +205,7 @@ void tst_QXmppRegistrationManager::testServiceDiscovery() delete context; // on disconnect, supportedByServer needs to be reset - emit client.disconnected(); + Q_EMIT client.disconnected(); QVERIFY(!manager->supportedByServer()); } diff --git a/tests/qxmppresultset/tst_qxmppresultset.cpp b/tests/qxmppresultset/tst_qxmppresultset.cpp index 67b00466..8238b5e6 100644 --- a/tests/qxmppresultset/tst_qxmppresultset.cpp +++ b/tests/qxmppresultset/tst_qxmppresultset.cpp @@ -12,11 +12,11 @@ class tst_QXmppResultSet : public QObject { Q_OBJECT -private slots: - void testQuery_data(); - void testQuery(); - void testReply_data(); - void testReply(); +private: + Q_SLOT void testQuery_data(); + Q_SLOT void testQuery(); + Q_SLOT void testReply_data(); + Q_SLOT void testReply(); }; void tst_QXmppResultSet::testQuery_data() diff --git a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp index 728bd9ee..7cb5d332 100644 --- a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp +++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp @@ -11,15 +11,15 @@ class tst_QXmppRosterIq : public QObject { Q_OBJECT -private slots: - void testItem_data(); - void testItem(); - void testApproved_data(); - void testApproved(); - void testVersion_data(); - void testVersion(); - void testMixAnnotate(); - void testMixChannel(); +private: + Q_SLOT void testItem_data(); + Q_SLOT void testItem(); + Q_SLOT void testApproved_data(); + Q_SLOT void testApproved(); + Q_SLOT void testVersion_data(); + Q_SLOT void testVersion(); + Q_SLOT void testMixAnnotate(); + Q_SLOT void testMixChannel(); }; void tst_QXmppRosterIq::testItem_data() diff --git a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp index 261610d4..11c7fb3d 100644 --- a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp +++ b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp @@ -13,12 +13,12 @@ class tst_QXmppRosterManager : public QObject { Q_OBJECT -private slots: - void initTestCase(); +private: + Q_SLOT void initTestCase(); - void testDiscoFeatures(); - void testRenameItem(); - void subscriptionRequestReceived(); + Q_SLOT void testDiscoFeatures(); + Q_SLOT void testRenameItem(); + Q_SLOT void subscriptionRequestReceived(); Q_SLOT void testAddItem(); Q_SLOT void testRemoveItem(); @@ -106,7 +106,7 @@ void tst_QXmppRosterManager::subscriptionRequestReceived() QCOMPARE(presence.statusText(), QStringLiteral("Hi, I'm Alice.")); }); - emit client.presenceReceived(presence); + Q_EMIT client.presenceReceived(presence); QVERIFY(subscriptionRequestReceived); } diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp index be651243..9c2bc5c0 100644 --- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp +++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp @@ -35,21 +35,21 @@ class tst_QXmppRpcIq : public QObject { Q_OBJECT -private slots: - void testBase64(); - void testBool(); - void testDateTime(); - void testDouble(); - void testInt(); - void testNil(); - void testString(); - - void testArray(); - void testStruct(); - - void testInvoke(); - void testResponse(); - void testResponseFault(); +private: + Q_SLOT void testBase64(); + Q_SLOT void testBool(); + Q_SLOT void testDateTime(); + Q_SLOT void testDouble(); + Q_SLOT void testInt(); + Q_SLOT void testNil(); + Q_SLOT void testString(); + + Q_SLOT void testArray(); + Q_SLOT void testStruct(); + + Q_SLOT void testInvoke(); + Q_SLOT void testResponse(); + Q_SLOT void testResponseFault(); }; void tst_QXmppRpcIq::testBase64() { diff --git a/tests/qxmppsasl/tst_qxmppsasl.cpp b/tests/qxmppsasl/tst_qxmppsasl.cpp index 88709dd4..951af0b4 100644 --- a/tests/qxmppsasl/tst_qxmppsasl.cpp +++ b/tests/qxmppsasl/tst_qxmppsasl.cpp @@ -11,37 +11,37 @@ class tst_QXmppSasl : public QObject { Q_OBJECT -private slots: - void testParsing(); - void testAuth_data(); - void testAuth(); - void testChallenge_data(); - void testChallenge(); - void testFailure(); - void testResponse_data(); - void testResponse(); - void testSuccess(); +private: + Q_SLOT void testParsing(); + Q_SLOT void testAuth_data(); + Q_SLOT void testAuth(); + Q_SLOT void testChallenge_data(); + Q_SLOT void testChallenge(); + Q_SLOT void testFailure(); + Q_SLOT void testResponse_data(); + Q_SLOT void testResponse(); + Q_SLOT void testSuccess(); // client - void testClientAvailableMechanisms(); - void testClientBadMechanism(); - void testClientAnonymous(); - void testClientDigestMd5(); - void testClientDigestMd5_data(); - void testClientFacebook(); - void testClientGoogle(); - void testClientPlain(); - void testClientScramSha1(); - void testClientScramSha1_bad(); - void testClientScramSha256(); - void testClientWindowsLive(); + Q_SLOT void testClientAvailableMechanisms(); + Q_SLOT void testClientBadMechanism(); + Q_SLOT void testClientAnonymous(); + Q_SLOT void testClientDigestMd5(); + Q_SLOT void testClientDigestMd5_data(); + Q_SLOT void testClientFacebook(); + Q_SLOT void testClientGoogle(); + Q_SLOT void testClientPlain(); + Q_SLOT void testClientScramSha1(); + Q_SLOT void testClientScramSha1_bad(); + Q_SLOT void testClientScramSha256(); + Q_SLOT void testClientWindowsLive(); // server - void testServerBadMechanism(); - void testServerAnonymous(); - void testServerDigestMd5(); - void testServerPlain(); - void testServerPlainChallenge(); + Q_SLOT void testServerBadMechanism(); + Q_SLOT void testServerAnonymous(); + Q_SLOT void testServerDigestMd5(); + Q_SLOT void testServerPlain(); + Q_SLOT void testServerPlainChallenge(); }; void tst_QXmppSasl::testParsing() diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp index 8715d205..28e5c96f 100644 --- a/tests/qxmppserver/tst_qxmppserver.cpp +++ b/tests/qxmppserver/tst_qxmppserver.cpp @@ -11,9 +11,9 @@ class tst_QXmppServer : public QObject { Q_OBJECT -private slots: - void testConnect_data(); - void testConnect(); +private: + Q_SLOT void testConnect_data(); + Q_SLOT void testConnect(); }; void tst_QXmppServer::testConnect_data() diff --git a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp index 837ef4c7..91b1bb8f 100644 --- a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp +++ b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp @@ -11,8 +11,8 @@ class TestPackets : public QObject { Q_OBJECT -private slots: - void testSession(); +private: + Q_SLOT void testSession(); }; void TestPackets::testSession() diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp index eea55649..a58755ac 100644 --- a/tests/qxmppsocks/tst_qxmppsocks.cpp +++ b/tests/qxmppsocks/tst_qxmppsocks.cpp @@ -12,17 +12,16 @@ class tst_QXmppSocks : public QObject { Q_OBJECT -private slots: - void init(); - void newConnectionSlot(QTcpSocket *socket, QString hostName, quint16 port); +private: + Q_SLOT void init(); + Q_SLOT void newConnectionSlot(QTcpSocket *socket, QString hostName, quint16 port); - void testClient_data(); - void testClient(); - void testClientAndServer(); - void testServer_data(); - void testServer(); + Q_SLOT void testClient_data(); + Q_SLOT void testClient(); + Q_SLOT void testClientAndServer(); + Q_SLOT void testServer_data(); + Q_SLOT void testServer(); -private: QTcpSocket *m_connectionSocket; QString m_connectionHostName; quint16 m_connectionPort; diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp index 8f331e45..5439262c 100644 --- a/tests/qxmppstanza/tst_qxmppstanza.cpp +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -20,19 +20,19 @@ class tst_QXmppStanza : public QObject { Q_OBJECT -private slots: - void testExtendedAddress_data(); - void testExtendedAddress(); - - void testErrorCases_data(); - void testErrorCases(); - void testErrorFileTooLarge(); - void testErrorRetry(); - void testErrorEnums(); - - void testEncryption(); - void testSenderKey(); - void testSceTimestamp(); +private: + Q_SLOT void testExtendedAddress_data(); + Q_SLOT void testExtendedAddress(); + + Q_SLOT void testErrorCases_data(); + Q_SLOT void testErrorCases(); + Q_SLOT void testErrorFileTooLarge(); + Q_SLOT void testErrorRetry(); + Q_SLOT void testErrorEnums(); + + Q_SLOT void testEncryption(); + Q_SLOT void testSenderKey(); + Q_SLOT void testSceTimestamp(); }; void tst_QXmppStanza::testExtendedAddress_data() diff --git a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp index 238c9164..cdccd04d 100644 --- a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp +++ b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp @@ -11,9 +11,9 @@ class tst_QXmppStartTlsPacket : public QObject { Q_OBJECT -private slots: - void testBasic_data(); - void testBasic(); +private: + Q_SLOT void testBasic_data(); + Q_SLOT void testBasic(); }; void tst_QXmppStartTlsPacket::testBasic_data() diff --git a/tests/qxmppstream/tst_qxmppstream.cpp b/tests/qxmppstream/tst_qxmppstream.cpp index d462c7df..45f78654 100644 --- a/tests/qxmppstream/tst_qxmppstream.cpp +++ b/tests/qxmppstream/tst_qxmppstream.cpp @@ -21,17 +21,17 @@ public: void handleStart() override { QXmppStream::handleStart(); - emit started(); + Q_EMIT started(); } void handleStream(const QDomElement &element) override { - emit streamReceived(element); + Q_EMIT streamReceived(element); } void handleStanza(const QDomElement &element) override { - emit stanzaReceived(element); + Q_EMIT stanzaReceived(element); } Q_SIGNAL void started(); diff --git a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp index 94e59eeb..c1e95149 100644 --- a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp +++ b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp @@ -28,11 +28,11 @@ class tst_QXmppStreamFeatures : public QObject { Q_OBJECT -private slots: - void testEmpty(); - void testRequired(); - void testFull(); - void testSetters(); +private: + Q_SLOT void testEmpty(); + Q_SLOT void testRequired(); + Q_SLOT void testFull(); + Q_SLOT void testSetters(); }; void tst_QXmppStreamFeatures::testEmpty() diff --git a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp index f80722e1..b07e8fae 100644 --- a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp +++ b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp @@ -11,13 +11,13 @@ class tst_QXmppStunMessage : public QObject { Q_OBJECT -private slots: - void testFingerprint(); - void testIntegrity(); - void testIPv4Address(); - void testIPv6Address(); - void testXorIPv4Address(); - void testXorIPv6Address(); +private: + Q_SLOT void testFingerprint(); + Q_SLOT void testIntegrity(); + Q_SLOT void testIPv4Address(); + Q_SLOT void testIPv6Address(); + Q_SLOT void testXorIPv4Address(); + Q_SLOT void testXorIPv6Address(); }; void tst_QXmppStunMessage::testFingerprint() diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp index 4440b1ae..f40b2e7e 100644 --- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp +++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp @@ -14,14 +14,13 @@ class tst_QXmppTransferManager : public QObject { Q_OBJECT -private slots: - void init(); - void testSendFile_data(); - void testSendFile(); +private: + Q_SLOT void init(); + Q_SLOT void testSendFile_data(); + Q_SLOT void testSendFile(); - void acceptFile(QXmppTransferJob *job); + Q_SLOT void acceptFile(QXmppTransferJob *job); -private: QBuffer receiverBuffer; QXmppTransferJob *receiverJob; }; diff --git a/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp b/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp index 6696081d..0c679aa5 100644 --- a/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp +++ b/tests/qxmpptrustmemorystorage/tst_qxmpptrustmemorystorage.cpp @@ -17,19 +17,18 @@ class tst_QXmppTrustMemoryStorage : public QObject { Q_OBJECT -private slots: +private: // QXmppTrustMemoryStorage - void testSecurityPolicy(); - void testOwnKeys(); - void testKeys(); - void testTrustLevels(); - void testResetAll(); + Q_SLOT void testSecurityPolicy(); + Q_SLOT void testOwnKeys(); + Q_SLOT void testKeys(); + Q_SLOT void testTrustLevels(); + Q_SLOT void testResetAll(); // QXmppAtmTrustMemoryStorage - void atmTestKeysForPostponedTrustDecisions(); - void atmTestResetAll(); + Q_SLOT void atmTestKeysForPostponedTrustDecisions(); + Q_SLOT void atmTestResetAll(); -private: QXmppTrustMemoryStorage m_trustStorage; QXmppAtmTrustMemoryStorage m_atmTrustStorage; }; diff --git a/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp b/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp index aee889fd..a6b9c618 100644 --- a/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp +++ b/tests/qxmpptrustmessages/tst_qxmpptrustmessages.cpp @@ -12,14 +12,14 @@ class tst_QXmppTrustMessages : public QObject { Q_OBJECT -private slots: - void testIsTrustMessageKeyOwner_data(); - void testIsTrustMessageKeyOwner(); - void testTrustMessageKeyOwner_data(); - void testTrustMessageKeyOwner(); - void testIsTrustMessageElement_data(); - void testIsTrustMessageElement(); - void testTrustMessageElement(); +private: + Q_SLOT void testIsTrustMessageKeyOwner_data(); + Q_SLOT void testIsTrustMessageKeyOwner(); + Q_SLOT void testTrustMessageKeyOwner_data(); + Q_SLOT void testTrustMessageKeyOwner(); + Q_SLOT void testIsTrustMessageElement_data(); + Q_SLOT void testIsTrustMessageElement(); + Q_SLOT void testTrustMessageElement(); }; void tst_QXmppTrustMessages::testIsTrustMessageKeyOwner_data() diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp index 032e9957..47cf65c1 100644 --- a/tests/qxmpputils/tst_qxmpputils.cpp +++ b/tests/qxmpputils/tst_qxmpputils.cpp @@ -20,15 +20,13 @@ class tst_QXmppUtils : public QObject { Q_OBJECT -private slots: - void testCrc32(); - void testHmac(); - void testJid(); - void testMime(); - void testTimezoneOffset(); - void testStanzaHash(); - private: + Q_SLOT void testCrc32(); + Q_SLOT void testHmac(); + Q_SLOT void testJid(); + Q_SLOT void testMime(); + Q_SLOT void testTimezoneOffset(); + Q_SLOT void testStanzaHash(); Q_SLOT void testCalculateHashes_data(); Q_SLOT void testCalculateHashes(); }; diff --git a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp index bfa26a9c..5e104c76 100644 --- a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp +++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp @@ -11,14 +11,14 @@ class tst_QXmppVCardIq : public QObject { Q_OBJECT -private slots: - void testAddress_data(); - void testAddress(); - void testEmail_data(); - void testEmail(); - void testPhone_data(); - void testPhone(); - void testVCard(); +private: + Q_SLOT void testAddress_data(); + Q_SLOT void testAddress(); + Q_SLOT void testEmail_data(); + Q_SLOT void testEmail(); + Q_SLOT void testPhone_data(); + Q_SLOT void testPhone(); + Q_SLOT void testVCard(); }; void tst_QXmppVCardIq::testAddress_data() diff --git a/tests/qxmppversioniq/tst_qxmppversioniq.cpp b/tests/qxmppversioniq/tst_qxmppversioniq.cpp index 7c3bd15d..849a9958 100644 --- a/tests/qxmppversioniq/tst_qxmppversioniq.cpp +++ b/tests/qxmppversioniq/tst_qxmppversioniq.cpp @@ -12,9 +12,9 @@ class tst_QXmppVersionIq : public QObject { Q_OBJECT -private slots: - void testVersionGet(); - void testVersionResult(); +private: + Q_SLOT void testVersionGet(); + Q_SLOT void testVersionResult(); }; void tst_QXmppVersionIq::testVersionGet() |