From 2a67dcda5e20adf0b92136a248b4b797b0e2e5cc Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 30 Jan 2025 11:05:03 +0100 Subject: [PATCH] Fix warnings in tests from QFile::open being [[nodiscard]] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QVERIFY the result, with filename printed if useful. Pick-to: 6.8 6.5 Change-Id: I1b21e213856458b7bc36682dd3671bd29c437b99 Reviewed-by: Mårten Nordheim (cherry picked from commit 8563ed54053024a4673e2bff9fce506fd648a312) Reviewed-by: Volker Hilsheimer Reviewed-by: Marc Mutz --- tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp | 2 +- .../access/qnetworkreply/tst_qnetworkreply.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp index 7dd69f6c176..e7ab9bad401 100644 --- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp @@ -1590,7 +1590,7 @@ void tst_QFileInfo::isHiddenFromFinder() const char *filename = "test_foobar.txt"; QFile testFile(filename); - testFile.open(QIODevice::WriteOnly | QIODevice::Append); + QVERIFY(testFile.open(QIODevice::WriteOnly | QIODevice::Append)); testFile.write(QByteArray("world")); testFile.close(); diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 116b12cb4ec..d7318ba56b3 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -2941,7 +2941,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart11.setRawHeader("Content-Location", "http://my.test.location.tld"); imagePart11.setRawHeader("Content-ID", "my@id.tld"); QFile *file11 = new QFile(testDataDir + "/image1.jpg"); - file11->open(QIODevice::ReadOnly); + QVERIFY2(file11->open(QIODevice::ReadOnly), qPrintable(file11->fileName())); imagePart11.setBodyDevice(file11); QHttpMultiPart *imageMultiPart1 = new QHttpMultiPart(QHttpMultiPart::FormDataType); imageMultiPart1->append(imagePart11); @@ -2955,7 +2955,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart21.setRawHeader("Content-Location", "http://my.test.location.tld"); imagePart21.setRawHeader("Content-ID", "my@id.tld"); QFile *file21 = new QFile(testDataDir + "/image1.jpg"); - file21->open(QIODevice::ReadOnly); + QVERIFY2(file21->open(QIODevice::ReadOnly), qPrintable(file21->fileName())); imagePart21.setBodyDevice(file21); QHttpMultiPart *imageMultiPart2 = new QHttpMultiPart(); imageMultiPart2->setContentType(QHttpMultiPart::FormDataType); @@ -2966,7 +2966,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart22.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg")); imagePart22.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\"")); QFile *file22 = new QFile(testDataDir + "/image2.jpg"); - file22->open(QIODevice::ReadOnly); + QVERIFY2(file22->open(QIODevice::ReadOnly), qPrintable(file22->fileName())); imagePart22.setBodyDevice(file22); imageMultiPart2->append(imagePart22); file22->setParent(imageMultiPart2); @@ -2988,7 +2988,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart31.setRawHeader("Content-Location", "http://my.test.location.tld"); imagePart31.setRawHeader("Content-ID", "my@id.tld"); QFile *file31 = new QFile(testDataDir + "/image1.jpg"); - file31->open(QIODevice::ReadOnly); + QVERIFY2(file31->open(QIODevice::ReadOnly), qPrintable(file31->fileName())); imagePart31.setBodyDevice(file31); QHttpMultiPart *imageMultiPart3 = new QHttpMultiPart(QHttpMultiPart::FormDataType); imageMultiPart3->append(imagePart31); @@ -2997,7 +2997,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart32.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg")); imagePart32.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\"")); QFile *file32 = new QFile(testDataDir + "/image2.jpg"); - file32->open(QIODevice::ReadOnly); + QVERIFY2(file32->open(QIODevice::ReadOnly), qPrintable(file32->fileName())); imagePart32.setBodyDevice(file31); // check that resetting works imagePart32.setBodyDevice(file32); imageMultiPart3->append(imagePart32); @@ -3006,7 +3006,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart33.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg")); imagePart33.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage3\"")); QFile *file33 = new QFile(testDataDir + "/image3.jpg"); - file33->open(QIODevice::ReadOnly); + QVERIFY2(file33->open(QIODevice::ReadOnly), qPrintable(file33->fileName())); imagePart33.setBodyDevice(file33); imageMultiPart3->append(imagePart33); file33->setParent(imageMultiPart3); @@ -3055,7 +3055,7 @@ void tst_QNetworkReply::postToHttpMultipart_data() imagePart51.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg")); imagePart51.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage\"")); QFile *file51 = new QFile(testDataDir + "/image1.jpg"); - file51->open(QIODevice::ReadOnly); + QVERIFY2(file51->open(QIODevice::ReadOnly), qPrintable(file51->fileName())); QByteArray imageData = file51->readAll(); file51->close(); delete file51;