@@ -60,7 +60,7 @@ def testFeatures(self):
60
60
context = QgsProcessingContext ()
61
61
62
62
# disable check for geometry validity
63
- context .setFlags (0 )
63
+ context .setFlags (QgsProcessingContext . Flags ( 0 ) )
64
64
65
65
# test with all features
66
66
features = vector .features (test_layer , context )
@@ -75,7 +75,7 @@ def testFeatures(self):
75
75
self .assertEqual (set ([f .id () for f in features ]), set ([2 , 4 , 6 ]))
76
76
77
77
# selection, but not using selected features
78
- context .setFlags (0 )
78
+ context .setFlags (QgsProcessingContext . Flags ( 0 ) )
79
79
test_layer .selectByIds ([2 , 4 , 6 ])
80
80
features = vector .features (test_layer , context )
81
81
self .assertEqual (len (features ), 9 )
@@ -89,7 +89,7 @@ def testFeatures(self):
89
89
self .assertEqual (set ([f .id () for f in features ]), set ([0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 ]))
90
90
91
91
# test that feature request is honored
92
- context .setFlags (0 )
92
+ context .setFlags (QgsProcessingContext . Flags ( 0 ) )
93
93
features = vector .features (test_layer , context , QgsFeatureRequest ().setFilterFids ([1 , 3 , 5 ]))
94
94
self .assertEqual (set ([f .id () for f in features ]), set ([1 , 3 , 5 ]))
95
95
@@ -112,45 +112,45 @@ def testValues(self):
112
112
context = QgsProcessingContext ()
113
113
114
114
# disable check for geometry validity
115
- context .setFlags (0 )
115
+ context .setFlags (QgsProcessingContext . Flags ( 0 ) )
116
116
117
117
test_data = points ()
118
118
test_layer = QgsVectorLayer (test_data , 'test' , 'ogr' )
119
119
120
120
# field by index
121
- res = vector .values (test_layer , context )
121
+ res = vector .values (test_layer , context , 1 )
122
122
self .assertEqual (res [1 ], [1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 ])
123
123
124
124
# field by name
125
- res = vector .values (test_layer , context )
125
+ res = vector .values (test_layer , context , 'id' )
126
126
self .assertEqual (res ['id' ], [1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 ])
127
127
128
128
# two fields
129
- res = vector .values (test_layer , context , 2 )
129
+ res = vector .values (test_layer , context , 1 , 2 )
130
130
self .assertEqual (res [1 ], [1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 ])
131
131
self .assertEqual (res [2 ], [2 , 1 , 0 , 2 , 1 , 0 , 0 , 0 , 0 ])
132
132
133
133
# two fields by name
134
- res = vector .values (test_layer , context , 'id2' )
134
+ res = vector .values (test_layer , context , 'id' , ' id2' )
135
135
self .assertEqual (res ['id' ], [1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 ])
136
136
self .assertEqual (res ['id2' ], [2 , 1 , 0 , 2 , 1 , 0 , 0 , 0 , 0 ])
137
137
138
138
# two fields by name and index
139
- res = vector .values (test_layer , context , 2 )
139
+ res = vector .values (test_layer , context , 'id' , 2 )
140
140
self .assertEqual (res ['id' ], [1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 ])
141
141
self .assertEqual (res [2 ], [2 , 1 , 0 , 2 , 1 , 0 , 0 , 0 , 0 ])
142
142
143
143
# test with selected features
144
144
context .setFlags (QgsProcessingContext .UseSelection )
145
145
test_layer .selectByIds ([2 , 4 , 6 ])
146
- res = vector .values (test_layer , context )
146
+ res = vector .values (test_layer , context , 1 )
147
147
self .assertEqual (set (res [1 ]), set ([5 , 7 , 3 ]))
148
148
149
149
def testUniqueValues (self ):
150
150
151
151
context = QgsProcessingContext ()
152
152
# disable check for geometry validity
153
- context .setFlags (0 )
153
+ context .setFlags (QgsProcessingContext . Flags ( 0 ) )
154
154
155
155
test_data = points ()
156
156
test_layer = QgsVectorLayer (test_data , 'test' , 'ogr' )
0 commit comments