whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QTextStream dependency from tst_qfile 

Change-Id: I83cb05da8c094185b50e9cedea2e705ad1c7f948
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
bb10
Lars Knoll 2020-04-28 14:05:21 +02:00
parent 5acc3dd242
commit 55dc178271
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/io/qfile/tst_qfile.cpp
View File

@ -2106,16 +2106,12 @@ void tst_QFile::i18nFileName()
{
QFile file(fileName);
QVERIFY2(file.open(QFile::WriteOnly | QFile::Text), msgOpenFailed(file).constData());
QTextStream ts(&file);
ts.setCodec("UTF-8");
ts << fileName << Qt::endl;
file.write(fileName.toUtf8());
}
{
QFile file(fileName);
QVERIFY2(file.open(QFile::ReadOnly | QFile::Text), msgOpenFailed(file).constData());
QTextStream ts(&file);
ts.setCodec("UTF-8");
QString line = ts.readLine();
QString line = QString::fromUtf8(file.readAll());
QCOMPARE(line, fileName);
}
}
@ -2157,23 +2153,19 @@ void tst_QFile::longFileName()
{
QFile file(fileName);
QVERIFY2(file.open(QFile::WriteOnly | QFile::Text), msgOpenFailed(file).constData());
QTextStream ts(&file);
ts << fileName << Qt::endl;
file.write(fileName.toUtf8());
}
{
QFile file(fileName);
QVERIFY2(file.open(QFile::ReadOnly | QFile::Text), msgOpenFailed(file).constData());
QTextStream ts(&file);
QString line = ts.readLine();
QCOMPARE(line, fileName);
QString line = QString::fromUtf8(file.readAll());
}
QString newName = fileName + QLatin1Char('1');
{
QVERIFY(QFile::copy(fileName, newName));
QFile file(newName);
QVERIFY2(file.open(QFile::ReadOnly | QFile::Text), msgOpenFailed(file).constData());
QTextStream ts(&file);
QString line = ts.readLine();
QString line = QString::fromUtf8(file.readAll());
QCOMPARE(line, fileName);
}
@ -2182,8 +2174,7 @@ void tst_QFile::longFileName()
QVERIFY(QFile::rename(fileName, newName));
QFile file(newName);
QVERIFY2(file.open(QFile::ReadOnly | QFile::Text), msgOpenFailed(file).constData());
QTextStream ts(&file);
QString line = ts.readLine();
QString line = QString::fromUtf8(file.readAll());
QCOMPARE(line, fileName);
}
QVERIFY2(QFile::exists(newName), msgFileDoesNotExist(newName).constData());