From 9fad486e88b12c232f9a4a08a3aedf7d6f61913b Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Wed, 1 Feb 2012 16:17:17 +1000 Subject: Remove Symbian specific test. The test was failing because of the deprecated second argument to QSKIP, since the test is no longer relevant the whole thing can be removed instead of just the argument. Change-Id: I3cf7d4c53723825ebc69e3d51cb51dab04bd2e18 Reviewed-by: Matthew Vogt --- .../tst_qdeclarativemoduleplugin.cpp | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index f7a4075b..0d74d1bf 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -70,14 +70,8 @@ private slots: void remoteImportWithUnquotedUri(); void versionNotInstalled(); void versionNotInstalled_data(); - void importPath(); }; -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - #define VERIFY_ERRORS(errorfile) \ if (!errorfile) { \ if (qgetenv("DEBUG") != "" && !component.errors().isEmpty()) \ @@ -309,28 +303,6 @@ void tst_qdeclarativemoduleplugin::versionNotInstalled() VERIFY_ERRORS(errorFile.toLatin1().constData()); } -void tst_qdeclarativemoduleplugin::importPath() -{ -#ifndef Q_OS_SYMBIAN - QSKIP("Import path order testing for Symbian only", SkipAll); -#else - QDeclarativeEngine engine; - QStringList imports = engine.importPathList(); - QString installImportsPath = QDir::cleanPath(QLibraryInfo::location(QLibraryInfo::ImportsPath)); - QString driveOrder(QLatin1String("ZABCDEFGHIJKLMNOPQRSTUVWXY")); - int lastOrder = 30; - foreach(QString import, imports) - { - if (import.endsWith(installImportsPath)) - { - int order = driveOrder.indexOf(import[0]); - QVERIFY(order < lastOrder); - lastOrder = order; - } - } - QVERIFY(lastOrder != 30); -#endif -} QTEST_MAIN(tst_qdeclarativemoduleplugin) -- cgit v1.2.3