From cba5556953db02ad0cdd0c308ce9d7e7c2671ad8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 21 Apr 2015 09:03:24 +0200 Subject: 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 --- tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 7 +++++-- 1 file 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("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("sidebar"); - QVERIFY(sidebar->model()->rowCount() >= 2); QModelIndex secondItem = sidebar->model()->index(1, 0); QVERIFY(secondItem.isValid()); sidebar->setCurrentIndex(secondItem); -- cgit v1.2.3