Skip to content

Commit af18f46

Browse files
m-kuhnm-kuhn
committedApr 9, 2018
Add filter feature processing test
·
ltr-3_40final-3_2_0
1 parent ef676cf commit af18f46

File tree

4 files changed

+160
-75
lines changed

4 files changed

+160
-75
lines changed
 

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

Lines changed: 53 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,80 @@
11
<!DOCTYPE model>
22
<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">
3+
<Option name="children" type="Map">
4+
<Option name="native:filter_1" type="Map">
5+
<Option name="active" value="true" type="bool"/>
6+
<Option name="alg_config" type="Map">
7+
<Option name="outputs" type="List">
88
<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"/>
9+
<Option name="expression" value="&quot;id2&quot; &lt; 1" type="QString"/>
10+
<Option name="isModelOutput" value="true" type="bool"/>
11+
<Option name="name" value="small" type="QString"/>
1212
</Option>
1313
<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"/>
14+
<Option name="expression" value="&quot;id2&quot; >= 1" type="QString"/>
15+
<Option name="isModelOutput" value="true" type="bool"/>
16+
<Option name="name" value="big" type="QString"/>
1717
</Option>
1818
</Option>
1919
</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"/>
20+
<Option name="alg_id" value="native:filter" type="QString"/>
21+
<Option name="component_description" value="Filter" type="QString"/>
22+
<Option name="component_pos_x" value="623" type="double"/>
23+
<Option name="component_pos_y" value="347" type="double"/>
2424
<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"/>
25+
<Option name="id" value="native:filter_1" type="QString"/>
26+
<Option name="outputs" type="Map">
27+
<Option name="OUTPUT_big" type="Map">
28+
<Option name="child_id" value="native:filter_1" type="QString"/>
29+
<Option name="component_description" value="OUTPUT_big" type="QString"/>
30+
<Option name="component_pos_x" value="823" type="double"/>
31+
<Option name="component_pos_y" value="392" type="double"/>
32+
<Option name="name" value="OUTPUT_big" type="QString"/>
33+
<Option name="output_name" value="OUTPUT_big" type="QString"/>
3434
</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"/>
35+
<Option name="OUTPUT_small" type="Map">
36+
<Option name="child_id" value="native:filter_1" type="QString"/>
37+
<Option name="component_description" value="OUTPUT_small" type="QString"/>
38+
<Option name="component_pos_x" value="823" type="double"/>
39+
<Option name="component_pos_y" value="422" type="double"/>
40+
<Option name="name" value="OUTPUT_small" type="QString"/>
41+
<Option name="output_name" value="OUTPUT_small" type="QString"/>
4242
</Option>
4343
</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">
44+
<Option name="outputs_collapsed" value="false" type="bool"/>
45+
<Option name="parameters_collapsed" value="false" type="bool"/>
46+
<Option name="params" type="Map">
47+
<Option name="INPUT" type="List">
4848
<Option type="Map">
49-
<Option value="layer" type="QString" name="parameter_name"/>
50-
<Option value="0" type="int" name="source"/>
49+
<Option name="parameter_name" value="layer" type="QString"/>
50+
<Option name="source" value="0" type="int"/>
5151
</Option>
5252
</Option>
5353
</Option>
5454
</Option>
5555
</Option>
5656
<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">
57+
<Option name="model_group" value="filter" type="QString"/>
58+
<Option name="model_name" value="filtertest" type="QString"/>
59+
<Option name="parameterDefinitions" type="Map">
60+
<Option name="layer" type="Map">
61+
<Option name="data_types" type="List">
6262
<Option value="5" type="int"/>
6363
</Option>
64-
<Option value="" type="Unknown" name="default"/>
65-
<Option value="layer" type="QString" name="description"/>
66-
<Option value="0" type="int" name="flags"/>
64+
<Option name="default" value="" type="Unknown"/>
65+
<Option name="description" value="layer" type="QString"/>
66+
<Option name="flags" value="0" type="int"/>
6767
<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"/>
68+
<Option name="name" value="layer" type="QString"/>
69+
<Option name="parameter_type" value="vector" type="QString"/>
9270
</Option>
9371
</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"/>
72+
<Option name="parameters" type="Map">
73+
<Option name="layer" type="Map">
74+
<Option name="component_description" value="layer" type="QString"/>
75+
<Option name="component_pos_x" value="208" type="double"/>
76+
<Option name="component_pos_y" value="291" type="double"/>
77+
<Option name="name" value="layer" type="QString"/>
10078
</Option>
10179
</Option>
10280
</Option>

