From 11fdb66dc5fe4822dacaca0b1afd0346446b5143 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 12 Aug 2014 10:06:55 +0200 Subject: Enforce the use of test.source position plug-in in auto tests This avoids that platform specific plug-ins such as the geoclue plug-in on Linux interfere with auto tests. The auto tests require the specific test plug-in values to succeed. Task-number: QTBUG-40702 Change-Id: I1c3ea9f6d23e1ad20815a86ded7815e498016af2 Reviewed-by: Aaron McCarthy --- tests/auto/declarative_core/tst_positionsource.qml | 1 - tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/auto/declarative_core/tst_positionsource.qml b/tests/auto/declarative_core/tst_positionsource.qml index 9984e783..195dd124 100644 --- a/tests/auto/declarative_core/tst_positionsource.qml +++ b/tests/auto/declarative_core/tst_positionsource.qml @@ -73,7 +73,6 @@ TestCase { // at least the test.source plugin should be available verify(defaultSource.name != ""); compare(defaultSource.active, false); - compare(defaultSource.updateInterval, 0); } function test_inactive() { diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp index bd45cfac..b2517c29 100644 --- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp @@ -113,7 +113,7 @@ class DefaultSourceTest : public TestQGeoPositionInfoSource Q_OBJECT protected: QGeoPositionInfoSource *createTestSource() { - return QGeoPositionInfoSource::createDefaultSource(0); + return QGeoPositionInfoSource::createSource(QStringLiteral("test.source"), 0); } }; -- cgit v1.2.3