sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-27 00:07:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Tests] Fix PyQgsDelimitedTextProvider on QT6

Browse Source
This commit is contained in:
Even Rouault 2025-05-17 01:29:32 +02:00
parent b827fd1448
commit 4aaa7050c4
No known key found for this signature in database
GPG Key ID: 33EBBFC47B3DD87D
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/src/python/test_qgsdelimitedtextprovider.py
View File

@ -264,7 +264,9 @@ class TestQgsDelimitedTextProviderOther(QgisTestCase):
for field in f.fields(): for field in f.fields():
fields.append(str(field.name())) fields.append(str(field.name()))
fieldTypes.append(str(field.typeName())) fieldTypes.append(str(field.typeName()))
fielddata = {name: str(f[name]) for name in fields} fielddata = {
name: str(f[name]) if f[name] != NULL else "NULL" for name in fields
}
g = f.geometry() g = f.geometry()
if not g.isNull(): if not g.isNull():
fielddata[geomkey] = str(g.asWkt()) fielddata[geomkey] = str(g.asWkt())

64
tests/src/python/test_qgsdelimitedtextprovider_wanted.py
View File

@ -1209,56 +1209,56 @@ def test_027_filter_attributes():
wanted["geometryType"] = 4 wanted["geometryType"] = 4
wanted["data"] = { wanted["data"] = {
2: { 2: {
"id": "None", "id": "NULL",
"description": "Basic unquoted record", "description": "Basic unquoted record",
"data": "None", "data": "NULL",
"info": "Some info", "info": "Some info",
"field_5": "None", "field_5": "NULL",
"#fid": 2, "#fid": 2,
"#geometry": "None", "#geometry": "None",
}, },
3: { 3: {
"id": "None", "id": "NULL",
"description": "Quoted field", "description": "Quoted field",
"data": "None", "data": "NULL",
"info": "Unquoted", "info": "Unquoted",
"field_5": "None", "field_5": "NULL",
"#fid": 3, "#fid": 3,
"#geometry": "None", "#geometry": "None",
}, },
4: { 4: {
"id": "None", "id": "NULL",
"description": "Escaped quotes", "description": "Escaped quotes",
"data": "None", "data": "NULL",
"info": "Unquoted", "info": "Unquoted",
"field_5": "None", "field_5": "NULL",
"#fid": 4, "#fid": 4,
"#geometry": "None", "#geometry": "None",
}, },
5: { 5: {
"id": "None", "id": "NULL",
"description": "Quoted newlines", "description": "Quoted newlines",
"data": "None", "data": "NULL",
"info": "No data", "info": "No data",
"field_5": "None", "field_5": "NULL",
"#fid": 5, "#fid": 5,
"#geometry": "None", "#geometry": "None",
}, },
9: { 9: {
"id": "None", "id": "NULL",
"description": "Extra fields", "description": "Extra fields",
"data": "None", "data": "NULL",
"info": "info", "info": "info",
"field_5": "None", "field_5": "NULL",
"#fid": 9, "#fid": 9,
"#geometry": "None", "#geometry": "None",
}, },
10: { 10: {
"id": "None", "id": "NULL",
"description": "Missing fields", "description": "Missing fields",
"data": "None", "data": "NULL",
"info": "NULL", "info": "NULL",
"field_5": "None", "field_5": "NULL",
"#fid": 10, "#fid": 10,
"#geometry": "None", "#geometry": "None",
}, },
@ -1272,38 +1272,38 @@ def test_027_filter_attributes():
"#geometry": "None", "#geometry": "None",
}, },
2009: { 2009: {
"id": "None", "id": "NULL",
"description": "Extra fields", "description": "Extra fields",
"data": "None", "data": "NULL",
"info": "info", "info": "info",
"field_5": "None", "field_5": "NULL",
"#fid": 9, "#fid": 9,
"#geometry": "None", "#geometry": "None",
}, },
3009: { 3009: {
"id": "None", "id": "NULL",
"description": "Extra fields", "description": "Extra fields",
"data": "None", "data": "NULL",
"info": "info", "info": "info",
"field_5": "None", "field_5": "NULL",
"#fid": 9, "#fid": 9,
"#geometry": "None", "#geometry": "None",
}, },
4009: { 4009: {
"id": "None", "id": "NULL",
"description": "Extra fields", "description": "Extra fields",
"data": "None", "data": "NULL",
"info": "info", "info": "info",
"field_5": "None", "field_5": "NULL",
"#fid": 9, "#fid": 9,
"#geometry": "None", "#geometry": "None",
}, },
5009: { 5009: {
"id": "None", "id": "NULL",
"description": "None", "description": "NULL",
"data": "None", "data": "NULL",
"info": "None", "info": "NULL",
"field_5": "None", "field_5": "NULL",
"#fid": 9, "#fid": 9,
"#geometry": "None", "#geometry": "None",
}, },