From 4aaa7050c4315d145648b4ec7a554ae3f0e57f4d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 17 May 2025 01:29:32 +0200
Subject: [PATCH] [Tests] Fix PyQgsDelimitedTextProvider on QT6

---
 .../python/test_qgsdelimitedtextprovider.py   |  4 +-
 .../test_qgsdelimitedtextprovider_wanted.py   | 64 +++++++++----------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/tests/src/python/test_qgsdelimitedtextprovider.py b/tests/src/python/test_qgsdelimitedtextprovider.py
index 6c001a09f94..306ed6b45f1 100644
--- a/tests/src/python/test_qgsdelimitedtextprovider.py
+++ b/tests/src/python/test_qgsdelimitedtextprovider.py
@@ -264,7 +264,9 @@ class TestQgsDelimitedTextProviderOther(QgisTestCase):
                 for field in f.fields():
                     fields.append(str(field.name()))
                     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()
             if not g.isNull():
                 fielddata[geomkey] = str(g.asWkt())
diff --git a/tests/src/python/test_qgsdelimitedtextprovider_wanted.py b/tests/src/python/test_qgsdelimitedtextprovider_wanted.py
index 978c8447d3a..72f2664e02b 100644
--- a/tests/src/python/test_qgsdelimitedtextprovider_wanted.py
+++ b/tests/src/python/test_qgsdelimitedtextprovider_wanted.py
@@ -1209,56 +1209,56 @@ def test_027_filter_attributes():
     wanted["geometryType"] = 4
     wanted["data"] = {
         2: {
-            "id": "None",
+            "id": "NULL",
             "description": "Basic unquoted record",
-            "data": "None",
+            "data": "NULL",
             "info": "Some info",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 2,
             "#geometry": "None",
         },
         3: {
-            "id": "None",
+            "id": "NULL",
             "description": "Quoted field",
-            "data": "None",
+            "data": "NULL",
             "info": "Unquoted",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 3,
             "#geometry": "None",
         },
         4: {
-            "id": "None",
+            "id": "NULL",
             "description": "Escaped quotes",
-            "data": "None",
+            "data": "NULL",
             "info": "Unquoted",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 4,
             "#geometry": "None",
         },
         5: {
-            "id": "None",
+            "id": "NULL",
             "description": "Quoted newlines",
-            "data": "None",
+            "data": "NULL",
             "info": "No data",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 5,
             "#geometry": "None",
         },
         9: {
-            "id": "None",
+            "id": "NULL",
             "description": "Extra fields",
-            "data": "None",
+            "data": "NULL",
             "info": "info",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 9,
             "#geometry": "None",
         },
         10: {
-            "id": "None",
+            "id": "NULL",
             "description": "Missing fields",
-            "data": "None",
+            "data": "NULL",
             "info": "NULL",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 10,
             "#geometry": "None",
         },
@@ -1272,38 +1272,38 @@ def test_027_filter_attributes():
             "#geometry": "None",
         },
         2009: {
-            "id": "None",
+            "id": "NULL",
             "description": "Extra fields",
-            "data": "None",
+            "data": "NULL",
             "info": "info",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 9,
             "#geometry": "None",
         },
         3009: {
-            "id": "None",
+            "id": "NULL",
             "description": "Extra fields",
-            "data": "None",
+            "data": "NULL",
             "info": "info",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 9,
             "#geometry": "None",
         },
         4009: {
-            "id": "None",
+            "id": "NULL",
             "description": "Extra fields",
-            "data": "None",
+            "data": "NULL",
             "info": "info",
-            "field_5": "None",
+            "field_5": "NULL",
             "#fid": 9,
             "#geometry": "None",
         },
         5009: {
-            "id": "None",
-            "description": "None",
-            "data": "None",
-            "info": "None",
-            "field_5": "None",
+            "id": "NULL",
+            "description": "NULL",
+            "data": "NULL",
+            "info": "NULL",
+            "field_5": "NULL",
             "#fid": 9,
             "#geometry": "None",
         },