diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-09-04 12:40:16 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 06:24:38 +0200 |
| commit | 34cd8fd566cd61385db12112d9515b0d5388dad3 (patch) | |
| tree | 0f311e165c03c040f2c32261f96d80965443d4c6 /tests/auto/widgets/dialogs/qfiledialog | |
| parent | 6fd1895b918c45d8404ff38319f508f0357cba27 (diff) | |
tests: Don't omit the body of a test function with QT_BUILD_INTERNAL
Changing it outside of the test function definition to avoid running
empty/inapplicable test functions.
Change-Id: I713560cde7f715696984ed082d682900f5f1bcdd
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'tests/auto/widgets/dialogs/qfiledialog')
| -rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index b50e32c8ea..45e677aa70 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -101,7 +101,9 @@ public slots: private slots: void currentChangedSignal(); +#ifdef QT_BUILD_INTERNAL void directoryEnteredSignal(); +#endif void filesSelectedSignal_data(); void filesSelectedSignal(); void filterSelectedSignal(); @@ -141,8 +143,10 @@ private slots: void enableChooseButton(); void hooks(); #ifdef Q_OS_UNIX +#ifdef QT_BUILD_INTERNAL void tildeExpansion_data(); void tildeExpansion(); +#endif // QT_BUILD_INTERNAL #endif private: @@ -213,9 +217,9 @@ void tst_QFiledialog::currentChangedSignal() } // only emitted from the views, sidebar, or lookin combo +#if defined QT_BUILD_INTERNAL void tst_QFiledialog::directoryEnteredSignal() { -#if defined QT_BUILD_INTERNAL QNonNativeFileDialog fd(0, "", QDir::root().path()); fd.setOptions(QFileDialog::DontUseNativeDialog); fd.show(); @@ -259,8 +263,8 @@ void tst_QFiledialog::directoryEnteredSignal() QTest::mouseDClick(listView->viewport(), Qt::LeftButton, 0, listView->visualRect(folder).center()); QTRY_COMPARE(spyDirectoryEntered.count(), 1); */ -#endif } +#endif Q_DECLARE_METATYPE(QFileDialog::FileMode) void tst_QFiledialog::filesSelectedSignal_data() @@ -1313,6 +1317,7 @@ void tst_QFiledialog::hooks() } #ifdef Q_OS_UNIX +#ifdef QT_BUILD_INTERNAL void tst_QFiledialog::tildeExpansion_data() { QTest::addColumn<QString>("tildePath"); @@ -1328,18 +1333,17 @@ void tst_QFiledialog::tildeExpansion_data() QString invalid = QString::fromLatin1("~thisIsNotAValidUserName"); QTest::newRow("invalid user name") << invalid << invalid; } +#endif // QT_BUILD_INTERNAL +#ifdef QT_BUILD_INTERNAL void tst_QFiledialog::tildeExpansion() { -#ifndef QT_BUILD_INTERNAL - QSKIP("Test case relies on developer build (AUTOTEST_EXPORT)"); -#else QFETCH(QString, tildePath); QFETCH(QString, expandedPath); QCOMPARE(qt_tildeExpansion(tildePath), expandedPath); -#endif } +#endif // QT_BUILD_INTERNAL #endif QTEST_MAIN(tst_QFiledialog) |