Expand test coverage for errors

Author: w-k-jones

tobac/analysis/spatial.py

@@ -109,6 +109,9 @@ def calculate_distance(
         raise ValueError(
             "method_distance parameter must be provided if eithe hdim1_coord or hdim2_coord are specified"
         )
+    
+    if method_distance not in [None, "xy", "latlon"]:
+        raise ValueError("method_distance invalid, must be one of (None, 'xy', 'latlon')")
 
     feature_1_coord = find_dataframe_horizontal_coords(
         feature_1,
@@ -148,8 +151,7 @@ def calculate_distance(
             feature_2[hdim1_coord],
             feature_2[hdim2_coord],
         )
-    else:
-        raise ValueError("method undefined")
+    
     return distance
 
 

tobac/tests/test_analysis_spatial.py

@@ -65,6 +65,10 @@ def test_calculate_distance():
 
 
 def test_calculate_distance_errors():
+    # Test invalid method_distance
+    with pytest.raises(ValueError, match="method_distance invalid*"):
+        calculate_distance(pd.DataFrame(), pd.DataFrame(), method_distance="invalid_method_distance")
+
     # Test no horizontal coordinates"
     test_features = pd.DataFrame(
         {

tobac/tests/test_utils.py

@@ -1,3 +1,4 @@
+from cycler import V
 import pytest
 import tobac.testing
 import tobac.testing as tbtest
@@ -117,6 +118,10 @@ def test_get_indices_of_labels_from_reg_prop_dict():
             y_indices[index_key] < ny_2D
         )
 
+    # Test error if empty dict is passed:
+    with pytest.raises(ValueError, match="No regions!"):
+        tb_utils.get_indices_of_labels_from_reg_prop_dict({})
+
 
 @pytest.mark.parametrize(
     "feature_loc, min_max_coords, lengths, expected_coord_interp",