Skip to content

Commit 8abf6dc

Browse files
committed
Update tests for OGR getLayers now returning also the geometry column name
1 parent 274cc6c commit 8abf6dc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tests/src/python/test_provider_ogr.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def testMixOfPolygonCurvePolygon(self):
112112
vl = QgsVectorLayer('{}|layerid=0'.format(datasource), 'test', 'ogr')
113113
self.assertTrue(vl.isValid())
114114
self.assertEqual(len(vl.dataProvider().subLayers()), 1)
115-
self.assertEqual(vl.dataProvider().subLayers()[0], '0:testMixOfPolygonCurvePolygon:4:CurvePolygon')
115+
self.assertEqual(vl.dataProvider().subLayers()[0], '0:testMixOfPolygonCurvePolygon:4:CurvePolygon:')
116116

117117
def testMixOfLineStringCompoundCurve(self):
118118

@@ -128,7 +128,7 @@ def testMixOfLineStringCompoundCurve(self):
128128
vl = QgsVectorLayer('{}|layerid=0'.format(datasource), 'test', 'ogr')
129129
self.assertTrue(vl.isValid())
130130
self.assertEqual(len(vl.dataProvider().subLayers()), 1)
131-
self.assertEqual(vl.dataProvider().subLayers()[0], '0:testMixOfLineStringCompoundCurve:5:CompoundCurve')
131+
self.assertEqual(vl.dataProvider().subLayers()[0], '0:testMixOfLineStringCompoundCurve:5:CompoundCurve:')
132132

133133
def testGpxElevation(self):
134134
# GPX without elevation data

tests/src/python/test_provider_ogr_gpkg.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def testCurveGeometryType(self):
8484
ds = None
8585

8686
vl = QgsVectorLayer('{}'.format(tmpfile), 'test', 'ogr')
87-
self.assertEqual(vl.dataProvider().subLayers(), ['0:test:0:CurvePolygon'])
87+
self.assertEqual(vl.dataProvider().subLayers(), ['0:test:0:CurvePolygon:geom'])
8888
f = QgsFeature()
8989
f.setGeometry(QgsGeometry.fromWkt('POLYGON ((0 0,0 1,1 1,0 0))'))
9090
vl.dataProvider().addFeatures([f])

0 commit comments

Comments
 (0)