parametrize tests

Author: garobrik

soil_id/tests/global/test_global.py

@@ -28,23 +28,23 @@
 ]
 
 @pytest.mark.skip
-def test_soil_location():
+@pytest.mark.parametrize("location", test_locations)
+def test_soil_location(location):
     with get_datastore_connection() as connection:
-        for item in test_locations:
-            logging.info(f"Testing {item['lon']}, {item['lat']}")
-            start_time = time.perf_counter()
-            list_soils_result = list_soils_global(connection, item["lon"], item["lat"])
-            logging.info(f"...time: {(time.perf_counter()-start_time):.2f}s")
-            rank_soils_result = rank_soils_global(
-                connection,
-                item["lon"],
-                item["lat"],
-                list_output_data=list_soils_result,
-                soilHorizon=["Loam"],
-                horizonDepth=[15],
-                rfvDepth=[20],
-                lab_Color=[[41.23035939, 3.623018224, 13.27654356]],
-                bedrock=None,
-                cracks=None,
-            )
-            sg_soils_result = sg_list(item["lon"], item["lat"])
+        logging.info(f"Testing {location['lon']}, {location['lat']}")
+        start_time = time.perf_counter()
+        list_soils_result = list_soils_global(connection, location["lon"], location["lat"])
+        logging.info(f"...time: {(time.perf_counter()-start_time):.2f}s")
+        rank_soils_global(
+            connection,
+            location["lon"],
+            location["lat"],
+            list_output_data=list_soils_result,
+            soilHorizon=["Loam"],
+            horizonDepth=[15],
+            rfvDepth=[20],
+            lab_Color=[[41.23035939, 3.623018224, 13.27654356]],
+            bedrock=None,
+            cracks=None,
+        )
+        sg_list(location["lon"], location["lat"])

soil_id/tests/us/test_us.py

@@ -16,6 +16,8 @@
 import logging
 import time
 
+import pytest
+
 from soil_id.us_soil import list_soils, rank_soils
 
 test_locations = [
@@ -39,7 +41,8 @@
 ]
 
 
-def test_soil_location():
+@pytest.mark.parametrize("location", test_locations)
+def test_soil_location(location):
     # Dummy Soil Profile Data (replicating the structure provided)
     soilHorizon = ["LOAM"] * 7
     horizonDepth = [1, 10, 20, 50, 70, 100, 120]
@@ -50,24 +53,23 @@ def test_soil_location():
     pElev = None
     cracks = False
 
-    for item in test_locations:
-        logging.info(f"Testing {item['lon']}, {item['lat']}")
-        start_time = time.perf_counter()
-        list_soils_result = list_soils(item["lon"], item["lat"])
-        logging.info(f"...time: {(time.perf_counter() - start_time):.2f}s")
-        rank_soils(
-            item["lon"],
-            item["lat"],
-            list_soils_result,
-            soilHorizon,
-            horizonDepth,
-            rfvDepth,
-            lab_Color,
-            pSlope,
-            pElev,
-            bedrock,
-            cracks,
-        )
+    logging.info(f"Testing {location['lon']}, {location['lat']}")
+    start_time = time.perf_counter()
+    list_soils_result = list_soils(location["lon"], location["lat"])
+    logging.info(f"...time: {(time.perf_counter() - start_time):.2f}s")
+    rank_soils(
+        location["lon"],
+        location["lat"],
+        list_soils_result,
+        soilHorizon,
+        horizonDepth,
+        rfvDepth,
+        lab_Color,
+        pSlope,
+        pElev,
+        bedrock,
+        cracks,
+    )
 
 
 def test_empty_rank():