Skip to content

Commit 50c7970

Browse files
m-kuhnm-kuhn
committed
Use unittest assertXXX methods
1 parent 0e96ef3 commit 50c7970

File tree

1 file changed

+43
-44
lines changed

1 file changed

+43
-44
lines changed

‎tests/src/python/test_qgsvectorfilewriter.py

+43-44
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ def testWrite(self):
7373
'test',
7474
'memory')
7575

76-
assert self.mMemoryLayer is not None, 'Provider not initialized'
76+
self.assertIsNotNone(self.mMemoryLayer, 'Provider not initialized')
7777
myProvider = self.mMemoryLayer.dataProvider()
78-
assert myProvider is not None
78+
self.assertIsNotNone(myProvider)
7979

8080
ft = QgsFeature()
8181
ft.setGeometry(QgsGeometry.fromPoint(QgsPoint(10, 10)))
8282
ft.setAttributes(['Johny', 20, 0.3])
8383
myResult, myFeatures = myProvider.addFeatures([ft])
84-
assert myResult
85-
assert len(myFeatures) > 0
84+
self.assertTrue(myResult)
85+
self.assertTrue(myFeatures)
8686

8787
writeShape(self.mMemoryLayer, 'writetest.shp')
8888

@@ -94,17 +94,16 @@ def testDateTimeWriteShapefile(self):
9494
'test',
9595
'memory')
9696

97-
assert ml is not None, 'Provider not initialized'
98-
assert ml.isValid(), 'Source layer not valid'
97+
self.assertTrue(ml.isValid())
9998
provider = ml.dataProvider()
100-
assert provider is not None
99+
self.assertIsNotNone(provider)
101100

102101
ft = QgsFeature()
103102
ft.setGeometry(QgsGeometry.fromPoint(QgsPoint(10, 10)))
104103
ft.setAttributes([1, QDate(2014, 3, 5), QTime(13, 45, 22), QDateTime(QDate(2014, 3, 5), QTime(13, 45, 22))])
105104
res, features = provider.addFeatures([ft])
106-
assert res
107-
assert len(features) > 0
105+
self.assertTrue(res)
106+
self.assertTrue(features)
108107

109108
dest_file_name = os.path.join(str(QDir.tempPath()), 'datetime.shp')
110109
crs = QgsCoordinateReferenceSystem()
@@ -130,15 +129,15 @@ def testDateTimeWriteShapefile(self):
130129
f = next(created_layer.getFeatures(QgsFeatureRequest()))
131130

132131
date_idx = created_layer.fieldNameIndex('date_f')
133-
assert isinstance(f.attributes()[date_idx], QDate)
132+
self.assertIsInstance(f.attributes()[date_idx], QDate)
134133
self.assertEqual(f.attributes()[date_idx], QDate(2014, 3, 5))
135134
time_idx = created_layer.fieldNameIndex('time_f')
136135
#shapefiles do not support time types
137-
assert isinstance(f.attributes()[time_idx], str)
136+
self.assertIsInstance(f.attributes()[time_idx], str)
138137
self.assertEqual(f.attributes()[time_idx], '13:45:22')
139138
#shapefiles do not support datetime types
140139
datetime_idx = created_layer.fieldNameIndex('dt_f')
141-
assert isinstance(f.attributes()[datetime_idx], str)
140+
self.assertIsInstance(f.attributes()[datetime_idx], str)
142141
self.assertEqual(f.attributes()[datetime_idx], QDateTime(QDate(2014, 3, 5), QTime(13, 45, 22)).toString("yyyy/MM/dd hh:mm:ss.zzz"))
143142

144143
def testDateTimeWriteTabfile(self):
@@ -149,17 +148,17 @@ def testDateTimeWriteTabfile(self):
149148
'test',
150149
'memory')
151150

152-
assert ml is not None, 'Provider not initialized'
153-
assert ml.isValid(), 'Source layer not valid'
151+
self.assertIsNotNone(ml, 'Provider not initialized')
152+
self.assertTrue(ml.isValid(), 'Source layer not valid')
154153
provider = ml.dataProvider()
155-
assert provider is not None
154+
self.assertIsNotNone(provider)
156155

