diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2013-12-10 17:20:53 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-10 01:31:00 +0100 |
| commit | 9aa2031c487583b1b92681d0575f51fe3377cc8b (patch) | |
| tree | fed1bbc90c540ece0d714ca1a99598bef2775a4a | |
| parent | 12aac62dd4d8c425a8838f1635708ac8b9695359 (diff) | |
| download | qtlocation-9aa2031c487583b1b92681d0575f51fe3377cc8b.tar.gz | |
Stop skipping declarative_core tests.
These test cases were failing due to regressions in QML and have since
been fixed. See QTBUG-33542, QTBUG-33546 and QTBUG-33561.
Change-Id: Id86e9a8baa29eea851bda27cb668a6ce586c5f25
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | tests/auto/declarative_core/main.cpp | 11 | ||||
| -rw-r--r-- | tests/auto/declarative_core/tst_place.qml | 10 | ||||
| -rw-r--r-- | tests/auto/declarative_core/tst_plugin.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/declarative_ui.pro | 3 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/main.cpp | 11 |
5 files changed, 29 insertions, 8 deletions
diff --git a/tests/auto/declarative_core/main.cpp b/tests/auto/declarative_core/main.cpp index 10f4a1a7..2a30f5c3 100644 --- a/tests/auto/declarative_core/main.cpp +++ b/tests/auto/declarative_core/main.cpp @@ -39,5 +39,16 @@ ** ****************************************************************************/ +#include <QtCore/QCoreApplication> #include <QtQuickTest/quicktest.h> + +static void initializeLibraryPath() +{ + // Set custom path since CI doesn't install test plugins + QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + + QStringLiteral("/../../../plugins")); +} + +Q_COREAPP_STARTUP_FUNCTION(initializeLibraryPath) + QUICK_TEST_MAIN(declarative_core) diff --git a/tests/auto/declarative_core/tst_place.qml b/tests/auto/declarative_core/tst_place.qml index d1c3cb8c..598872a7 100644 --- a/tests/auto/declarative_core/tst_place.qml +++ b/tests/auto/declarative_core/tst_place.qml @@ -174,9 +174,8 @@ TestCase { return false; if (place1.supplier.name !== place2.supplier.name) return false; - //depends in QTBUG-33546 - /*if (place1.supplier.url !== place2.supplier.url) - return false;*/ + if (place1.supplier.url !== place2.supplier.url) + return false; // check supplier icon if (place1.supplier.icon === null && place2.supplier.icon !== null) @@ -235,10 +234,9 @@ TestCase { if (place1.location.address.postalCode !== place2.location.address.postalCode) return false; - //QTBUG-33561 operator === should work too, using == for now only - if (place1.location.coordinate != place2.location.coordinate) + if (place1.location.coordinate !== place2.location.coordinate) return false; - if (place1.location.boundingBox != place2.location.boundingBox) + if (place1.location.boundingBox !== place2.location.boundingBox) return false; } diff --git a/tests/auto/declarative_core/tst_plugin.qml b/tests/auto/declarative_core/tst_plugin.qml index 4e812ae5..abb5f796 100644 --- a/tests/auto/declarative_core/tst_plugin.qml +++ b/tests/auto/declarative_core/tst_plugin.qml @@ -74,8 +74,6 @@ Item { name: "Plugin properties" function test_plugin() { verify (invalidPlugin.availableServiceProviders.length > 0) - skip("Skipping remainder due to QTBUG-33542") - //next call fails: QTBUG-33542 verify (invalidPlugin.availableServiceProviders.indexOf('qmlgeo.test.plugin') > -1) // at least test plugin must be present // invalid plugins should have no features diff --git a/tests/auto/declarative_ui/declarative_ui.pro b/tests/auto/declarative_ui/declarative_ui.pro index 9fdf3538..0cd6735a 100644 --- a/tests/auto/declarative_ui/declarative_ui.pro +++ b/tests/auto/declarative_ui/declarative_ui.pro @@ -13,3 +13,6 @@ TESTDATA = $$OTHER_FILES win32|linux:CONFIG+=insignificant_test # QTBUG-31797 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +# Import path used by 'make check' since CI doesn't install test imports +IMPORTPATH = $$OUT_PWD/../../../qml diff --git a/tests/auto/declarative_ui/main.cpp b/tests/auto/declarative_ui/main.cpp index df5d9621..ec27fd56 100644 --- a/tests/auto/declarative_ui/main.cpp +++ b/tests/auto/declarative_ui/main.cpp @@ -39,5 +39,16 @@ ** ****************************************************************************/ +#include <QtCore/QCoreApplication> #include <QtQuickTest/quicktest.h> + +static void initializeLibraryPath() +{ + // Set custom path since CI doesn't install test plugins + QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + + QStringLiteral("/../../../plugins")); +} + +Q_COREAPP_STARTUP_FUNCTION(initializeLibraryPath) + QUICK_TEST_MAIN(declarative_ui) |