Fix existing grondmonster tests.

DOV-Vlaanderen · Dec 21, 2023 · ce91e96 · ce91e96
1 parent aa52d89
commit ce91e96
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/tests/test_search_grondmonster.py b/tests/test_search_grondmonster.py
@@ -30,10 +30,12 @@ class TestGrondmonsterSearch(AbstractTestSearch):
     wfs_field = 'boornummer'
     xml_field = 'astm_naam'
 
-    valid_returnfields = ReturnFieldList.from_field_names('pkey_grondmonster', 'boornummer')
+    valid_returnfields = ReturnFieldList.from_field_names(
+        'pkey_grondmonster', 'boornummer')
     valid_returnfields_subtype = ReturnFieldList.from_field_names(
         'pkey_grondmonster', 'boornummer', 'diameter')
-    valid_returnfields_extra = ReturnFieldList.from_field_names('pkey_grondmonster', 'korrelverdeling')
+    valid_returnfields_extra = ReturnFieldList.from_field_names(
+        'pkey_grondmonster', 'korrelverdeling')
 
     df_default_columns = [
         'pkey_grondmonster', 'naam', 'pkey_boring', 'boornummer',
@@ -70,7 +72,7 @@ def test_search_xmlresolving(self, mp_get_schema,
                            'methode'))
 
         assert df.humusgehalte[0] == 4.7
-        assert df.methode[0] == 'ZEEFPROEF'
+        assert df.methode[0] == 'Korrelverdeling d.m.v. hydrometer/areometer'
 
     def test_issue_285(self, mp_get_schema,
                        mp_remote_describefeaturetype,

diff --git a/tests/test_types_grondmonster.py b/tests/test_types_grondmonster.py
@@ -25,9 +25,9 @@ class TestGrondmonster(AbstractTestTypes):
         'grondsoort_bggg', 'humusgehalte', 'kalkgehalte',
         'uitrolgrens', 'vloeigrens', 'glauconiet_totaal',
         'korrelvolumemassa', 'volumemassa', 'watergehalte',
-        'diameter', 'fractie', 'methode']
+        'methode', 'diameter', 'fractie']
     field_names_subtypes = [
-        'diepte_methode_van', 'diepte_methode_tot', 'boormethode']
+        'methode', 'diameter', 'fractie']
     field_names_nosubtypes = [
         'pkey_grondmonster', 'naam', 'pkey_boring', 'boornummer',
         'datum', 'x', 'y', 'gemeente', 'diepte_van_m', 'diepte_tot_m',
@@ -36,7 +36,9 @@ class TestGrondmonster(AbstractTestTypes):
         'uitrolgrens', 'vloeigrens', 'glauconiet_totaal',
         'korrelvolumemassa', 'volumemassa', 'watergehalte']
 
-    valid_returnfields = ReturnFieldList.from_field_names('pkey_grondmonster', 'diepte_tot_m')
-    valid_returnfields_subtype = ReturnFieldList.from_field_names('diameter', 'fractie', 'methode')
+    valid_returnfields = ReturnFieldList.from_field_names(
+        'pkey_grondmonster', 'diepte_tot_m')
+    valid_returnfields_subtype = ReturnFieldList.from_field_names(
+        'diameter', 'fractie', 'methode')
 
     inexistent_field = 'onbestaand'