From ec0f58f5cfe0289c3743e706a8054b28dd9530ce Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 29 Dec 2024 10:56:05 +0100 Subject: [PATCH] Fix -Wunused-result warnings in tests Existing ones, as well as the newly-popping up ones from QFile::open(). Pick-to: 6.9 6.8 Change-Id: I580f3a022c18bc9026e47df10da8cc7b78296366 Reviewed-by: Thiago Macieira --- tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp | 8 ++++---- tests/auto/wayland/multithreaded/tst_multithreaded.cpp | 3 +-- .../wayland/primaryselectionv1/tst_primaryselectionv1.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp b/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp index 50d78130a52..d225f7374f5 100644 --- a/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp +++ b/tests/auto/wayland/datadevicev1/tst_datadevicev1.cpp @@ -67,7 +67,7 @@ void tst_datadevicev1::pasteAscii() auto *offer = dataDevice()->sendDataOffer(client, {"text/plain"}); connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) { QFile file; - file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QVERIFY(file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle)); QCOMPARE(mimeType, "text/plain"); file.write(QByteArray("normal ascii")); file.close(); @@ -105,7 +105,7 @@ void tst_datadevicev1::pasteUtf8() auto *offer = dataDevice()->sendDataOffer(client, {"text/plain", "text/plain;charset=utf-8"}); connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) { QFile file; - file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QVERIFY(file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle)); QCOMPARE(mimeType, "text/plain;charset=utf-8"); file.write(QByteArray("face with tears of joy: 😂")); file.close(); @@ -143,7 +143,7 @@ void tst_datadevicev1::pasteMozUrl() auto *offer = dataDevice()->sendDataOffer(client, {"text/x-moz-url"}); connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) { QFile file; - file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QVERIFY(file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle)); QCOMPARE(mimeType, "text/x-moz-url"); const QString content("https://www.qt.io/\nQt\nhttps://www.example.com/\nExample Website"); // Need UTF-16. @@ -186,7 +186,7 @@ void tst_datadevicev1::pasteSingleUtf8MozUrl() auto *offer = dataDevice()->sendDataOffer(client, {"text/x-moz-url"}); connect(offer, &DataOffer::receive, offer, [](QString mimeType, int fd) { QFile file; - file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QVERIFY(file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle)); QCOMPARE(mimeType, "text/x-moz-url"); const QString content("https://www.qt.io/"); file.write(content.toUtf8()); diff --git a/tests/auto/wayland/multithreaded/tst_multithreaded.cpp b/tests/auto/wayland/multithreaded/tst_multithreaded.cpp index a1a7d367ef3..eb9f56205b3 100644 --- a/tests/auto/wayland/multithreaded/tst_multithreaded.cpp +++ b/tests/auto/wayland/multithreaded/tst_multithreaded.cpp @@ -83,8 +83,7 @@ protected: if (fds[1].revents & POLLIN) { char pipeIn; - read(m_pipefd[0], &pipeIn, 1); - if (pipeIn == 'q') + if (read(m_pipefd[0], &pipeIn, 1) == 1 && pipeIn == 'q') break; } } diff --git a/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp b/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp index d23aed7b85c..1ce6d0f033d 100644 --- a/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp +++ b/tests/auto/wayland/primaryselectionv1/tst_primaryselectionv1.cpp @@ -292,7 +292,7 @@ void tst_primaryselectionv1::pasteAscii() auto *offer = device->sendDataOffer({"text/plain"}); connect(offer, &PrimarySelectionOfferV1::receive, offer, [](QString mimeType, int fd) { QFile file; - file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QVERIFY(file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle)); QCOMPARE(mimeType, "text/plain"); file.write(QByteArray("normal ascii")); file.close(); @@ -338,7 +338,7 @@ void tst_primaryselectionv1::pasteUtf8() auto *offer = device->sendDataOffer({"text/plain", "text/plain;charset=utf-8"}); connect(offer, &PrimarySelectionOfferV1::receive, offer, [](QString mimeType, int fd) { QFile file; - file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle); + QVERIFY(file.open(fd, QIODevice::WriteOnly, QFile::FileHandleFlag::AutoCloseHandle)); QCOMPARE(mimeType, "text/plain;charset=utf-8"); file.write(QByteArray("face with tears of joy: 😂")); file.close();