summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-04-21 09:03:24 +0200
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-04-21 11:11:41 +0000
commitcba5556953db02ad0cdd0c308ce9d7e7c2671ad8 (patch)
tree274640da77ba27c542d0a6307c8b0fbd1d0b4c6e /tests
parent9286a8e5dd97c5d4d7e0ed07a73d4ce7240fdc1d (diff)
Skip tst_QFiledialog::directoryEnteredSignal() depending on side bar entry count.
The test relies on having at least 2 entries, which is not always the case. Change-Id: Ief812c598409fe829edb930e563740e5f2213580 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index abcd06c628..e677891ce5 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -235,13 +235,16 @@ void tst_QFiledialog::directoryEnteredSignal()
{
QNonNativeFileDialog fd(0, "", QDir::root().path());
fd.setOptions(QFileDialog::DontUseNativeDialog);
+ QSidebar *sidebar = fd.findChild<QSidebar*>("sidebar");
+ QVERIFY(sidebar);
+ if (sidebar->model()->rowCount() < 2)
+ QSKIP("This test requires at least 2 side bar entries.");
+
fd.show();
QTRY_COMPARE(fd.isVisible(), true);
QSignalSpy spyDirectoryEntered(&fd, SIGNAL(directoryEntered(QString)));
// sidebar
- QSidebar *sidebar = fd.findChild<QSidebar*>("sidebar");
- QVERIFY(sidebar->model()->rowCount() >= 2);
QModelIndex secondItem = sidebar->model()->index(1, 0);
QVERIFY(secondItem.isValid());
sidebar->setCurrentIndex(secondItem);