diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-08-01 14:21:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 13:08:14 +0200 |
| commit | f3aafa06e95f38dfee38b84f09990b050303bb7d (patch) | |
| tree | 518797f254ed1999d128ebf9f08f667ad63e8989 /tests/auto/qfilesystemmodel | |
| parent | a9aa74ea6c3fcac9d56d1f2a2926c89d07cade7c (diff) | |
test: fixed tst_qfilesystemmodel and removed insignificant_test
tst_qfilesystemmodel::sort uses some internal API to affect the sorting
behavior. This means that part of the test must be disabled when
private symbols aren't available.
Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
(cherry picked from commit 4e84be2876543c1bfcab3b854c92a7edade4144b)
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qfilesystemmodel')
| -rw-r--r-- | tests/auto/qfilesystemmodel/qfilesystemmodel.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index 716f72f5f8..ba28441ade 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -13,5 +13,3 @@ symbian: { DEPLOYMENT += dummyDeploy LIBS += -lefsrv } - -CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp index 01d017d1cd..20dfb597b2 100644 --- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -909,12 +909,16 @@ void tst_QFileSystemModel::sort() expectedOrder << tempFile2.fileName() << tempFile.fileName() << dirPath + QChar('/') + "." << dirPath + QChar('/') + ".."; //File dialog Mode means sub trees are not sorted, only the current root if (fileDialogMode) { + // FIXME: we were only able to disableRecursiveSort in developer builds, so we can only + // stably perform this test for developer builds +#ifdef QT_BUILD_INTERNAL QList<QString> actualRows; for(int i = 0; i < myModel->rowCount(parent); ++i) { actualRows << dirPath + QChar('/') + myModel->index(i, 1, parent).data(QFileSystemModel::FileNameRole).toString(); } QVERIFY(actualRows != expectedOrder); +#endif } else { for(int i = 0; i < myModel->rowCount(parent); ++i) { |