From 5be88871874f3824a37db904b9474202d92b32f4 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Fri, 13 Jan 2023 17:40:12 +0100 Subject: [PATCH] fix tests --- python/pyplugin_installer/installer.py | 1 + python/pyplugin_installer/installer_data.py | 2 +- .../geocms/geonode/qgsgeonodeconnection.cpp | 1 - src/core/locator/qgslocator.h | 2 +- tests/src/python/test_qgsgeonodeconnection.py | 22 +++++++-------- tests/src/python/test_qgslocator.py | 2 +- tests/src/python/test_qgsowsconnection.py | 28 +++++++++---------- tests/src/python/test_qgssettings.py | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/python/pyplugin_installer/installer.py b/python/pyplugin_installer/installer.py index a65307371d1..fad63b74a34 100644 --- a/python/pyplugin_installer/installer.py +++ b/python/pyplugin_installer/installer.py @@ -661,6 +661,7 @@ class QgsPluginInstaller(QObject): plugins.getAllInstalled() plugins.rebuild() + settings = QgsSettings() if settings.contains('/PythonPlugins/' + pluginName): # Plugin was available? if settings.value('/PythonPlugins/' + pluginName, False, bool): # Plugin was also active? reloadPlugin(pluginName) # unloadPlugin + loadPlugin + startPlugin diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py index f50995ba0e5..39129774fe1 100644 --- a/python/pyplugin_installer/installer_data.py +++ b/python/pyplugin_installer/installer_data.py @@ -811,7 +811,7 @@ class Plugins(QObject): seenPlugins = QgsSettings.createPluginTreeElement("_plugin_manager").childSetting("seen-plugins").valueWithDefaultOverride(list(self.mPlugins.keys())) if len(seenPlugins) > 0: for plugin in list(self.mPlugins.keys()): - if seenPlugins.count(plugin) == 0 and self.mPlugins[i]["status"] == "not installed": + if seenPlugins.count(plugin) == 0 and self.mPlugins[plugin]["status"] == "not installed": self.mPlugins[plugin]["status"] = "new" # ----------------------------------------- # diff --git a/src/core/geocms/geonode/qgsgeonodeconnection.cpp b/src/core/geocms/geonode/qgsgeonodeconnection.cpp index 34327aa900a..e8a21aaa700 100644 --- a/src/core/geocms/geonode/qgsgeonodeconnection.cpp +++ b/src/core/geocms/geonode/qgsgeonodeconnection.cpp @@ -13,7 +13,6 @@ * * ***************************************************************************/ -#include "qgssettings.h" #include "qgsgeonodeconnection.h" #include "qgslogger.h" #include "qgsdatasourceuri.h" diff --git a/src/core/locator/qgslocator.h b/src/core/locator/qgslocator.h index 5fe3e4ae368..81f1d748b54 100644 --- a/src/core/locator/qgslocator.h +++ b/src/core/locator/qgslocator.h @@ -154,7 +154,7 @@ class CORE_EXPORT QgsLocator : public QObject QStringList completionList() const {return mAutocompletionList;} #ifndef SIP_RUN - static inline QgsSettingsTreeNamedListElement *sTreeLocatorFilters = QgsSettings::sTreeQgis->createNamedListElement( QStringLiteral( "locator-filters" ) ); + static inline QgsSettingsTreeNamedListElement *sTreeLocatorFilters = QgsSettings::treeRoot()->createNamedListElement( QStringLiteral( "locator-filters" ) ); //! Settings entry locator filter enabled static const QgsSettingsEntryBool *settingsLocatorFilterEnabled; diff --git a/tests/src/python/test_qgsgeonodeconnection.py b/tests/src/python/test_qgsgeonodeconnection.py index c9497b9017d..78ca49bd3d8 100644 --- a/tests/src/python/test_qgsgeonodeconnection.py +++ b/tests/src/python/test_qgsgeonodeconnection.py @@ -33,20 +33,20 @@ class TestQgsGeoNodeConnection(unittest.TestCase): # setup a fake connection settings = QgsSettings() - key = QgsGeoNodeConnectionUtils.pathGeoNodeConnection() + '/test/' + key = f'/connections/ows/items/{QgsGeoNodeConnectionUtils.sGeoNodeConnection.lower()}/connections/items/test/' - settings.setValue(key + 'wms/referer', 'my_ref') - settings.setValue(key + 'wms/ignoreGetMapURI', True) - settings.setValue(key + 'wms/ignoreGetFeatureInfoURI', True) - settings.setValue(key + 'wms/smoothPixmapTransform', True) - settings.setValue(key + 'wms/dpiMode', 4) - settings.setValue(key + 'wms/ignoreAxisOrientation', True) - settings.setValue(key + 'wms/invertAxisOrientation', True) + settings.setValue(key + 'wms/http-header', {'referer': 'my_ref'}) + settings.setValue(key + 'wms/ignore-get-map-uri', True) + settings.setValue(key + 'wms/ignore-get-feature-info-uri', True) + settings.setValue(key + 'wms/smooth-pixmap-transform', True) + settings.setValue(key + 'wms/dpi-mode', 4) + settings.setValue(key + 'wms/ignore-axis-orientation', True) + settings.setValue(key + 'wms/invert-axis-orientation', True) settings.setValue(key + 'wfs/version', '1.1.0') - settings.setValue(key + 'wfs/maxnumfeatures', '47') - settings.setValue(key + 'wfs/ignoreAxisOrientation', True) - settings.setValue(key + 'wfs/invertAxisOrientation', True) + settings.setValue(key + 'wfs/max-num-features', '47') + settings.setValue(key + 'wfs/ignore-axis-orientation', True) + settings.setValue(key + 'wfs/invert-axis-orientation', True) def testWmsConnection(self): """ diff --git a/tests/src/python/test_qgslocator.py b/tests/src/python/test_qgslocator.py index e0c1fc8e65a..0f8ccba37d0 100644 --- a/tests/src/python/test_qgslocator.py +++ b/tests/src/python/test_qgslocator.py @@ -314,7 +314,7 @@ class TestQgsLocator(unittest.TestCase): l.deregisterFilter(filter_c) # filter with custom prefix - QgsSettings().setValue("locator_filters/prefix_test_custom", 'xyz', QgsSettings.Gui) + QgsSettings().setValue("locator-filters/items/test_custom/prefix", 'xyz') filter_c = test_filter('custom', 'abc') l.registerFilter(filter_c) self.assertEqual(filter_c.prefix(), 'abc') diff --git a/tests/src/python/test_qgsowsconnection.py b/tests/src/python/test_qgsowsconnection.py index 9e0946bec19..77964a1fdde 100644 --- a/tests/src/python/test_qgsowsconnection.py +++ b/tests/src/python/test_qgsowsconnection.py @@ -32,22 +32,22 @@ class TestQgsOwsConnection(unittest.TestCase): # setup some fake connections settings = QgsSettings() - key = 'qgis/connections-wms/test/' + key = '/connections/ows/items/wms/connections/items/test/' settings.setValue(key + 'url', 'aaa.bbb.com') - settings.setValue(key + 'referer', 'my_ref') - settings.setValue(key + 'ignoreGetMapURI', True) - settings.setValue(key + 'ignoreGetFeatureInfoURI', True) - settings.setValue(key + 'smoothPixmapTransform', True) - settings.setValue(key + 'dpiMode', 4) - settings.setValue(key + 'ignoreAxisOrientation', True) - settings.setValue(key + 'invertAxisOrientation', True) + settings.setValue(key + 'http-header', {'referer': 'my_ref'}) + settings.setValue(key + 'ignore-get-map-uri', True) + settings.setValue(key + 'ignore-get-feature-info-uri', True) + settings.setValue(key + 'smooth-pixmap-transform', True) + settings.setValue(key + 'dpi-mode', 4) + settings.setValue(key + 'ignore-axis-orientation', True) + settings.setValue(key + 'invert-axis-orientation', True) - key = 'qgis/connections-wfs/test/' + key = '/connections/ows/items/wfs/connections/items/test/' settings.setValue(key + 'url', 'ccc.ddd.com') settings.setValue(key + 'version', '1.1.0') - settings.setValue(key + 'maxnumfeatures', '47') - settings.setValue(key + 'ignoreAxisOrientation', True) - settings.setValue(key + 'invertAxisOrientation', True) + settings.setValue(key + 'max-num-features', '47') + settings.setValue(key + 'ignore-axis-orientation', True) + settings.setValue(key + 'invert-axis-orientation', True) def testWmsConnection(self): c = QgsOwsConnection('WMS', 'test') @@ -64,7 +64,7 @@ class TestQgsOwsConnection(unittest.TestCase): def testWmsSettings(self): uri = QgsDataSourceUri() - QgsOwsConnection.addWmsWcsConnectionSettings(uri, 'qgis/connections-wms/test/') + QgsOwsConnection.addWmsWcsConnectionSettings(uri, 'wms', 'test') self.assertEqual(uri.httpHeader('referer'), 'my_ref') self.assertEqual(uri.param('IgnoreGetMapUrl'), '1') @@ -86,7 +86,7 @@ class TestQgsOwsConnection(unittest.TestCase): def testWfsSettings(self): uri = QgsDataSourceUri() - QgsOwsConnection.addWfsConnectionSettings(uri, 'qgis/connections-wfs/test/') + QgsOwsConnection.addWfsConnectionSettings(uri, 'wfs', 'test') self.assertEqual(uri.param('version'), '1.1.0') self.assertEqual(uri.param('maxNumFeatures'), '47') diff --git a/tests/src/python/test_qgssettings.py b/tests/src/python/test_qgssettings.py index c3b45518f47..fd3c2a4c8e5 100644 --- a/tests/src/python/test_qgssettings.py +++ b/tests/src/python/test_qgssettings.py @@ -245,7 +245,7 @@ class TestQgsSettings(unittest.TestCase): self.assertEqual(self.settings.origin('undefined-key'), Qgis.SettingsOrigin.Any) self.settings.setValue('testqgissettings/global/setting', 'rocks') - self.assertEqual(self.settings.origin('testqgissettings/global/setting'), Qgis.SettingsOrigin.Local) + self.assertEqual(self.settings.origin('testqgissettings/global/setting'), Qgis.SettingsOrigin.Global) def test_group_section(self): # Test group by using Section