Minor updates to the tests..

Author: Axel Hörteborn

support_scripts/add_field.py

@@ -173,9 +173,11 @@ def remove_field(self: Self) -> None:
                             stop_removing = True
                 if stop_removing:
                     continue
-                self.db.execute_sql(
+                res = self.db.execute_sql(
                     "DELETE FROM fields WHERE field_name = %s",
-                    params=(field_name,))
+                    params=(field_name,), return_failure=True)
+                if not isinstance(res, list) or not res[0]:
+                    return False
                 self.parent.dock_widget.LWFields.takeItem(j)
                 j -= 1
 

tests/test_field.py

@@ -9,6 +9,7 @@
 # @pytest.mark.depends(scope='session', name='add_field')
 @pytest.mark.parametrize('name, coord_input', test_data)
 def test_add_field(gdf: GeoDataFarm, name, coord_input):
+    gdf.db.execute_sql("DELETE FROM fields WHERE field_name = %s", params=(name,))
     gdf.add_field.clicked_define_field()
     gdf.add_field.AFD.LEFieldName.setText(name)
     feat = QgsFeature(gdf.add_field.field.fields()) # Create the features

tests/test_fields_isoxml.py

@@ -10,6 +10,7 @@
 from . import gdf
 
 def test_import_par_field_from_isoxml(gdf):
+    gdf.db.execute_sql("DELETE FROM fields WHERE field_name = 'test_iso_added_field'")
     W = FindIsoField(gdf, test_path='./tests/test_data/TASKDATA3/TASKDATA.XML')
     W.zoom_level = 10
     W.fifw.PBAddFolder.click()
@@ -24,6 +25,7 @@ def test_import_par_field_from_isoxml(gdf):
     assert field_added
 
 def test_import_task_field_from_isoxml(gdf):
+    gdf.db.execute_sql("DELETE FROM fields WHERE field_name = 'test_iso_added_field2'")
     W = FindIsoField(gdf, test_path='./tests/test_data/TASKDATA2/TASKDATA.XML')
     W.fifw.PBAddFolder.click()
     W.fifw.PBGetAdditionalData.click()
@@ -69,6 +71,7 @@ def test_polygon_coordinates_consistency(find_iso_field: FindIsoField):
     assert original_polygon.equals_exact(saved_polygon, tolerance=1e-7), "The polygon coordinates should remain consistent before and after saving."
 
 def test_import_grid_task_field_from_isoxml(gdf):
+    gdf.db.execute_sql("DELETE FROM fields WHERE field_name = 'test_iso_added_field3'")
     W = FindIsoField(gdf, test_path='./tests/test_data/TASKDATA4/TASKDATA.XML')
     W.zoom_level = 10
     W.fifw.PBAddFolder.click()

tests/test_fields_shapefile.py

@@ -6,6 +6,7 @@
 from . import gdf
 
 def test_import_field_from_shapefile(gdf):
+    gdf.db.execute_sql("DELETE FROM fields WHERE field_name = 'test_shape_added_field'")
     gdf.add_shape_field()
     W = gdf.find_shape_field
     W.path='./tests/test_data/tabbehus.shp'
@@ -37,7 +38,6 @@ def test_polygon_coordinates_consistency_shapefile(gdf):
     item = W.fsfw.LWFields.item(0)
     W.on_item_clicked(item)
     original_wkt = W.current_polygon
-    W.save_field()
     saved_wkt = W.current_polygon
     original_polygon = wkt.loads(original_wkt)
     saved_polygon = wkt.loads(saved_wkt)

tests/test_xclose.py

@@ -36,8 +36,18 @@ def test_remove_iso_dataset(gdf: GeoDataFarm):
 def test_remove_xfield(gdf: GeoDataFarm, field_name):
     gdf.add_field.clicked_define_field()
     items = [gdf.dock_widget.LWFields.item(i).text() for i in range(gdf.dock_widget.LWFields.count())]
+    matched = [text for text in items if text == field_name]
+    print(f"\n[{field_name}] LWFields before removal: {items}")
+    print(f"[{field_name}] Matched (will be checked): {matched}")
     for i, text in enumerate(items):
-        if field_name in text:
+        if text == field_name:
             gdf.dock_widget.LWFields.item(i).setCheckState(_check_state('Checked'))
     gdf.add_field.remove_field()
-    assert field_name not in [gdf.dock_widget.LWFields.item(i).text() for i in range(gdf.dock_widget.LWFields.count())]
+    remaining_lw = [gdf.dock_widget.LWFields.item(i).text() for i in range(gdf.dock_widget.LWFields.count())]
+    print(f"[{field_name}] LWFields after removal: {remaining_lw}")
+    remaining_db = gdf.db.execute_and_return(
+        "SELECT COUNT(*) FROM fields WHERE field_name = %s", params=(field_name,))
+    print(f"[{field_name}] DB count after removal: {remaining_db}")
+    assert field_name not in remaining_lw, f"Field {field_name!r} still in LWFields after removal: {remaining_lw}"
+    assert isinstance(remaining_db, list) and remaining_db[0][0] == 0, (
+        f"Field {field_name!r} still present in DB after removal")