sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Denis Rouzaud 2023-01-13 17:40:12 +01:00
parent 80e3f35e88
commit 5be8887187
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/pyplugin_installer/installer.py
View File

@ -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

2
python/pyplugin_installer/installer_data.py
View File

@ -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"
# ----------------------------------------- #

1
src/core/geocms/geonode/qgsgeonodeconnection.cpp
View File

@ -13,7 +13,6 @@
* *
***************************************************************************/
#include "qgssettings.h"
#include "qgsgeonodeconnection.h"
#include "qgslogger.h"
#include "qgsdatasourceuri.h"

2
src/core/locator/qgslocator.h
View File

@ -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;

22
tests/src/python/test_qgsgeonodeconnection.py
View File

@ -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):
"""

2
tests/src/python/test_qgslocator.py
View File

@ -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')

28
tests/src/python/test_qgsowsconnection.py
View File

@ -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')

2
tests/src/python/test_qgssettings.py
View File

@ -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