Fix warnings in tests from QFile::open being [[nodiscard]]
QVERIFY the result, with filename printed if useful. Change-Id: I1b21e213856458b7bc36682dd3671bd29c437b99 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
parent
a4fd95c51a
commit
8563ed5405
@ -1590,7 +1590,7 @@ void tst_QFileInfo::isHiddenFromFinder()
|
|||||||
const char *filename = "test_foobar.txt";
|
const char *filename = "test_foobar.txt";
|
||||||
|
|
||||||
QFile testFile(filename);
|
QFile testFile(filename);
|
||||||
testFile.open(QIODevice::WriteOnly | QIODevice::Append);
|
QVERIFY(testFile.open(QIODevice::WriteOnly | QIODevice::Append));
|
||||||
testFile.write(QByteArray("world"));
|
testFile.write(QByteArray("world"));
|
||||||
testFile.close();
|
testFile.close();
|
||||||
|
|
||||||
|
@ -2941,7 +2941,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart11.setRawHeader("Content-Location", "http://my.test.location.tld");
|
imagePart11.setRawHeader("Content-Location", "http://my.test.location.tld");
|
||||||
imagePart11.setRawHeader("Content-ID", "my@id.tld");
|
imagePart11.setRawHeader("Content-ID", "my@id.tld");
|
||||||
QFile *file11 = new QFile(testDataDir + "/image1.jpg");
|
QFile *file11 = new QFile(testDataDir + "/image1.jpg");
|
||||||
file11->open(QIODevice::ReadOnly);
|
QVERIFY2(file11->open(QIODevice::ReadOnly), qPrintable(file11->fileName()));
|
||||||
imagePart11.setBodyDevice(file11);
|
imagePart11.setBodyDevice(file11);
|
||||||
QHttpMultiPart *imageMultiPart1 = new QHttpMultiPart(QHttpMultiPart::FormDataType);
|
QHttpMultiPart *imageMultiPart1 = new QHttpMultiPart(QHttpMultiPart::FormDataType);
|
||||||
imageMultiPart1->append(imagePart11);
|
imageMultiPart1->append(imagePart11);
|
||||||
@ -2955,7 +2955,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart21.setRawHeader("Content-Location", "http://my.test.location.tld");
|
imagePart21.setRawHeader("Content-Location", "http://my.test.location.tld");
|
||||||
imagePart21.setRawHeader("Content-ID", "my@id.tld");
|
imagePart21.setRawHeader("Content-ID", "my@id.tld");
|
||||||
QFile *file21 = new QFile(testDataDir + "/image1.jpg");
|
QFile *file21 = new QFile(testDataDir + "/image1.jpg");
|
||||||
file21->open(QIODevice::ReadOnly);
|
QVERIFY2(file21->open(QIODevice::ReadOnly), qPrintable(file21->fileName()));
|
||||||
imagePart21.setBodyDevice(file21);
|
imagePart21.setBodyDevice(file21);
|
||||||
QHttpMultiPart *imageMultiPart2 = new QHttpMultiPart();
|
QHttpMultiPart *imageMultiPart2 = new QHttpMultiPart();
|
||||||
imageMultiPart2->setContentType(QHttpMultiPart::FormDataType);
|
imageMultiPart2->setContentType(QHttpMultiPart::FormDataType);
|
||||||
@ -2966,7 +2966,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart22.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
imagePart22.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
||||||
imagePart22.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\""));
|
imagePart22.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\""));
|
||||||
QFile *file22 = new QFile(testDataDir + "/image2.jpg");
|
QFile *file22 = new QFile(testDataDir + "/image2.jpg");
|
||||||
file22->open(QIODevice::ReadOnly);
|
QVERIFY2(file22->open(QIODevice::ReadOnly), qPrintable(file22->fileName()));
|
||||||
imagePart22.setBodyDevice(file22);
|
imagePart22.setBodyDevice(file22);
|
||||||
imageMultiPart2->append(imagePart22);
|
imageMultiPart2->append(imagePart22);
|
||||||
file22->setParent(imageMultiPart2);
|
file22->setParent(imageMultiPart2);
|
||||||
@ -2988,7 +2988,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart31.setRawHeader("Content-Location", "http://my.test.location.tld");
|
imagePart31.setRawHeader("Content-Location", "http://my.test.location.tld");
|
||||||
imagePart31.setRawHeader("Content-ID", "my@id.tld");
|
imagePart31.setRawHeader("Content-ID", "my@id.tld");
|
||||||
QFile *file31 = new QFile(testDataDir + "/image1.jpg");
|
QFile *file31 = new QFile(testDataDir + "/image1.jpg");
|
||||||
file31->open(QIODevice::ReadOnly);
|
QVERIFY2(file31->open(QIODevice::ReadOnly), qPrintable(file31->fileName()));
|
||||||
imagePart31.setBodyDevice(file31);
|
imagePart31.setBodyDevice(file31);
|
||||||
QHttpMultiPart *imageMultiPart3 = new QHttpMultiPart(QHttpMultiPart::FormDataType);
|
QHttpMultiPart *imageMultiPart3 = new QHttpMultiPart(QHttpMultiPart::FormDataType);
|
||||||
imageMultiPart3->append(imagePart31);
|
imageMultiPart3->append(imagePart31);
|
||||||
@ -2997,7 +2997,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart32.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
imagePart32.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
||||||
imagePart32.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\""));
|
imagePart32.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage2\""));
|
||||||
QFile *file32 = new QFile(testDataDir + "/image2.jpg");
|
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(file31); // check that resetting works
|
||||||
imagePart32.setBodyDevice(file32);
|
imagePart32.setBodyDevice(file32);
|
||||||
imageMultiPart3->append(imagePart32);
|
imageMultiPart3->append(imagePart32);
|
||||||
@ -3006,7 +3006,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart33.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
imagePart33.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
||||||
imagePart33.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage3\""));
|
imagePart33.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage3\""));
|
||||||
QFile *file33 = new QFile(testDataDir + "/image3.jpg");
|
QFile *file33 = new QFile(testDataDir + "/image3.jpg");
|
||||||
file33->open(QIODevice::ReadOnly);
|
QVERIFY2(file33->open(QIODevice::ReadOnly), qPrintable(file33->fileName()));
|
||||||
imagePart33.setBodyDevice(file33);
|
imagePart33.setBodyDevice(file33);
|
||||||
imageMultiPart3->append(imagePart33);
|
imageMultiPart3->append(imagePart33);
|
||||||
file33->setParent(imageMultiPart3);
|
file33->setParent(imageMultiPart3);
|
||||||
@ -3055,7 +3055,7 @@ void tst_QNetworkReply::postToHttpMultipart_data()
|
|||||||
imagePart51.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
imagePart51.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("image/jpeg"));
|
||||||
imagePart51.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage\""));
|
imagePart51.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"testImage\""));
|
||||||
QFile *file51 = new QFile(testDataDir + "/image1.jpg");
|
QFile *file51 = new QFile(testDataDir + "/image1.jpg");
|
||||||
file51->open(QIODevice::ReadOnly);
|
QVERIFY2(file51->open(QIODevice::ReadOnly), qPrintable(file51->fileName()));
|
||||||
QByteArray imageData = file51->readAll();
|
QByteArray imageData = file51->readAll();
|
||||||
file51->close();
|
file51->close();
|
||||||
delete file51;
|
delete file51;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user