From 271b2970a13a82e4ff5293b177d0606303d0190c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 2 Nov 2015 13:54:48 +0100 Subject: add dummy positioning plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The QtPositioning plugin loader only loads plugins that are marked as testable whenever it detects that a Qt autotest is running. We now provide our own very simple positioning plugin that always provides the same location: the western beacon of port entrance Warnemünde. Change-Id: I747188dc261ba47c10056ad50754bb686e75c783 Reviewed-by: Michael Brüning --- tests/auto/widgets/positionplugin/plugin.cpp | 112 +++++++++++++++++++++ tests/auto/widgets/positionplugin/plugin.json | 9 ++ .../auto/widgets/positionplugin/positionplugin.pro | 12 +++ .../widgets/qwebenginepage/tst_qwebenginepage.cpp | 9 ++ tests/auto/widgets/widgets.pro | 5 + 5 files changed, 147 insertions(+) create mode 100644 tests/auto/widgets/positionplugin/plugin.cpp create mode 100644 tests/auto/widgets/positionplugin/plugin.json create mode 100644 tests/auto/widgets/positionplugin/positionplugin.pro diff --git a/tests/auto/widgets/positionplugin/plugin.cpp b/tests/auto/widgets/positionplugin/plugin.cpp new file mode 100644 index 000000000..74d30469d --- /dev/null +++ b/tests/auto/widgets/positionplugin/plugin.cpp @@ -0,0 +1,112 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include +#include + +class DummySource : public QGeoPositionInfoSource +{ + Q_OBJECT + +public: + DummySource(QObject *parent=0); + + void startUpdates() {} + void stopUpdates() {} + void requestUpdate(int) {} + + QGeoPositionInfo lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const; + PositioningMethods supportedPositioningMethods() const; + + int minimumUpdateInterval() const; + Error error() const; +}; + +DummySource::DummySource(QObject *parent) : + QGeoPositionInfoSource(parent) +{ +} + +QGeoPositionInfoSource::Error DummySource::error() const +{ + return QGeoPositionInfoSource::NoError; +} + +int DummySource::minimumUpdateInterval() const +{ + return 1000; +} + +QGeoPositionInfo DummySource::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const +{ + Q_UNUSED(fromSatellitePositioningMethodsOnly); + return QGeoPositionInfo(QGeoCoordinate(54.186824, 12.087262), QDateTime::currentDateTime()); +} + +QGeoPositionInfoSource::PositioningMethods DummySource::supportedPositioningMethods() const +{ + return QGeoPositionInfoSource::AllPositioningMethods; +} + + +class QGeoPositionInfoSourceFactoryTest : public QObject, public QGeoPositionInfoSourceFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.qt.position.sourcefactory/5.0" + FILE "plugin.json") + Q_INTERFACES(QGeoPositionInfoSourceFactory) + +public: + QGeoPositionInfoSource *positionInfoSource(QObject *parent); + QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent); + QGeoAreaMonitorSource *areaMonitor(QObject *parent); +}; + +QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryTest::positionInfoSource(QObject *parent) +{ + return new DummySource(parent); +} + +QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactoryTest::satelliteInfoSource(QObject *) +{ + return 0; +} + +QGeoAreaMonitorSource *QGeoPositionInfoSourceFactoryTest::areaMonitor(QObject* ) +{ + return 0; +} + +#include "plugin.moc" diff --git a/tests/auto/widgets/positionplugin/plugin.json b/tests/auto/widgets/positionplugin/plugin.json new file mode 100644 index 000000000..68acaded3 --- /dev/null +++ b/tests/auto/widgets/positionplugin/plugin.json @@ -0,0 +1,9 @@ +{ + "Keys": ["test.source"], + "Provider": "test.source", + "Position": true, + "Satellite": false, + "Monitor": false, + "Priority": 0, + "Testable": true +} diff --git a/tests/auto/widgets/positionplugin/positionplugin.pro b/tests/auto/widgets/positionplugin/positionplugin.pro new file mode 100644 index 000000000..bca3e5756 --- /dev/null +++ b/tests/auto/widgets/positionplugin/positionplugin.pro @@ -0,0 +1,12 @@ +TARGET = qtwebengine_positioning_testplugin +QT += positioning + +PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = TestPositionPlugin +PLUGIN_EXTENDS = - +load(qt_plugin) + +SOURCES += plugin.cpp + +OTHER_FILES += \ + plugin.json diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index ffd8ccba7..8b7f71365 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -288,6 +288,15 @@ void tst_QWebEnginePage::cleanupFiles() void tst_QWebEnginePage::initTestCase() { cleanupFiles(); // In case there are old files from previous runs + + // Set custom path since the CI doesn't install test plugins. + // Stolen from qtlocation/tests/auto/positionplugintest. + QString searchPath = QCoreApplication::applicationDirPath(); +#ifdef Q_OS_WIN + searchPath += QStringLiteral("/.."); +#endif + searchPath += QStringLiteral("/../../../plugins"); + QCoreApplication::addLibraryPath(searchPath); } void tst_QWebEnginePage::cleanupTestCase() diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro index 1e2cceacc..20aeea78b 100644 --- a/tests/auto/widgets/widgets.pro +++ b/tests/auto/widgets/widgets.pro @@ -9,3 +9,8 @@ SUBDIRS += \ qwebengineprofile \ qwebenginescript \ qwebengineview + +qtHaveModule(positioning) { + SUBDIRS += positionplugin + qwebenginepage.depends = positionplugin +} -- cgit v1.2.3