diff options
author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | 2022-09-30 20:12:08 +0300 |
---|---|---|
committer | Matthieu Gallien <matthieu_gallien@yahoo.fr> | 2022-10-04 12:14:45 +0300 |
commit | 565a5f099916427ccbfa5f25dc6e8bc3e65ebfc7 (patch) | |
tree | f79ccd04cad4a0e2a005206a04613d29e4812f5c /test | |
parent | 5fc017575bd8af27791818e167f6dc72a058f40f (diff) |
add [[nodiscard]] attribute via clang-tidy
ran
run-clang-tidy-14.py -header-filter='.*' -checks='-*,modernize-use-nodiscard' -fix
under linux with most part of our code covered
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/pushnotificationstestutils.h | 18 | ||||
-rw-r--r-- | test/syncenginetestutils.h | 48 | ||||
-rw-r--r-- | test/testactivitylistmodel.cpp | 2 | ||||
-rw-r--r-- | test/testdownload.cpp | 2 | ||||
-rw-r--r-- | test/testoauth.cpp | 6 | ||||
-rw-r--r-- | test/testsetuserstatusdialog.cpp | 10 | ||||
-rw-r--r-- | test/testsyncfilestatustracker.cpp | 4 | ||||
-rw-r--r-- | test/testunifiedsearchlistmodel.cpp | 2 | ||||
-rw-r--r-- | test/themeutils.h | 4 |
9 files changed, 48 insertions, 48 deletions
diff --git a/test/pushnotificationstestutils.h b/test/pushnotificationstestutils.h index 57e56831e..25c1d9345 100644 --- a/test/pushnotificationstestutils.h +++ b/test/pushnotificationstestutils.h @@ -36,13 +36,13 @@ public: void close(); - bool waitForTextMessages() const; + [[nodiscard]] bool waitForTextMessages() const; - uint32_t textMessagesCount() const; + [[nodiscard]] uint32_t textMessagesCount() const; - QString textMessage(int messageNumber) const; + [[nodiscard]] QString textMessage(int messageNumber) const; - QWebSocket *socketForTextMessage(int messageNumber) const; + [[nodiscard]] QWebSocket *socketForTextMessage(int messageNumber) const; void clearTextMessages(); @@ -70,11 +70,11 @@ class CredentialsStub : public OCC::AbstractCredentials public: CredentialsStub(const QString &user, const QString &password); - QString authType() const override; - QString user() const override; - QString password() const override; - QNetworkAccessManager *createQNAM() const override; - bool ready() const override; + [[nodiscard]] QString authType() const override; + [[nodiscard]] QString user() const override; + [[nodiscard]] QString password() const override; + [[nodiscard]] QNetworkAccessManager *createQNAM() const override; + [[nodiscard]] bool ready() const override; void fetchFromKeychain() override; void askFromUser() override; diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index e44d5d9cb..ddd50273b 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -66,11 +66,11 @@ public: PathComponents(const QString &path); PathComponents(const QStringList &pathComponents); - PathComponents parentDirComponents() const; - PathComponents subComponents() const &; + [[nodiscard]] PathComponents parentDirComponents() const; + [[nodiscard]] PathComponents subComponents() const &; PathComponents subComponents() && { removeFirst(); return std::move(*this); } - QString pathRoot() const { return first(); } - QString fileName() const { return last(); } + [[nodiscard]] QString pathRoot() const { return first(); } + [[nodiscard]] QString fileName() const { return last(); } }; class FileModifier @@ -146,8 +146,8 @@ public: return !operator==(other); } - QString path() const; - QString absolutePath() const; + [[nodiscard]] QString path() const; + [[nodiscard]] QString absolutePath() const; void fixupParentPathRecursively(); @@ -200,7 +200,7 @@ public: void abort() override { } - qint64 bytesAvailable() const override; + [[nodiscard]] qint64 bytesAvailable() const override; qint64 readData(char *data, qint64 maxlen) override; }; @@ -231,7 +231,7 @@ public: void abort() override; - qint64 bytesAvailable() const override; + [[nodiscard]] qint64 bytesAvailable() const override; qint64 readData(char *data, qint64 maxlen) override; private: @@ -291,7 +291,7 @@ public: Q_INVOKABLE void respond(); void abort() override; - qint64 bytesAvailable() const override; + [[nodiscard]] qint64 bytesAvailable() const override; qint64 readData(char *data, qint64 maxlen) override; }; @@ -310,7 +310,7 @@ public: Q_INVOKABLE void respond(); void abort() override; - qint64 bytesAvailable() const override; + [[nodiscard]] qint64 bytesAvailable() const override; qint64 readData(char *data, qint64 maxlen) override; }; @@ -349,7 +349,7 @@ public: void abort() override {} qint64 readData(char *buf, qint64 max) override; - qint64 bytesAvailable() const override; + [[nodiscard]] qint64 bytesAvailable() const override; QByteArray _body; QMap<QNetworkRequest::KnownHeaders, QByteArray> _additionalHeaders; @@ -377,7 +377,7 @@ public slots: public: void abort() override { } qint64 readData(char *buf, qint64 max) override; - qint64 bytesAvailable() const override; + [[nodiscard]] qint64 bytesAvailable() const override; QByteArray _body; }; @@ -474,11 +474,11 @@ class FakeCredentials : public OCC::AbstractCredentials QNetworkAccessManager *_qnam; public: FakeCredentials(QNetworkAccessManager *qnam) : _qnam{qnam} { } - QString authType() const override { return "test"; } - QString user() const override { return "admin"; } - QString password() const override { return "password"; } - QNetworkAccessManager *createQNAM() const override { return _qnam; } - bool ready() const override { return true; } + [[nodiscard]] QString authType() const override { return "test"; } + [[nodiscard]] QString user() const override { return "admin"; } + [[nodiscard]] QString password() const override { return "password"; } + [[nodiscard]] QNetworkAccessManager *createQNAM() const override { return _qnam; } + [[nodiscard]] bool ready() const override { return true; } void fetchFromKeychain() override { } void askFromUser() override { } bool stillValid(QNetworkReply *) override { return true; } @@ -502,9 +502,9 @@ public: void switchToVfs(QSharedPointer<OCC::Vfs> vfs); - OCC::AccountPtr account() const { return _account; } - OCC::SyncEngine &syncEngine() const { return *_syncEngine; } - OCC::SyncJournalDb &syncJournal() const { return *_journalDb; } + [[nodiscard]] OCC::AccountPtr account() const { return _account; } + [[nodiscard]] OCC::SyncEngine &syncEngine() const { return *_syncEngine; } + [[nodiscard]] OCC::SyncJournalDb &syncJournal() const { return *_journalDb; } FileModifier &localModifier() { return _localModifier; } FileInfo &remoteModifier() { return _fakeQnam->currentRemoteState(); } @@ -512,7 +512,7 @@ public: FileInfo currentRemoteState() { return _fakeQnam->currentRemoteState(); } FileInfo &uploadState() { return _fakeQnam->uploadState(); } - FileInfo dbState() const; + [[nodiscard]] FileInfo dbState() const; struct ErrorList { FakeQNAM *_qnam; @@ -528,7 +528,7 @@ public: return _fakeQnam->forEachReplyPart(outgoingData, contentType, replyFunction); } - QString localPath() const; + [[nodiscard]] QString localPath() const; void scheduleSync(); @@ -575,9 +575,9 @@ struct ItemCompletedSpy : QSignalSpy { : QSignalSpy(&folder.syncEngine(), &OCC::SyncEngine::itemCompleted) {} - OCC::SyncFileItemPtr findItem(const QString &path) const; + [[nodiscard]] OCC::SyncFileItemPtr findItem(const QString &path) const; - OCC::SyncFileItemPtr findItemWithExpectedRank(const QString &path, int rank) const; + [[nodiscard]] OCC::SyncFileItemPtr findItemWithExpectedRank(const QString &path, int rank) const; }; // QTest::toString overloads diff --git a/test/testactivitylistmodel.cpp b/test/testactivitylistmodel.cpp index a30ad2a16..742b97a5e 100644 --- a/test/testactivitylistmodel.cpp +++ b/test/testactivitylistmodel.cpp @@ -318,7 +318,7 @@ public: return {}; } - int startingIdLast() const { return _startingId; } + [[nodiscard]] int startingIdLast() const { return _startingId; } private: static FakeRemoteActivityStorage *_instance; diff --git a/test/testdownload.cpp b/test/testdownload.cpp index f534f1a1e..9c0431cf8 100644 --- a/test/testdownload.cpp +++ b/test/testdownload.cpp @@ -22,7 +22,7 @@ public: using FakeGetReply::FakeGetReply; int fakeSize = stopAfter; - qint64 bytesAvailable() const override + [[nodiscard]] qint64 bytesAvailable() const override { if (aborted) return 0; diff --git a/test/testoauth.cpp b/test/testoauth.cpp index a366407db..d3be8dcff 100644 --- a/test/testoauth.cpp +++ b/test/testoauth.cpp @@ -84,7 +84,7 @@ public: void abort() override { aborted = true; } - qint64 bytesAvailable() const override { + [[nodiscard]] qint64 bytesAvailable() const override { if (aborted) return 0; return payload->bytesAvailable(); @@ -116,7 +116,7 @@ public: Q_ENUM(State); bool replyToBrowserOk = false; bool gotAuthOk = false; - virtual bool done() const { return replyToBrowserOk && gotAuthOk; } + [[nodiscard]] virtual bool done() const { return replyToBrowserOk && gotAuthOk; } FakeQNAM *fakeQnam = nullptr; QNetworkAccessManager realQNAM; @@ -187,7 +187,7 @@ public: return new FakePostReply(op, req, std::move(payload), fakeQnam); } - virtual QByteArray tokenReplyPayload() const { + [[nodiscard]] virtual QByteArray tokenReplyPayload() const { QJsonDocument jsondata(QJsonObject{ { "access_token", "123" }, { "refresh_token" , "456" }, diff --git a/test/testsetuserstatusdialog.cpp b/test/testsetuserstatusdialog.cpp index d529f1a16..035221623 100644 --- a/test/testsetuserstatusdialog.cpp +++ b/test/testsetuserstatusdialog.cpp @@ -69,7 +69,7 @@ public: } } - OCC::UserStatus userStatus() const override + [[nodiscard]] OCC::UserStatus userStatus() const override { return {}; // Not implemented } @@ -85,9 +85,9 @@ public: _predefinedStatuses = statuses; } - OCC::UserStatus userStatusSetByCallerOfSetUserStatus() const { return _userStatusSetByCallerOfSetUserStatus; } + [[nodiscard]] OCC::UserStatus userStatusSetByCallerOfSetUserStatus() const { return _userStatusSetByCallerOfSetUserStatus; } - bool messageCleared() const { return _isMessageCleared; } + [[nodiscard]] bool messageCleared() const { return _isMessageCleared; } void setErrorCouldNotFetchPredefinedUserStatuses(bool value) { @@ -137,9 +137,9 @@ class FakeDateTimeProvider : public OCC::DateTimeProvider public: void setCurrentDateTime(const QDateTime &dateTime) { _dateTime = dateTime; } - QDateTime currentDateTime() const override { return _dateTime; } + [[nodiscard]] QDateTime currentDateTime() const override { return _dateTime; } - QDate currentDate() const override { return _dateTime.date(); } + [[nodiscard]] QDate currentDate() const override { return _dateTime.date(); } private: QDateTime _dateTime; diff --git a/test/testsyncfilestatustracker.cpp b/test/testsyncfilestatustracker.cpp index e87bb6575..8abaea6b4 100644 --- a/test/testsyncfilestatustracker.cpp +++ b/test/testsyncfilestatustracker.cpp @@ -20,7 +20,7 @@ public: , _syncEngine(syncEngine) { } - SyncFileStatus statusOf(const QString &relativePath) const { + [[nodiscard]] SyncFileStatus statusOf(const QString &relativePath) const { QFileInfo file(_syncEngine.localPath(), relativePath); auto locPath = _syncEngine.localPath(); // Start from the end to get the latest status @@ -31,7 +31,7 @@ public: return {}; } - bool statusEmittedBefore(const QString &firstPath, const QString &secondPath) const { + [[nodiscard]] bool statusEmittedBefore(const QString &firstPath, const QString &secondPath) const { QFileInfo firstFile(_syncEngine.localPath(), firstPath); QFileInfo secondFile(_syncEngine.localPath(), secondPath); // Start from the end to get the latest status diff --git a/test/testunifiedsearchlistmodel.cpp b/test/testunifiedsearchlistmodel.cpp index ea7de04ba..61885524a 100644 --- a/test/testunifiedsearchlistmodel.cpp +++ b/test/testunifiedsearchlistmodel.cpp @@ -265,7 +265,7 @@ public: return QJsonDocument::fromVariant(QVariantMap{{QStringLiteral("ocs"), ocsMap}}).toJson(QJsonDocument::Compact); } - const QByteArray &fakeProvidersResponseJson() const { return _providersResponse; } + [[nodiscard]] const QByteArray &fakeProvidersResponseJson() const { return _providersResponse; } private: static FakeSearchResultsStorage *_instance; diff --git a/test/themeutils.h b/test/themeutils.h index 4e8327e54..e180b0961 100644 --- a/test/themeutils.h +++ b/test/themeutils.h @@ -22,12 +22,12 @@ class FakePaintDevice : public QPaintDevice public: FakePaintDevice(); - QPaintEngine *paintEngine() const override; + [[nodiscard]] QPaintEngine *paintEngine() const override; void setHidpi(bool value); protected: - int metric(QPaintDevice::PaintDeviceMetric metric) const override; + [[nodiscard]] int metric(QPaintDevice::PaintDeviceMetric metric) const override; private: bool _hidpi = false; |