Skip to content

Commit 6ef2f5d

Browse files
committed
extended the test for memory layers
The test now includes all geometry types including NoGeometry.
1 parent 3977958 commit 6ef2f5d

File tree

1 file changed

+20
-10
lines changed

1 file changed

+20
-10
lines changed

tests/src/python/test_provider_memory.py

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,30 @@ def setUpClass(cls):
6969
def tearDownClass(cls):
7070
"""Run after all tests"""
7171

72-
def testPointCtor(self):
73-
layer = QgsVectorLayer("Point", "test", "memory")
74-
assert layer.isValid(), "Failed to create valid point memory layer"
72+
def testCtors(self):
73+
testVectors = ["Point", "LineString", "Polygon", "MultiPoint", "MultiLineString", "MultiPolygon", "None"]
74+
for v in testVectors:
75+
layer = QgsVectorLayer(v, "test", "memory")
76+
assert layer.isValid(), "Failed to create valid %s memory layer" % (v)
7577

7678
def testLayerGeometry(self):
77-
layer = QgsVectorLayer("Point", "test", "memory")
79+
testVectors = [("Point", QGis.Point, QGis.WKBPoint),
80+
("LineString", QGis.Line, QGis.WKBLineString),
81+
("Polygon", QGis.Polygon, QGis.WKBPolygon),
82+
("MultiPoint", QGis.Point, QGis.WKBMultiPoint),
83+
("MultiLineString", QGis.Line, QGis.WKBMultiLineString),
84+
("MultiPolygon", QGis.Polygon, QGis.WKBMultiPolygon),
85+
("None", QGis.NoGeometry, QGis.WKBNoGeometry)]
86+
for v in testVectors:
87+
layer = QgsVectorLayer(v[0], "test", "memory")
7888

79-
myMessage = ('Expected: %s\nGot: %s\n' %
80-
(QGis.Point, layer.geometryType()))
81-
assert layer.geometryType() == QGis.Point, myMessage
89+
myMessage = ('Expected: %s\nGot: %s\n' %
90+
(v[1], layer.geometryType()))
91+
assert layer.geometryType() == v[1], myMessage
8292

83-
myMessage = ('Expected: %s\nGot: %s\n' %
84-
(QGis.WKBPoint, layer.wkbType()))
85-
assert layer.wkbType() == QGis.WKBPoint, myMessage
93+
myMessage = ('Expected: %s\nGot: %s\n' %
94+
(v[2], layer.wkbType()))
95+
assert layer.wkbType() == v[2], myMessage
8696

8797
def testAddFeatures(self):
8898
layer = QgsVectorLayer("Point", "test", "memory")

0 commit comments

Comments
 (0)