157156
ft = QgsFeature()
158157
ft.setGeometry(QgsGeometry.fromPoint(QgsPoint(10, 10)))
159158
ft.setAttributes([1, QDate(2014, 3, 5), QTime(13, 45, 22), QDateTime(QDate(2014, 3, 5), QTime(13, 45, 22))])
160159
res, features = provider.addFeatures([ft])
161-
assert res
162-
assert len(features) > 0
160+
self.assertTrue(res)
161+
self.assertTrue(features)
163162

164163
dest_file_name = os.path.join(str(QDir.tempPath()), 'datetime.tab')
165164
crs = QgsCoordinateReferenceSystem()
@@ -183,13 +182,13 @@ def testDateTimeWriteTabfile(self):
183182
f = next(created_layer.getFeatures(QgsFeatureRequest()))
184183

185184
date_idx = created_layer.fieldNameIndex('date_f')
186-
assert isinstance(f.attributes()[date_idx], QDate)
185+
self.assertIsInstance(f.attributes()[date_idx], QDate)
187186
self.assertEqual(f.attributes()[date_idx], QDate(2014, 3, 5))
188187
time_idx = created_layer.fieldNameIndex('time_f')
189-
assert isinstance(f.attributes()[time_idx], QTime)
188+
self.assertIsInstance(f.attributes()[time_idx], QTime)
190189
self.assertEqual(f.attributes()[time_idx], QTime(13, 45, 22))
191190
datetime_idx = created_layer.fieldNameIndex('dt_f')
192-
assert isinstance(f.attributes()[datetime_idx], QDateTime)
191+
self.assertIsInstance(f.attributes()[datetime_idx], QDateTime)
193192
self.assertEqual(f.attributes()[datetime_idx], QDateTime(QDate(2014, 3, 5), QTime(13, 45, 22)))
194193

195194
def testWriteShapefileWithZ(self):
@@ -201,17 +200,17 @@ def testWriteShapefileWithZ(self):
201200
'test',
202201
'memory')
203202

204-
assert ml is not None, 'Provider not initialized'
205-
assert ml.isValid(), 'Source layer not valid'
203+
self.assertIsNotNone(ml, 'Provider not initialized')
204+
self.assertTrue(ml.isValid(), 'Source layer not valid')
206205
provider = ml.dataProvider()
207-
assert provider is not None
206+
self.assertIsNotNone(provider)
208207

209208
ft = QgsFeature()
210209
ft.setGeometry(QgsGeometry.fromWkt('PointZ (1 2 3)'))
211210
ft.setAttributes([1])
212211
res, features = provider.addFeatures([ft])
213-
assert res
214-
assert len(features) > 0
212+
self.assertTrue(res)
213+
self.assertTrue(features)
215214

