Skip to content

Commit 2f0f6a9

Browse files
m-kuhnm-kuhn
committed
Use assertIsInstance instead of assertTrue(isinstance())
1 parent 0340320 commit 2f0f6a9

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

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

+22-22
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ def testScriptCode(self):
102102
parameter = ParameterBoolean('myName', 'myDescription')
103103
code = parameter.getAsScriptCode()
104104
result = getParameterFromString(code)
105-
self.assertTrue(isinstance(result, ParameterBoolean))
105+
self.assertIsInstance(result, ParameterBoolean)
106106
self.assertFalse(result.optional)
107107

108108
parameter.optional = True
109109
code = parameter.getAsScriptCode()
110110
result = getParameterFromString(code)
111-
self.assertTrue(isinstance(result, ParameterBoolean))
111+
self.assertIsInstance(result, ParameterBoolean)
112112
self.assertTrue(result.optional)
113113

114114

@@ -138,12 +138,12 @@ def testScriptCode(self):
138138
parameter = ParameterCrs('myName', 'myDescription')
139139
code = parameter.getAsScriptCode()
140140
result = getParameterFromString(code)
141-
self.assertTrue(isinstance(result, ParameterCrs))
141+
self.assertIsInstance(result, ParameterCrs)
142142

143143
parameter.optional = True
144144
code = parameter.getAsScriptCode()
145145
result = getParameterFromString(code)
146-
self.assertTrue(isinstance(result, ParameterCrs))
146+
self.assertIsInstance(result, ParameterCrs)
147147
self.assertTrue(result.optional)
148148

149149

@@ -192,12 +192,12 @@ def testScriptCode(self):
192192
parameter = ParameterExtent('myName', 'myDescription')
193193
code = parameter.getAsScriptCode()
194194
result = getParameterFromString(code)
195-
self.assertTrue(isinstance(result, ParameterExtent))
195+
self.assertIsInstance(result, ParameterExtent)
196196

197197
parameter.optional = True
198198
code = parameter.getAsScriptCode()
199199
result = getParameterFromString(code)
200-
self.assertTrue(isinstance(result, ParameterExtent))
200+
self.assertIsInstance(result, ParameterExtent)
201201
self.assertTrue(result.optional)
202202

203203

@@ -234,12 +234,12 @@ def testScriptCode(self):
234234
parameter = ParameterPoint('myName', 'myDescription')
235235
code = parameter.getAsScriptCode()
236236
result = getParameterFromString(code)
237-
self.assertTrue(isinstance(result, ParameterPoint))
237+
self.assertIsInstance(result, ParameterPoint)
238238

239239
parameter.optional = True
240240
code = parameter.getAsScriptCode()
241241
result = getParameterFromString(code)
242-
self.assertTrue(isinstance(result, ParameterPoint))
242+
self.assertIsInstance(result, ParameterPoint)
243243
self.assertTrue(result.optional)
244244

245245

@@ -354,12 +354,12 @@ def testScriptCode(self):
354354
parameter = ParameterFile('myName', 'myDescription')
355355
code = parameter.getAsScriptCode()
356356
result = getParameterFromString(code)
357-
self.assertTrue(isinstance(result, ParameterFile))
357+
self.assertIsInstance(result, ParameterFile)
358358

359359
parameter.optional = True
360360
code = parameter.getAsScriptCode()
361361
result = getParameterFromString(code)
362-
self.assertTrue(isinstance(result, ParameterFile))
362+
self.assertIsInstance(result, ParameterFile)
363363
self.assertTrue(result.optional)
364364

365365

@@ -476,12 +476,12 @@ def testScriptCode(self):
476476
parameter = ParameterMultipleInput('myName', 'myDescription')
477477
code = parameter.getAsScriptCode()
478478
result = getParameterFromString(code)
479-
self.assertTrue(isinstance(result, ParameterMultipleInput))
479+
self.assertIsInstance(result, ParameterMultipleInput)
480480

481481
parameter.optional = True
482482
code = parameter.getAsScriptCode()
483483
result = getParameterFromString(code)
484-
self.assertTrue(isinstance(result, ParameterMultipleInput))
484+
self.assertIsInstance(result, ParameterMultipleInput)
485485
self.assertTrue(result.optional)
486486

