summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2014-08-12 10:06:55 +0200
committerAlex Blasche <alexander.blasche@digia.com>2014-08-14 09:49:24 +0200
commit11fdb66dc5fe4822dacaca0b1afd0346446b5143 (patch)
tree221f6062273ff29adddd501aa916889a976c98e8
parent7d9173ddb973025adf414b2e0333c4389d431a56 (diff)
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 <mccarthy.aaron@gmail.com>
-rw-r--r--tests/auto/declarative_core/tst_positionsource.qml1
-rw-r--r--tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp2
2 files changed, 1 insertions, 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);
}
};