From ef676cffc854db8af01da3f541e016e76f87f0e2 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 9 Apr 2018 08:31:20 +0200 Subject: [PATCH] Make models available in processing tests --- .../processing/tests/QgisAlgorithmsTest.py | 8 +- .../processing/tests/models/filtertest.model3 | 102 ++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 python/plugins/processing/tests/models/filtertest.model3 diff --git a/python/plugins/processing/tests/QgisAlgorithmsTest.py b/python/plugins/processing/tests/QgisAlgorithmsTest.py index 0bf04dae084..32b15d15396 100644 --- a/python/plugins/processing/tests/QgisAlgorithmsTest.py +++ b/python/plugins/processing/tests/QgisAlgorithmsTest.py @@ -29,6 +29,7 @@ import AlgorithmsTestBase import nose2 import shutil +import os from qgis.core import (QgsApplication, QgsProcessingAlgorithm, @@ -37,6 +38,8 @@ from qgis.core import (QgsApplication, from qgis.analysis import (QgsNativeAlgorithms) from qgis.testing import start_app, unittest from processing.tools.dataobjects import createContext +from processing.core.ProcessingConfig import ProcessingConfig +from processing.modeler.ModelerUtils import ModelerUtils class TestAlg(QgsProcessingAlgorithm): @@ -66,12 +69,14 @@ class TestQgisAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest): @classmethod def setUpClass(cls): start_app() - QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms()) from processing.core.Processing import Processing Processing.initialize() + ProcessingConfig.setSettingValue(ModelerUtils.MODELS_FOLDER, os.path.join(os.path.dirname(__file__), 'models')) + QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms()) cls.cleanup_paths = [] cls.in_place_layers = {} cls.vector_layer_params = {} + cls._original_models_folder = ProcessingConfig.getSetting(ModelerUtils.MODELS_FOLDER) @classmethod def tearDownClass(cls): @@ -79,6 +84,7 @@ class TestQgisAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest): Processing.deinitialize() for path in cls.cleanup_paths: shutil.rmtree(path) + ProcessingConfig.setSettingValue(ModelerUtils.MODELS_FOLDER, cls._original_models_folder) def test_definition_file(self): return 'qgis_algorithm_tests.yaml' diff --git a/python/plugins/processing/tests/models/filtertest.model3 b/python/plugins/processing/tests/models/filtertest.model3 new file mode 100644 index 00000000000..bc283bc2ed4 --- /dev/null +++ b/python/plugins/processing/tests/models/filtertest.model3 @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + +