AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify two complex test conditions

Browse Source 
Since the test was fatuous for i == 0, iterate from i = 1, instead.

Change-Id: I9b9c1b7b10639aefdd74f48051d592da4f84dc85
Reviewed-by: Jesus Fernandez <jsfdez@gmail.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
This commit is contained in:
Edward Welbourne 2019-11-06 10:59:32 +01:00
parent 1c4626f830
commit e6a0a945c5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
View File

@ -1030,15 +1030,13 @@ void tst_QFileSystemModel::dirsBeforeFiles()
// Wait for model to be notified by the file system watcher
QTRY_COMPARE(model->rowCount(root), 2 * itemCount);
// ensure that no file occurs before a directory
for (int i = 0; i < model->rowCount(root); ++i) {
// Ensure that no file occurs before any directory:
for (int i = 1; i < model->rowCount(root); ++i) {
#ifndef Q_OS_MAC
QVERIFY(i == 0 ||
!(model->fileInfo(model->index(i - 1, 0, root)).isFile()
QVERIFY(!(model->fileInfo(model->index(i - 1, 0, root)).isFile()
&& model->fileInfo(model->index(i, 0, root)).isDir()));
#else
QVERIFY(i == 0 ||
model->fileInfo(model->index(i - 1, 0, root)).fileName() <
QVERIFY(model->fileInfo(model->index(i - 1, 0, root)).fileName() <
model->fileInfo(model->index(i, 0, root)).fileName());
#endif
}