@@ -258,77 +258,77 @@ def testOrderByCompiled(self):
258
258
def runOrderByTests (self ):
259
259
request = QgsFeatureRequest ().addOrderBy ('cnt' )
260
260
values = [f ['cnt' ] for f in self .provider .getFeatures (request )]
261
- self .assertEquals (values , [- 200 , 100 , 200 , 300 , 400 ])
261
+ self .assertEqual (values , [- 200 , 100 , 200 , 300 , 400 ])
262
262
263
263
request = QgsFeatureRequest ().addOrderBy ('cnt' , False )
264
264
values = [f ['cnt' ] for f in self .provider .getFeatures (request )]
265
- self .assertEquals (values , [400 , 300 , 200 , 100 , - 200 ])
265
+ self .assertEqual (values , [400 , 300 , 200 , 100 , - 200 ])
266
266
267
267
request = QgsFeatureRequest ().addOrderBy ('name' )
268
268
values = [f ['name' ] for f in self .provider .getFeatures (request )]
269
- self .assertEquals (values , ['Apple' , 'Honey' , 'Orange' , 'Pear' , NULL ])
269
+ self .assertEqual (values , ['Apple' , 'Honey' , 'Orange' , 'Pear' , NULL ])
270
270
271
271
request = QgsFeatureRequest ().addOrderBy ('name' , True , True )
272
272
values = [f ['name' ] for f in self .provider .getFeatures (request )]
273
- self .assertEquals (values , [NULL , 'Apple' , 'Honey' , 'Orange' , 'Pear' ])
273
+ self .assertEqual (values , [NULL , 'Apple' , 'Honey' , 'Orange' , 'Pear' ])
274
274
275
275
request = QgsFeatureRequest ().addOrderBy ('name' , False )
276
276
values = [f ['name' ] for f in self .provider .getFeatures (request )]
277
- self .assertEquals (values , [NULL , 'Pear' , 'Orange' , 'Honey' , 'Apple' ])
277
+ self .assertEqual (values , [NULL , 'Pear' , 'Orange' , 'Honey' , 'Apple' ])
278
278
279
279
request = QgsFeatureRequest ().addOrderBy ('name' , False , False )
280
280
values = [f ['name' ] for f in self .provider .getFeatures (request )]
281
- self .assertEquals (values , ['Pear' , 'Orange' , 'Honey' , 'Apple' , NULL ])
281
+ self .assertEqual (values , ['Pear' , 'Orange' , 'Honey' , 'Apple' , NULL ])
282
282
283
283
# Case sensitivity
284
284
request = QgsFeatureRequest ().addOrderBy ('name2' )
285
285
values = [f ['name2' ] for f in self .provider .getFeatures (request )]
286
- self .assertEquals (values , ['Apple' , 'Honey' , 'NuLl' , 'oranGe' , 'PEaR' ])
286
+ self .assertEqual (values , ['Apple' , 'Honey' , 'NuLl' , 'oranGe' , 'PEaR' ])
287
287
288
288
# Combination with LIMIT
289
289
request = QgsFeatureRequest ().addOrderBy ('pk' , False ).setLimit (2 )
290
290
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
291
- self .assertEquals (values , [5 , 4 ])
291
+ self .assertEqual (values , [5 , 4 ])
292
292
293
293
# A slightly more complex expression
294
294
request = QgsFeatureRequest ().addOrderBy ('pk*2' , False )
295
295
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
296
- self .assertEquals (values , [5 , 4 , 3 , 2 , 1 ])
296
+ self .assertEqual (values , [5 , 4 , 3 , 2 , 1 ])
297
297
298
298
# Order reversing expression
299
299
request = QgsFeatureRequest ().addOrderBy ('pk*-1' , False )
300
300
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
301
- self .assertEquals (values , [1 , 2 , 3 , 4 , 5 ])
301
+ self .assertEqual (values , [1 , 2 , 3 , 4 , 5 ])
302
302
303
303
# Type dependent expression
304
304
request = QgsFeatureRequest ().addOrderBy ('num_char*2' , False )
305
305
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
306
- self .assertEquals (values , [5 , 4 , 3 , 2 , 1 ])
306
+ self .assertEqual (values , [5 , 4 , 3 , 2 , 1 ])
307
307
308
308
# Order by guaranteed to fail
309
309
request = QgsFeatureRequest ().addOrderBy ('not a valid expression*' , False )
310
310
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
311
- self .assertEquals (set (values ), set ([5 , 4 , 3 , 2 , 1 ]))
311
+ self .assertEqual (set (values ), set ([5 , 4 , 3 , 2 , 1 ]))
312
312
313
313
# Multiple order bys and boolean
314
314
request = QgsFeatureRequest ().addOrderBy ('pk > 2' ).addOrderBy ('pk' , False )
315
315
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
316
- self .assertEquals (values , [2 , 1 , 5 , 4 , 3 ])
316
+ self .assertEqual (values , [2 , 1 , 5 , 4 , 3 ])
317
317
318
318
# Multiple order bys, one bad, and a limit
319
319
request = QgsFeatureRequest ().addOrderBy ('pk' , False ).addOrderBy ('not a valid expression*' , False ).setLimit (2 )
320
320
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
321
- self .assertEquals (values , [5 , 4 ])
321
+ self .assertEqual (values , [5 , 4 ])
322
322
323
323
# Bad expression first
324
324
request = QgsFeatureRequest ().addOrderBy ('not a valid expression*' , False ).addOrderBy ('pk' , False ).setLimit (2 )
325
325
values = [f ['pk' ] for f in self .provider .getFeatures (request )]
326
- self .assertEquals (values , [5 , 4 ])
326
+ self .assertEqual (values , [5 , 4 ])
327
327
328
328
# Combination with subset of attributes
329
329
request = QgsFeatureRequest ().addOrderBy ('num_char' , False ).setSubsetOfAttributes (['pk' ], self .vl .fields ())
330
330
values = [f ['pk' ] for f in self .vl .getFeatures (request )]
331
- self .assertEquals (values , [5 , 4 , 3 , 2 , 1 ])
331
+ self .assertEqual (values , [5 , 4 , 3 , 2 , 1 ])
332
332
333
333
def testGetFeaturesFidTests (self ):
334
334
fids = [f .id () for f in self .provider .getFeatures ()]
0 commit comments