diff options
| author | axis <qt-info@nokia.com> | 2009-12-07 12:40:00 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-07 12:40:00 (GMT) |
| commit | 757fc27dcdaf67b2f79d2f3bcc8eaaeff345c0c8 (patch) | |
| tree | 06c36fb43ab2e5711136e64528972800afa6c2b7 /tests/auto | |
| parent | cfd98763a1d051238382b77975567da0c0562ade (diff) | |
| parent | 245c9cc07ff1581dd126f213985c3557b2667aca (diff) | |
| download | Qt-757fc27dcdaf67b2f79d2f3bcc8eaaeff345c0c8.zip Qt-757fc27dcdaf67b2f79d2f3bcc8eaaeff345c0c8.tar.gz Qt-757fc27dcdaf67b2f79d2f3bcc8eaaeff345c0c8.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qdesktopservices/tst_qdesktopservices.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp index 2d9e5dc..c105a97 100644 --- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp +++ b/tests/auto/qdesktopservices/tst_qdesktopservices.cpp @@ -70,6 +70,7 @@ private slots: void openMailtoUrl(); void openFileUrl_data(); void openFileUrl(); + void openMultipleFileUrls(); #endif void handlers(); void storageLocation_data(); @@ -197,6 +198,7 @@ void tst_qdesktopservices::openMailtoUrl() QFETCH(QUrl, url); QFETCH(bool, result); QCOMPARE(QDesktopServices::openUrl(url), result); + QTest::qWait(5000); } void tst_qdesktopservices::openFileUrl_data() @@ -239,7 +241,19 @@ void tst_qdesktopservices::openFileUrl() QFETCH(QUrl, url); QFETCH(bool, result); QCOMPARE(QDesktopServices::openUrl(url), result); - QTest::qWait(15000); + QTest::qWait(5000); +} + +void tst_qdesktopservices::openMultipleFileUrls() +{ +#ifndef RUN_MANUAL_TESTS + QSKIP("Test disabled -- only for manual purposes", SkipAll); +#endif + + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/images/image.bmp")), true); + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/images/image.png")), true); + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/others/noendofline.txt")), true); + QCOMPARE(QDesktopServices::openUrl(QUrl("file:///c:/data/installs/ErrRd.sisx")), true); } #endif |