Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 5, 2021
1 parent 69aa279 commit ba043b6
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions tests/src/python/test_provider_shapefile.py
Expand Up @@ -843,8 +843,8 @@ def testShzSupport(self):

# Check DataItem
registry = QgsApplication.dataItemProviderRegistry()
ogrprovider = next(provider for provider in registry.providers() if provider.name() == 'OGR')
item = ogrprovider.createDataItem(tmpfile, None)
files_provider = next(provider for provider in registry.providers() if provider.name() == 'files')
item = files_provider.createDataItem(tmpfile, None)
self.assertTrue(item.uri().endswith('testShzSupport.shz'))

def testShpZipSupport(self):
Expand Down Expand Up @@ -899,18 +899,14 @@ def testShpZipSupport(self):

# Check DataItem
registry = QgsApplication.dataItemProviderRegistry()
ogrprovider = next(provider for provider in registry.providers() if provider.name() == 'OGR')
item = ogrprovider.createDataItem(tmpfile, None)
files_provider = next(provider for provider in registry.providers() if provider.name() == 'files')
item = files_provider.createDataItem(tmpfile, None)
children = item.createChildren()
self.assertEqual(len(children), 2)
uris = sorted([children[i].uri() for i in range(2)])
self.assertIn('testShpZipSupport.shp.zip|layername=layer1', uris[0])
self.assertIn('testShpZipSupport.shp.zip|layername=layer2', uris[1])

gdalprovider = next(provider for provider in registry.providers() if provider.name() == 'GDAL')
item = gdalprovider.createDataItem(tmpfile, None)
assert not item

def testWriteShapefileWithSingleConversion(self):
"""Check writing geometries from a POLYGON ESRI shapefile does not
convert to multi when "forceSinglePartGeometryType" options is TRUE
Expand Down

0 comments on commit ba043b6

Please sign in to comment.