487487

@@ -542,12 +542,12 @@ def testScriptCode(self):
542542
parameter = ParameterNumber('myName', 'myDescription')
543543
code = parameter.getAsScriptCode()
544544
result = getParameterFromString(code)
545-
self.assertTrue(isinstance(result, ParameterNumber))
545+
self.assertIsInstance(result, ParameterNumber)
546546

547547
parameter.optional = True
548548
code = parameter.getAsScriptCode()
549549
result = getParameterFromString(code)
550-
self.assertTrue(isinstance(result, ParameterNumber))
550+
self.assertIsInstance(result, ParameterNumber)
551551
self.assertTrue(result.optional)
552552

553553

@@ -577,12 +577,12 @@ def testScriptCode(self):
577577
parameter = ParameterString('myName', 'myDescription', default='test')
578578
code = parameter.getAsScriptCode()
579579
result = getParameterFromString(code)
580-
self.assertTrue(isinstance(result, ParameterString))
580+
self.assertIsInstance(result, ParameterString)
581581

582582
parameter.optional = True
583583
code = parameter.getAsScriptCode()
584584
result = getParameterFromString(code)
585-
self.assertTrue(isinstance(result, ParameterString))
585+
self.assertIsInstance(result, ParameterString)
586586
self.assertTrue(result.optional)
587587

588588

@@ -612,12 +612,12 @@ def testScriptCode(self):
612612
parameter = ParameterExpression('myName', 'myDescription', default='test')
613613
code = parameter.getAsScriptCode()
614614
result = getParameterFromString(code)
615-
self.assertTrue(isinstance(result, ParameterExpression))
615+
self.assertIsInstance(result, ParameterExpression)
616616

617617
parameter.optional = True
618618
code = parameter.getAsScriptCode()
619619
result = getParameterFromString(code)
620-
self.assertTrue(isinstance(result, ParameterExpression))
620+
self.assertIsInstance(result, ParameterExpression)
621621
self.assertTrue(result.optional)
622622

623623

@@ -640,12 +640,12 @@ def testScriptCode(self):
640640
'myName', 'myDesc', parent_name)
641641
code = parameter.getAsScriptCode()
642642
result = getParameterFromString(code)
643-
self.assertTrue(isinstance(result, ParameterTableField))
643+
self.assertIsInstance(result, ParameterTableField)
644644

645645
parameter.optional = True
646646
code = parameter.getAsScriptCode()
647647
result = getParameterFromString(code)
648-
self.assertTrue(isinstance(result, ParameterTableField))
648+
self.assertIsInstance(result, ParameterTableField)
649649
self.assertTrue(result.optional)
650650

651651

@@ -656,12 +656,12 @@ def testScriptCode(self):
656656
'myName', 'myDesc')
657657
code = parameter.getAsScriptCode()
658658
result = getParameterFromString(code)
659-
self.assertTrue(isinstance(result, ParameterTable))
659+
self.assertIsInstance(result, ParameterTable)
660660

661661
parameter.optional = True
662662
code = parameter.getAsScriptCode()
663663
result = getParameterFromString(code)
664-
self.assertTrue(isinstance(result, ParameterTable))
664+
self.assertIsInstance(result, ParameterTable)
665665
self.assertTrue(result.optional)
666666

667667
if __name__ == '__main__':

‎tests/src/python/test_provider_oracle.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ def testDateTimeTypes(self):
9292
f = next(vl.getFeatures(QgsFeatureRequest()))
9393

9494
date_idx = vl.fields().lookupField('date_field')
95-
self.assertTrue(isinstance(f.attributes()[date_idx], QDate))
95+
self.assertIsInstance(f.attributes()[date_idx], QDate)
9696
self.assertEqual(f.attributes()[date_idx], QDate(2004, 3, 4))
9797
datetime_idx = vl.fields().lookupField('datetime_field')
98-
self.assertTrue(isinstance(f.attributes()[datetime_idx], QDateTime))
98+
self.assertIsInstance(f.attributes()[datetime_idx], QDateTime)
9999
self.assertEqual(f.attributes()[datetime_idx], QDateTime(
100100
QDate(2004, 3, 4), QTime(13, 41, 52)))
101101

