1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: make some QFile::open calls fail

Browse Source 
In some cases calls to QFile::open are made outside of a testfunction
(so we can't use QVERIFY), or even in standalone executables that are
executed by tests. Make them fail "visibly".

Change-Id: Iec4d56f6d874be16aa2e9ad6974eeec2a98caa3f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2024-03-22 18:06:01 +01:00
parent 223b92490e
commit c68f8db62b
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/corelib/io/qfile/stdinprocess/main.cpp
View File

@ -16,13 +16,16 @@ int main(int argc, char *argv[])
QFile file;
if (strcmp(argv[1], "all") == 0) {
file.open(stdin, QFile::ReadWrite);
if (!file.open(stdin, QFile::ReadWrite))
return 1;
printf("%s", file.readAll().constData());
} else if (strcmp(argv[1], "line") == 0) {
if (strcmp(argv[2], "0") == 0) {
file.open(stdin, QFile::ReadWrite);
if (!file.open(stdin, QFile::ReadWrite))
return 1;
} else {
file.open(0, QFile::ReadWrite);
if (!file.open(0, QFile::ReadWrite))
return 1;
}
char line[1024];

3
tests/auto/corelib/io/qprocess/fileWriterProcess/main.cpp
View File

@ -9,7 +9,8 @@ int main(int argc, char **argv)
{
QCoreApplication ca(argc, argv);
QFile f;
f.open(stdin, QIODevice::ReadOnly);
if (!f.open(stdin, QIODevice::ReadOnly))
return 1;
QByteArray input;
char buf[1024];
qint64 len;

7
tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp
View File

@ -95,8 +95,8 @@ static QByteArray makeCanonical(const QString &filename,
bool testIncremental = false)
{
QFile file(filename);
file.open(QIODevice::ReadOnly);
if (!file.open(QIODevice::ReadOnly))
qFatal("Could not open file %s", qPrintable(filename));
QXmlStreamReader reader;
QByteArray buffer;
@ -747,7 +747,8 @@ void tst_QXmlStream::reportSuccess_data() const
QByteArray tst_QXmlStream::readFile(const QString &filename)
{
QFile file(filename);
file.open(QIODevice::ReadOnly);
if (!file.open(QIODevice::ReadOnly))
qFatal("Could not open file %s", qPrintable(filename));
QXmlStreamReader reader;

3
tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
View File

@ -79,7 +79,8 @@ void tst_qfileopenevent::constructor()
QByteArray tst_qfileopenevent::readFileContent(QFileOpenEvent& event)
{
QFile file(event.file());
file.open(QFile::ReadOnly);
if (!file.open(QFile::ReadOnly))
qFatal("Cannot open file %s", qPrintable(event.file()));
file.seek(0);
QByteArray data = file.readAll();
return data;

3
tests/auto/network/access/http2/http2srv.cpp
View File

@ -328,7 +328,8 @@ void Http2Server::incomingConnection(qintptr socketDescriptor)
connect(sslSocket, SIGNAL(sslErrors(QList<QSslError>)),
this, SLOT(ignoreErrorSlot()));
QFile file(QT_TESTCASE_SOURCEDIR "/certs/fluke.key");
file.open(QIODevice::ReadOnly);
if (!file.open(QIODevice::ReadOnly))
qFatal("Cannot open certificate file %s", qPrintable(file.fileName()));
QSslKey key(file.readAll(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
sslSocket->setPrivateKey(key);
auto localCert = QSslCertificate::fromPath(QT_TESTCASE_SOURCEDIR "/certs/fluke.cert");

6
tests/auto/network/access/qnetworkreply/echo/main.cpp
View File

@ -12,11 +12,13 @@ int main(int argc, char **)
}
QFile file;
file.open(stdin, QFile::ReadWrite);
if (!file.open(stdin, QFile::ReadWrite))
return 1;
QByteArray data = file.readAll();
file.close();
file.open(stdout, QFile::WriteOnly);
if (!file.open(stdout, QFile::WriteOnly))
return 1;
file.write(data);
file.close();
return 0;

4
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -5088,6 +5088,10 @@ void tst_QNetworkReply::ioPutToFileFromProcess()
QByteArray contents = file.readAll();
QCOMPARE(contents, data);
if (process.state() == QProcess::Running)
QVERIFY(process.waitForFinished());
QCOMPARE(process.exitCode(), 0);
#endif // QT_CONFIG(process)
}