Skip to content

Commit ef676cf

Browse files
m-kuhnm-kuhn
committedApr 9, 2018
Make models available in processing tests
·
ltr-3_40final-3_2_0
1 parent dbced35 commit ef676cf

File tree

2 files changed

+109
-1
lines changed

2 files changed

+109
-1
lines changed
 

‎python/plugins/processing/tests/QgisAlgorithmsTest.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
import nose2
3131
import shutil
32+
import os
3233

3334
from qgis.core import (QgsApplication,
3435
QgsProcessingAlgorithm,
@@ -37,6 +38,8 @@
3738
from qgis.analysis import (QgsNativeAlgorithms)
3839
from qgis.testing import start_app, unittest
3940
from processing.tools.dataobjects import createContext
41+
from processing.core.ProcessingConfig import ProcessingConfig
42+
from processing.modeler.ModelerUtils import ModelerUtils
4043

4144

4245
class TestAlg(QgsProcessingAlgorithm):
@@ -66,19 +69,22 @@ class TestQgisAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
6669
@classmethod
6770
def setUpClass(cls):
6871
start_app()
69-
QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms())
7072
from processing.core.Processing import Processing
7173
Processing.initialize()
74+
ProcessingConfig.setSettingValue(ModelerUtils.MODELS_FOLDER, os.path.join(os.path.dirname(__file__), 'models'))
75+
QgsApplication.processingRegistry().addProvider(QgsNativeAlgorithms())
7276
cls.cleanup_paths = []
7377
cls.in_place_layers = {}
7478
cls.vector_layer_params = {}
79+
cls._original_models_folder = ProcessingConfig.getSetting(ModelerUtils.MODELS_FOLDER)
7580

7681
@classmethod
7782
def tearDownClass(cls):
7883
from processing.core.Processing import Processing
7984
Processing.deinitialize()
8085
for path in cls.cleanup_paths:
8186
shutil.rmtree(path)
87+
ProcessingConfig.setSettingValue(ModelerUtils.MODELS_FOLDER, cls._original_models_folder)
8288

8389
def test_definition_file(self):
8490
return 'qgis_algorithm_tests.yaml'

‎python/plugins/processing/tests/models/filtertest.model3

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<!DOCTYPE model>
2+
<Option type="Map">
3+
<Option type="Map" name="children">
4+
<Option type="Map" name="native:filter_1">
5+
<Option value="true" type="bool" name="active"/>
6+
<Option type="Map" name="alg_config">
7+
<Option type="List" name="outputs">
8+
<Option type="Map">
9+
<Option value="1" type="QString" name="expression"/>
10+
<Option value="true" type="bool" name="isModelOutput"/>
11+
<Option value="all" type="QString" name="name"/>
12+
</Option>
13+
<Option type="Map">
14+
<Option value="0" type="QString" name="expression"/>
15+
<Option value="true" type="bool" name="isModelOutput"/>
16+
<Option value="nothing" type="QString" name="name"/>
17+
</Option>
18+
</Option>
19+
</Option>
20+
<Option value="native:filter" type="QString" name="alg_id"/>
21+
<Option value="Filter" type="QString" name="component_description"/>
22+
<Option value="623" type="double" name="component_pos_x"/>
23+
<Option value="347" type="double" name="component_pos_y"/>
24+
<Option name="dependencies"/>
25+
<Option value="native:filter_1" type="QString" name="id"/>
26+
<Option type="Map" name="outputs">
27+
<Option type="Map" name="OUTPUT_all">
28+
<Option value="native:filter_1" type="QString" name="child_id"/>
29+
<Option value="OUTPUT_all" type="QString" name="component_description"/>
30+
<Option value="823" type="double" name="component_pos_x"/>
31+
<Option value="392" type="double" name="component_pos_y"/>
32+
<Option value="OUTPUT_all" type="QString" name="name"/>
33+
<Option value="OUTPUT_all" type="QString" name="output_name"/>
34+
</Option>
35+
<Option type="Map" name="OUTPUT_nothing">
36+
<Option value="native:filter_1" type="QString" name="child_id"/>
37+
<Option value="OUTPUT_nothing" type="QString" name="component_description"/>
38+
<Option value="823" type="double" name="component_pos_x"/>
39+
<Option value="422" type="double" name="component_pos_y"/>
40+
<Option value="OUTPUT_nothing" type="QString" name="name"/>
41+
<Option value="OUTPUT_nothing" type="QString" name="output_name"/>
42+
</Option>
43+
</Option>
44+
<Option value="false" type="bool" name="outputs_collapsed"/>
45+
<Option value="false" type="bool" name="parameters_collapsed"/>
46+
<Option type="Map" name="params">
47+
<Option type="List" name="INPUT">
48+
<Option type="Map">
49+
<Option value="layer" type="QString" name="parameter_name"/>
50+
<Option value="0" type="int" name="source"/>
51+
</Option>
52+
</Option>
53+
</Option>
54+
</Option>
55+
</Option>
56+
<Option name="help"/>
57+
<Option value="filter" type="QString" name="model_group"/>
58+
<Option value="filtertest" type="QString" name="model_name"/>
59+
<Option type="Map" name="parameterDefinitions">
60+
<Option type="Map" name="layer">
61+
<Option type="List" name="data_types">
62+
<Option value="5" type="int"/>
63+
</Option>
64+
<Option value="" type="Unknown" name="default"/>
65+
<Option value="layer" type="QString" name="description"/>
66+
<Option value="0" type="int" name="flags"/>
67+
<Option name="metadata"/>
68+
<Option value="layer" type="QString" name="name"/>
69+
<Option value="vector" type="QString" name="parameter_type"/>
70+
</Option>
71+
<Option type="Map" name="native:filter_1:OUTPUT_all">
72+
<Option value="true" type="bool" name="create_by_default"/>
73+
<Option value="-1" type="int" name="data_type"/>
74+
<Option value="" type="Unknown" name="default"/>
75+
<Option value="OUTPUT_all" type="QString" name="description"/>
76+
<Option value="20" type="int" name="flags"/>
77+
<Option name="metadata"/>
78+
<Option value="native:filter_1:OUTPUT_all" type="QString" name="name"/>
79+
<Option value="sink" type="QString" name="parameter_type"/>
80+
<Option value="true" type="bool" name="supports_non_file_outputs"/>
81+
</Option>
82+
<Option type="Map" name="native:filter_1:OUTPUT_nothing">
83+
<Option value="true" type="bool" name="create_by_default"/>
84+
<Option value="-1" type="int" name="data_type"/>
85+
<Option value="" type="Unknown" name="default"/>
86+
<Option value="OUTPUT_nothing" type="QString" name="description"/>
87+
<Option value="20" type="int" name="flags"/>
88+
<Option name="metadata"/>
89+
<Option value="native:filter_1:OUTPUT_nothing" type="QString" name="name"/>
90+
<Option value="sink" type="QString" name="parameter_type"/>
91+
<Option value="true" type="bool" name="supports_non_file_outputs"/>
92+
</Option>
93+
</Option>
94+
<Option type="Map" name="parameters">
95+
<Option type="Map" name="layer">
96+
<Option value="layer" type="QString" name="component_description"/>
97+
<Option value="208" type="double" name="component_pos_x"/>
98+
<Option value="291" type="double" name="component_pos_y"/>
99+
<Option value="layer" type="QString" name="name"/>
100+
</Option>
101+
</Option>
102+
</Option>

0 commit comments

Comments
 (0)
Please sign in to comment.