Skip to content

Commit c1687ab

Browse files
m-kuhnm-kuhn
committed
Replace calls to deprecated assertEquals method
1 parent 4335a77 commit c1687ab

12 files changed

+258
-258
lines changed

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -190,39 +190,39 @@ class ParameterFileTest(unittest.TestCase):
190190
def testSetValue(self):
191191
parameter = ParameterFile('myName', 'myDesc')
192192
self.assertTrue(parameter.setValue('myFile.png'))
193-
self.assertEquals(parameter.value, 'myFile.png')
193+
self.assertEqual(parameter.value, 'myFile.png')
194194

195195
def testOptional(self):
196196
optionalParameter = ParameterFile('myName', 'myDesc', optional=True)
197197
self.assertTrue(optionalParameter.setValue('myFile.png'))
198-
self.assertEquals(optionalParameter.value, 'myFile.png')
198+
self.assertEqual(optionalParameter.value, 'myFile.png')
199199

200200
self.assertTrue(optionalParameter.setValue(""))
201-
self.assertEquals(optionalParameter.value, '')
201+
self.assertEqual(optionalParameter.value, '')
202202

203203
self.assertTrue(optionalParameter.setValue(None))
204-
self.assertEquals(optionalParameter.value, None)
204+
self.assertEqual(optionalParameter.value, None)
205205

206206
requiredParameter = ParameterFile('myName', 'myDesc', optional=False)
207207
self.assertTrue(requiredParameter.setValue('myFile.png'))
208-
self.assertEquals(requiredParameter.value, 'myFile.png')
208+
self.assertEqual(requiredParameter.value, 'myFile.png')
209209

210210
self.assertFalse(requiredParameter.setValue(''))
211-
self.assertEquals(requiredParameter.value, 'myFile.png')
211+
self.assertEqual(requiredParameter.value, 'myFile.png')
212212

213213
self.assertFalse(requiredParameter.setValue(' '))
214-
self.assertEquals(requiredParameter.value, 'myFile.png')
214+
self.assertEqual(requiredParameter.value, 'myFile.png')
215215

216216
self.assertFalse(requiredParameter.setValue(None))
217-
self.assertEquals(requiredParameter.value, 'myFile.png')
217+
self.assertEqual(requiredParameter.value, 'myFile.png')
218218

219219
def testSetValueWithExtension(self):
220220
parameter = ParameterFile('myName', 'myDesc', ext="png")
221221
self.assertTrue(parameter.setValue('myFile.png'))
222-
self.assertEquals(parameter.value, 'myFile.png')
222+
self.assertEqual(parameter.value, 'myFile.png')
223223

224224
self.assertFalse(parameter.setValue('myFile.bmp'))
225-
self.assertEquals(parameter.value, 'myFile.png')
225+
self.assertEqual(parameter.value, 'myFile.png')
226226

227227
def testGetValueAsCommandLineParameter(self):
228228
parameter = ParameterFile('myName', 'myDesc')
@@ -237,13 +237,13 @@ def testTableToString(self):
237237
['a0', 'a1', 'a2'],
238238
['b0', 'b1', 'b2']
239239
]
240-
self.assertEquals(ParameterFixedTable.tableToString(table), 'a0,a1,a2,b0,b1,b2')
240+
self.assertEqual(ParameterFixedTable.tableToString(table), 'a0,a1,a2,b0,b1,b2')
241241

242242
table = [['a0']]
243-
self.assertEquals(ParameterFixedTable.tableToString(table), 'a0')
243+
self.assertEqual(ParameterFixedTable.tableToString(table), 'a0')
244244

245245
table = [[]]
246-
self.assertEquals(ParameterFixedTable.tableToString(table), '')
246+
self.assertEqual(ParameterFixedTable.tableToString(table), '')
247247

248248
def testSetStringValue(self):
249249
parameter = ParameterFixedTable('myName', 'myDesc')
@@ -345,7 +345,7 @@ class ParameterNumberTest(unittest.TestCase):
345345
def testSetValue(self):
346346
parameter = ParameterNumber('myName', 'myDescription')
347347
self.assertTrue(parameter.setValue(5))
348-
self.assertEquals(parameter.value, 5)
348+
self.assertEqual(parameter.value, 5)
349349