216215
# check with both a standard PointZ and 25d style Point25D type
217216
for t in [QgsWKBTypes.PointZ, QgsWKBTypes.Point25D]:
@@ -233,7 +232,7 @@ def testWriteShapefileWithZ(self):
233232
g = f.geometry()
234233
wkt = g.exportToWkt()
235234
expWkt = 'PointZ (1 2 3)'
236-
assert compareWkt(expWkt, wkt), "saving geometry with Z failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
235+
self.assertTrue(compareWkt(expWkt, wkt), "saving geometry with Z failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt))
237236

238237
#also try saving out the shapefile version again, as an extra test
239238
#this tests that saving a layer with z WITHOUT explicitly telling the writer to keep z values,
@@ -254,7 +253,7 @@ def testWriteShapefileWithZ(self):
254253
f = next(created_layer_from_shp.getFeatures(QgsFeatureRequest()))
255254
g = f.geometry()
256255
wkt = g.exportToWkt()
257-
assert compareWkt(expWkt, wkt), "saving geometry with Z failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
256+
self.assertTrue(compareWkt(expWkt, wkt), "saving geometry with Z failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt))
258257

259258
def testWriteShapefileWithMultiConversion(self):
260259
"""Check writing geometries to an ESRI shapefile with conversion to multi."""
@@ -263,17 +262,17 @@ def testWriteShapefileWithMultiConversion(self):
263262
'test',
264263
'memory')
265264

266-
assert ml is not None, 'Provider not initialized'
267-
assert ml.isValid(), 'Source layer not valid'
265+
self.assertIsNotNone(ml, 'Provider not initialized')
266+
self.assertTrue(ml.isValid(), 'Source layer not valid')
268267
provider = ml.dataProvider()
269-
assert provider is not None
268+
self.assertIsNotNone(provider)
270269

271270
ft = QgsFeature()
272271
ft.setGeometry(QgsGeometry.fromWkt('Point (1 2)'))
273272
ft.setAttributes([1])
274273
res, features = provider.addFeatures([ft])
275-
assert res
276-
assert len(features) > 0
274+
self.assertTrue(res)
275+
self.assertTrue(features)
277276

278277
dest_file_name = os.path.join(str(QDir.tempPath()), 'to_multi.shp')
279278
crs = QgsCoordinateReferenceSystem()
@@ -293,7 +292,7 @@ def testWriteShapefileWithMultiConversion(self):
293292
g = f.geometry()
294293
wkt = g.exportToWkt()
295294
expWkt = 'MultiPoint ((1 2))'
296-
assert compareWkt(expWkt, wkt), "saving geometry with multi conversion failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
295+
self.assertTrue(compareWkt(expWkt, wkt), "saving geometry with multi conversion failed: mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt))
297296

298297
def testWriteShapefileWithAttributeSubsets(self):
299298
"""Tests writing subsets of attributes to files."""
@@ -302,17 +301,17 @@ def testWriteShapefileWithAttributeSubsets(self):
302301
'test',
303302
'memory')
304303

305-
assert ml is not None, 'Provider not initialized'
306-
assert ml.isValid(), 'Source layer not valid'
304+
self.assertIsNotNone(ml, 'Provider not initialized')
305+
self.assertTrue(ml.isValid(), 'Source layer not valid')
307306
provider = ml.dataProvider()
308-
assert provider is not None
307+
self.assertIsNotNone(provider)
309308

310309
ft = QgsFeature()
311310
ft.setGeometry(QgsGeometry.fromWkt('Point (1 2)'))
312311
ft.setAttributes([1, 11, 12, 13])
313312
res, features = provider.addFeatures([ft])
314-
assert res
315-
assert len(features) > 0
313+
self.assertTrue(res)
314+
self.assertTrue(features)
316315

317316
#first write out with all attributes
318317
dest_file_name = os.path.join(str(QDir.tempPath()), 'all_attributes.shp')
@@ -376,7 +375,7 @@ def testWriteShapefileWithAttributeSubsets(self):
376375
g = f.geometry()
377376
wkt = g.exportToWkt()
378377
expWkt = 'Point (1 2)'
379-
assert compareWkt(expWkt, wkt), "geometry not saved correctly when saving without attributes : mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt)
378+
self.assertTrue(compareWkt(expWkt, wkt), "geometry not saved correctly when saving without attributes : mismatch Expected:\n%s\nGot:\n%s\n" % (expWkt, wkt))
380379
self.assertEqual(f['FID'], 0)
381380

382381
def testValueConverter(self):
@@ -386,17 +385,17 @@ def testValueConverter(self):
386385
'test',
387386
'memory')
388387

389-
assert ml is not None, 'Provider not initialized'
390-
assert ml.isValid(), 'Source layer not valid'
388+
self.assertIsNotNone(ml, 'Provider not initialized')
389+
self.assertTrue(ml.isValid(), 'Source layer not valid')
391390
provider = ml.dataProvider()
392-
assert provider is not None
391+
self.assertIsNotNone(provider)
393392
self.assertEqual(ml.fields().count(), 3)
394393

395394
ft = QgsFeature()
396395
ft.setAttributes([1, 'ignored', 3])
397396
res, features = provider.addFeatures([ft])
398-
assert res
399-
assert len(features) > 0
397+
self.assertTrue(res)
398+
self.assertTrue(features)
400399

401400
dest_file_name = os.path.join(str(QDir.tempPath()), 'value_converter.shp')
402401
converter = TestFieldValueConverter(ml)

0 commit comments

Comments
 (0)