‎python/plugins/processing/tests/testdata/expected/filter_points_big.gml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ogr:FeatureCollection
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://ogr.maptools.org/ filter_points_big.xsd"
5+
xmlns:ogr="http://ogr.maptools.org/"
6+
xmlns:gml="http://www.opengis.net/gml">
7+
<gml:boundedBy>
8+
<gml:Box>
9+
<gml:coord><gml:X>1</gml:X><gml:Y>1</gml:Y></gml:coord>
10+
<gml:coord><gml:X>5</gml:X><gml:Y>3</gml:Y></gml:coord>
11+
</gml:Box>
12+
</gml:boundedBy>
13+
14+
<gml:featureMember>
15+
<ogr:filter_points_big fid="points.0">
16+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>1,1</gml:coordinates></gml:Point></ogr:geometryProperty>
17+
<ogr:id>1</ogr:id>
18+
<ogr:id2>2</ogr:id2>
19+
</ogr:filter_points_big>
20+
</gml:featureMember>
21+
<gml:featureMember>
22+
<ogr:filter_points_big fid="points.1">
23+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>3,3</gml:coordinates></gml:Point></ogr:geometryProperty>
24+
<ogr:id>2</ogr:id>
25+
<ogr:id2>1</ogr:id2>
26+
</ogr:filter_points_big>
27+
</gml:featureMember>
28+
<gml:featureMember>
29+
<ogr:filter_points_big fid="points.3">
30+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>5,2</gml:coordinates></gml:Point></ogr:geometryProperty>
31+
<ogr:id>4</ogr:id>
32+
<ogr:id2>2</ogr:id2>
33+
</ogr:filter_points_big>
34+
</gml:featureMember>
35+
<gml:featureMember>
36+
<ogr:filter_points_big fid="points.4">
37+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>4,1</gml:coordinates></gml:Point></ogr:geometryProperty>
38+
<ogr:id>5</ogr:id>
39+
<ogr:id2>1</ogr:id2>
40+
</ogr:filter_points_big>
41+
</gml:featureMember>
42+
</ogr:FeatureCollection>

‎python/plugins/processing/tests/testdata/expected/filter_points_small.gml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<ogr:FeatureCollection
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://ogr.maptools.org/ filter_points_small.xsd"
5+
xmlns:ogr="http://ogr.maptools.org/"
6+
xmlns:gml="http://www.opengis.net/gml">
7+
<gml:boundedBy>
8+
<gml:Box>
9+
<gml:coord><gml:X>0</gml:X><gml:Y>-5</gml:Y></gml:coord>
10+
<gml:coord><gml:X>8</gml:X><gml:Y>2</gml:Y></gml:coord>
11+
</gml:Box>
12+
</gml:boundedBy>
13+
14+
<gml:featureMember>
15+
<ogr:filter_points_small fid="points.2">
16+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>2,2</gml:coordinates></gml:Point></ogr:geometryProperty>
17+
<ogr:id>3</ogr:id>
18+
<ogr:id2>0</ogr:id2>
19+
</ogr:filter_points_small>
20+
</gml:featureMember>
21+
<gml:featureMember>
22+
<ogr:filter_points_small fid="points.5">
23+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-5</gml:coordinates></gml:Point></ogr:geometryProperty>
24+
<ogr:id>6</ogr:id>
25+
<ogr:id2>0</ogr:id2>
26+
</ogr:filter_points_small>
27+
</gml:featureMember>
28+
<gml:featureMember>
29+
<ogr:filter_points_small fid="points.6">
30+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>8,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
31+
<ogr:id>7</ogr:id>
32+
<ogr:id2>0</ogr:id2>
33+
</ogr:filter_points_small>
34+
</gml:featureMember>
35+
<gml:featureMember>
36+
<ogr:filter_points_small fid="points.7">
37+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>7,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
38+
<ogr:id>8</ogr:id>
39+
<ogr:id2>0</ogr:id2>
40+
</ogr:filter_points_small>
41+
</gml:featureMember>
42+
<gml:featureMember>
43+
<ogr:filter_points_small fid="points.8">
44+
<ogr:geometryProperty><gml:Point srsName="EPSG:4326"><gml:coordinates>0,-1</gml:coordinates></gml:Point></ogr:geometryProperty>
45+
<ogr:id>9</ogr:id>
46+
<ogr:id2>0</ogr:id2>
47+
</ogr:filter_points_small>
48+
</gml:featureMember>
49+
</ogr:FeatureCollection>

‎python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5176,3 +5176,19 @@ tests:
51765176
OUTPUT:
51775177
name: expected/swap_xy.gml
51785178
type: vector
5179+
5180+
- algorithm: model:filtertest
5181+
name: Test (model:filtertest)
5182+
params:
5183+
layer:
5184+
name: points.gml
5185+
type: vector
5186+
results:
5187+
native:filter_1:OUTPUT_small:
5188+
name: expected/filter_points_small.gml
5189+
type: vector
5190+
native:filter_1:OUTPUT_big:
5191+
name: expected/filter_points_big.gml
5192+
type: vector
5193+
5194+
# See ../README.md for a description of the file format

0 commit comments

Comments
 (0)
Please sign in to comment.