‎tests/src/python/test_provider_postgres.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def partiallyCompiledFilters(self):
8787
# HERE GO THE PROVIDER SPECIFIC TESTS
8888
def testDefaultValue(self):
8989
self.provider.setProviderProperty(QgsDataProvider.EvaluateDefaultValues, True)
90-
self.assertTrue(isinstance(self.provider.defaultValue(0), int))
90+
self.assertIsInstance(self.provider.defaultValue(0), int)
9191
self.assertEqual(self.provider.defaultValue(1), NULL)
9292
self.assertEqual(self.provider.defaultValue(2), 'qgis')
9393
self.provider.setProviderProperty(QgsDataProvider.EvaluateDefaultValues, False)
@@ -110,13 +110,13 @@ def testDateTimeTypes(self):
110110
f = next(vl.getFeatures(QgsFeatureRequest()))
111111

112112
date_idx = vl.fields().lookupField('date_field')
113-
self.assertTrue(isinstance(f.attributes()[date_idx], QDate))
113+
self.assertIsInstance(f.attributes()[date_idx], QDate)
114114
self.assertEqual(f.attributes()[date_idx], QDate(2004, 3, 4))
115115
time_idx = vl.fields().lookupField('time_field')
116-
self.assertTrue(isinstance(f.attributes()[time_idx], QTime))
116+
self.assertIsInstance(f.attributes()[time_idx], QTime)
117117
self.assertEqual(f.attributes()[time_idx], QTime(13, 41, 52))
118118
datetime_idx = vl.fields().lookupField('datetime_field')
119-
self.assertTrue(isinstance(f.attributes()[datetime_idx], QDateTime))
119+
self.assertIsInstance(f.attributes()[datetime_idx], QDateTime)
120120
self.assertEqual(f.attributes()[datetime_idx], QDateTime(QDate(2004, 3, 4), QTime(13, 41, 52)))
121121

122122
def testQueryLayers(self):
@@ -370,7 +370,7 @@ def testHstore(self):
370370
f = next(vl.getFeatures(QgsFeatureRequest()))
371371

372372
value_idx = vl.fields().lookupField('value')
373-
self.assertTrue(isinstance(f.attributes()[value_idx], dict))
373+
self.assertIsInstance(f.attributes()[value_idx], dict)
374374
self.assertEqual(f.attributes()[value_idx], {'a': 'b', '1': '2'})
375375

376376
new_f = QgsFeature(vl.fields())
@@ -401,7 +401,7 @@ def testStringArray(self):
401401
f = next(vl.getFeatures(QgsFeatureRequest()))
402402

403403
value_idx = vl.fields().lookupField('value')
404-
self.assertTrue(isinstance(f.attributes()[value_idx], list))
404+
self.assertIsInstance(f.attributes()[value_idx], list)
405405
self.assertEqual(f.attributes()[value_idx], ['a', 'b', 'c'])
406406

407407
new_f = QgsFeature(vl.fields())
@@ -432,7 +432,7 @@ def testIntArray(self):
432432
f = next(vl.getFeatures(QgsFeatureRequest()))
433433

434434
value_idx = vl.fields().lookupField('value')
435-
self.assertTrue(isinstance(f.attributes()[value_idx], list))
435+
self.assertIsInstance(f.attributes()[value_idx], list)
436436
self.assertEqual(f.attributes()[value_idx], [1, 2, -5])
437437

438438
def testDoubleArray(self):
@@ -446,7 +446,7 @@ def testDoubleArray(self):
446446
f = next(vl.getFeatures(QgsFeatureRequest()))
447447

448448
value_idx = vl.fields().lookupField('value')
449-
self.assertTrue(isinstance(f.attributes()[value_idx], list))
449+
self.assertIsInstance(f.attributes()[value_idx], list)
450450
self.assertEqual(f.attributes()[value_idx], [1.1, 2, -5.12345])
451451

452452
def testNotNullConstraint(self):

0 commit comments

Comments
 (0)