350350
def testSetValueOnlyValidNumbers(self):
351351
parameter = ParameterNumber('myName', 'myDescription')

‎python/testing/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def assertLayersEqual(self, layer_expected, layer_result, **kwargs):
8282
geom1 = feats[1].geometry().geometry().asWkt(precision)
8383
else:
8484
geom1 = None
85-
_TestCase.assertEquals(
85+
_TestCase.assertEqual(
8686
self,
8787
geom0,
8888
geom1,

‎tests/src/python/providertestbase.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -258,77 +258,77 @@ def testOrderByCompiled(self):
258258
def runOrderByTests(self):
259259
request = QgsFeatureRequest().addOrderBy('cnt')
260260
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])
262262

263263
request = QgsFeatureRequest().addOrderBy('cnt', False)
264264
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])
266266

267267
request = QgsFeatureRequest().addOrderBy('name')
268268
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])
270270

271271
request = QgsFeatureRequest().addOrderBy('name', True, True)
272272
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'])
274274

275275
request = QgsFeatureRequest().addOrderBy('name', False)
276276
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'])
278278

279279
request = QgsFeatureRequest().addOrderBy('name', False, False)
280280
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])
282282

283283
# Case sensitivity
284284
request = QgsFeatureRequest().addOrderBy('name2')
285285
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'])
287287

288288
# Combination with LIMIT
289289
request = QgsFeatureRequest().addOrderBy('pk', False).setLimit(2)
290290
values = [f['pk'] for f in self.provider.getFeatures(request)]
291-
self.assertEquals(values, [5, 4])
291+
self.assertEqual(values, [5, 4])
292292

293293
# A slightly more complex expression
294294
request = QgsFeatureRequest().addOrderBy('pk*2', False)
295295
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])
297297

298298
# Order reversing expression
299299
request = QgsFeatureRequest().addOrderBy('pk*-1', False)
300300
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])
302302

303303
# Type dependent expression
304304
request = QgsFeatureRequest().addOrderBy('num_char*2', False)
305305
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])
307307

308308
# Order by guaranteed to fail
309309
request = QgsFeatureRequest().addOrderBy('not a valid expression*', False)
310310
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]))
312312

313313
# Multiple order bys and boolean
314314
request = QgsFeatureRequest().addOrderBy('pk > 2').addOrderBy('pk', False)
315315
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])
317317

318318
# Multiple order bys, one bad, and a limit
319319
request = QgsFeatureRequest().addOrderBy('pk', False).addOrderBy('not a valid expression*', False).setLimit(2)
320320
values = [f['pk'] for f in self.provider.getFeatures(request)]
321-
self.assertEquals(values, [5, 4])
321+
self.assertEqual(values, [5, 4])
322322

323323
# Bad expression first
324324
request = QgsFeatureRequest().addOrderBy('not a valid expression*', False).addOrderBy('pk', False).setLimit(2)
325325
values = [f['pk'] for f in self.provider.getFeatures(request)]
326-
self.assertEquals(values, [5, 4])
326+
self.assertEqual(values, [5, 4])
327327

328328
# Combination with subset of attributes
329329
request = QgsFeatureRequest().addOrderBy('num_char', False).setSubsetOfAttributes(['pk'], self.vl.fields())
330330
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])
332332

333333
def testGetFeaturesFidTests(self):
334334
fids = [f.id() for f in self.provider.getFeatures()]

‎tests/src/python/test_provider_shapefile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ def testRepack(self):
121121

122122
ids = [f.id() for f in vl.getFeatures(QgsFeatureRequest().setFilterExpression('pk=1'))]
123123
vl.setSelectedFeatures(ids)
124-
self.assertEquals(vl.selectedFeaturesIds(), ids)
125-
self.assertEquals(vl.pendingFeatureCount(), 5)
124+
self.assertEqual(vl.selectedFeaturesIds(), ids)
125+
self.assertEqual(vl.pendingFeatureCount(), 5)
126126
self.assertTrue(vl.startEditing())
127127
self.assertTrue(vl.deleteFeature(3))
128128
self.assertTrue(vl.commitChanges())

0 commit comments

Comments
 (0)