1 files changed, 28 insertions, 2 deletions

diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index 6890610..18875e7 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -1814,6 +1814,8 @@ void tst_QFiledialog::task228844_ensurePreviousSorting()
     current.mkdir("e");
     current.mkdir("f");
     current.mkdir("g");
+    QTemporaryFile *tempFile = new QTemporaryFile(current.absolutePath() + "/rXXXXXX");
+    tempFile->open();
     current.cdUp();
 
     QNonNativeFileDialog fd;
@@ -1825,25 +1827,47 @@ void tst_QFiledialog::task228844_ensurePreviousSorting()
     tree->header()->setSortIndicator(3,Qt::DescendingOrder);
     QTest::qWait(200);
     QDialogButtonBox *buttonBox = qFindChild<QDialogButtonBox*>(&fd, "buttonBox");
-    QPushButton *button = buttonBox->button(QDialogButtonBox::Cancel);
+    QPushButton *button = buttonBox->button(QDialogButtonBox::Open);
     QTest::mouseClick(button, Qt::LeftButton);
     QTest::qWait(500);
 
     QNonNativeFileDialog fd2;
+    fd2.setFileMode(QFileDialog::Directory);
     fd2.restoreState(fd.saveState());
     current.cd("aaaaaaaaaaaaaaaaaa");
     fd2.setDirectory(current.absolutePath());
     fd2.show();
     QTest::qWait(500);
     QTreeView *tree2 = qFindChild<QTreeView*>(&fd2, "treeView");
+    tree2->setFocus();
 
     QCOMPARE(tree2->rootIndex().data(QFileSystemModel::FilePathRole).toString(),current.absolutePath());
 
     QDialogButtonBox *buttonBox2 = qFindChild<QDialogButtonBox*>(&fd2, "buttonBox");
-    QPushButton *button2 = buttonBox2->button(QDialogButtonBox::Cancel);
+    QPushButton *button2 = buttonBox2->button(QDialogButtonBox::Open);
+    fd2.selectFile("g");
     QTest::mouseClick(button2, Qt::LeftButton);
     QTest::qWait(500);
 
+    QCOMPARE(fd2.selectedFiles().first(), current.absolutePath() + QChar('/') + QLatin1String("g"));
+
+    QNonNativeFileDialog fd3(0, "This is a third file dialog", tempFile->fileName());
+    fd3.restoreState(fd.saveState());
+    fd3.setFileMode(QFileDialog::Directory);
+    fd3.show();
+    QTest::qWait(500);
+    QTreeView *tree3 = qFindChild<QTreeView*>(&fd3, "treeView");
+    tree3->setFocus();
+
+    QCOMPARE(tree3->rootIndex().data(QFileSystemModel::FilePathRole).toString(), current.absolutePath());
+
+    QDialogButtonBox *buttonBox3 = qFindChild<QDialogButtonBox*>(&fd3, "buttonBox");
+    QPushButton *button3 = buttonBox3->button(QDialogButtonBox::Open);
+    QTest::mouseClick(button3, Qt::LeftButton);
+    QTest::qWait(500);
+
+    QCOMPARE(fd3.selectedFiles().first(), tempFile->fileName());
+
     current.cd("aaaaaaaaaaaaaaaaaa");
     current.rmdir("a");
     current.rmdir("b");
@@ -1852,6 +1876,8 @@ void tst_QFiledialog::task228844_ensurePreviousSorting()
     current.rmdir("e");
     current.rmdir("f");
     current.rmdir("g");
+    tempFile->close();
+    delete tempFile;
     current.cdUp();
     current.rmdir("aaaaaaaaaaaaaaaaaa");
 }