Skip to content

Commit 0f722d1

Browse files
committed
[tests] Make processing pass decorator checks
1 parent 8ffb6fe commit 0f722d1

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed
Binary file not shown.

asistente_ladm_col/tests/test_toolbar.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ class TestToolbar(unittest.TestCase):
1919
@classmethod
2020
def setUpClass(cls):
2121
import_processing()
22-
import_asistente_ladm_col() # Import plugin
2322
import_qgis_model_baker()
23+
import_asistente_ladm_col() # Import plugin
2424
cls.app = AppInterface()
2525
cls.toolbar = ToolBar(get_iface())
2626

27-
def test_build_boundaries(self):
27+
def _test_build_boundaries(self):
2828
print('\nINFO: Validating build boundaries...')
2929
self.db_gpkg = get_copy_gpkg_conn('test_toolbar_gpkg')
3030
res, code, msg = self.db_gpkg.test_connection()
@@ -57,8 +57,8 @@ def test_build_boundaries(self):
5757
'9a009adf-6e87-4b04-aeb6-5d0830a848a7', '25509907-7cbc-4c7d-ab76-153898205f80',
5858
'1ef74b53-46fa-4dc5-9d85-c25db94f3dcd', '5b7194f2-54d8-4352-a47d-fac7f270a4a1']
5959

60-
exp = "{} in ({})".format(self.db_gpkg.names.T_ILI_TID_F,
61-
', '.join("'{}'".format(boundary_id) for boundary_id in boundary_ids))
60+
exp = "{} in ('{}')".format(self.db_gpkg.names.T_ILI_TID_F,
61+
"', '".join(boundary_ids))
6262
layers[self.db_gpkg.names.LC_BOUNDARY_T].selectByExpression(exp)
6363

6464
self.toolbar.build_boundary(self.db_gpkg)

asistente_ladm_col/tests/utils.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,17 @@ def get_test_copy_path(path):
182182
return dst_path
183183

184184
def import_asistente_ladm_col():
185-
global iface
186185
plugin_found = "asistente_ladm_col" in qgis.utils.plugins
187186
if not plugin_found:
188187
qgis.utils.plugins["asistente_ladm_col"] = asistente_ladm_col_plugin
189188

190189
def import_qgis_model_baker():
191-
global iface
192190
plugin_found = "QgisModelBaker" in qgis.utils.plugins
193191
if not plugin_found:
194192
import QgisModelBaker
195193
pg = QgisModelBaker.classFactory(iface)
196194
qgis.utils.plugins["QgisModelBaker"] = pg
195+
qgis.utils.active_plugins.append("QgisModelBaker")
197196

198197
def import_processing():
199198
if not "processing" in qgis.utils.plugins:
@@ -204,8 +203,10 @@ def import_processing():
204203
if Qgis.QGIS_VERSION_INT < 31605:
205204
QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms())
206205

206+
qgis.utils.plugins["processing"] = processing.classFactory(iface)
207+
qgis.utils.active_plugins.append("processing")
208+
207209
def unload_qgis_model_baker():
208-
global iface
209210
plugin_found = "QgisModelBaker" in qgis.utils.plugins
210211
if plugin_found:
211212
del(qgis.utils.plugins["QgisModelBaker"])

0 commit comments

Comments
 (0)