diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-04-28 14:05:21 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-05-01 18:52:15 +0200 |
commit | 55dc178271a64f6df317cb3954447352d87b48c1 (patch) | |
tree | 971fe1bf9beaf4d73f7709c5c6bec556e6ec74de /tests/auto/corelib/io/qfile | |
parent | 5acc3dd242cdd82e063e8aac3f7ee6cf76bd8fbd (diff) |
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>
Diffstat (limited to 'tests/auto/corelib/io/qfile')
-rw-r--r-- | tests/auto/corelib/io/qfile/tst_qfile.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp index b8f0d29078..2e4ed2fba1 100644 --- a/tests/auto/corelib/io/qfile/tst_qfile.cpp +++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp @@ -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()); |