Update error handling, and tests for geographic distance script.

Author: naylin-dev

Geographic Distance/geographic_distance.py

@@ -9,33 +9,41 @@ def calculate_distance_and_time(coord1, coord2, avg_speed):
     :param avg_speed: Average speed in km/h for estimating travel time
     :return: Distance in kilometers and estimated travel time in hours
     """
-    if not (isinstance(coord1, tuple) and isinstance(coord2, tuple)):
-        raise ValueError("Coordinates must be in the format 'lat, lon'")
 
     # Calculate geodesic distance
     distance = geodesic(coord1, coord2).kilometers
     # Estimate travel time (distance / speed)
-    if avg_speed > 0:
-        travel_time = distance / avg_speed
-    else:
-        raise ValueError("Average speed must be greater than 0.")
+    travel_time = distance / avg_speed
+
     return distance, travel_time
 
 
 def main():
     # Coordinates (latitude, longitude)
-    coord1 = input("Enter the latitude and longitude of the first location (lat1, lon1) Example: 40.7128, -74.006: ")
-    coord2 = input("Enter the latitude and longitude of the second location (lat2, lon2) Example: 37.7749, -122.4194: ")
+    try:
+        coord1 = tuple(map(float, input('Enter the latitude and longitude of the first location (lat1, lon1) Example: 40.7128, -74.006: ').split(',')))
+        coord2 = tuple(map(float, input('Enter the latitude and longitude of the second location (lat2, lon2) Example: 37.7749, -122.4194: ').split(',')))
+    except ValueError as e:
+        raise ValueError("Coordinates must be in the format 'lat, lon'") from e
+
+    if not all(-90 <= x <= 90 for x in (coord1[0], coord2[0])) or not all(-180 <= x <= 180 for x in (coord1[1], coord2[1])):
+        raise ValueError('Invalid coordinates')
 
     # Speed in km/h (e.g., driving speed)
-    avg_speed = float(input("Enter the average speed in km/h Example: 60: "))
+    try:
+        avg_speed = float(input('Enter the average speed in km/h Example: 60: '))
+    except ValueError as e:
+        raise ValueError('Average speed must be a number') from e
+
+    if avg_speed <= 0:
+        raise ValueError('Average speed must be greater than 0.')
 
     # Calculate the distance and travel time
     distance, travel_time = calculate_distance_and_time(coord1, coord2, avg_speed)
 
-    print(f"Distance between the two coordinates: {distance:.2f} km")
-    print(f"Estimated travel time: {travel_time:.2f} hours")
+    print(f'Distance between the two coordinates: {distance:.2f} kilometers')
+    print(f'Estimated travel time: {travel_time:.2f} hours')
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     main()

Geographic Distance/test_geographic_distance.py

@@ -1,5 +1,7 @@
+from unittest.mock import patch
+
 import pytest
-from geographic_distance import calculate_distance_and_time
+from geographic_distance import calculate_distance_and_time, main
 
 
 def test_calculate_distance_and_time():
@@ -21,15 +23,6 @@ def test_calculate_distance_and_time_invalid_speed():
         calculate_distance_and_time(coord1, coord2, avg_speed)
 
 
-def test_calculate_distance_and_time_invalid_coordinates():
-    # Test with invalid coordinates (not tuples)
-    coord1 = "40.7128, -74.006"
-    coord2 = "37.7749, -122.4194"
-    avg_speed = 60
-    with pytest.raises(ValueError):
-        calculate_distance_and_time(coord1, coord2, avg_speed)
-
-
 def test_calculate_distance_and_time_same_coordinates():
     # Test with same coordinates
     coord1 = (40.7128, -74.006)
@@ -38,3 +31,42 @@ def test_calculate_distance_and_time_same_coordinates():
     distance, travel_time = calculate_distance_and_time(coord1, coord2, avg_speed)
     assert distance == 0
     assert travel_time == 0
+
+
+@pytest.fixture
+def mock_input():
+    with patch('builtins.input', side_effect=['40.7128, -74.006', '37.7749, -122.4194', '60']):
+        yield
+
+
+def test_main(mock_input, capsys):
+    main()
+    captured = capsys.readouterr()
+    assert 'Distance between the two coordinates:' in captured.out
+    assert 'Estimated travel time:' in captured.out
+
+
+def test_main_invalid_coordinates(mock_input, capsys):
+    with patch('builtins.input', side_effect=['abc, def', '37.7749, -122.4194', '60']):
+        with pytest.raises(ValueError):
+            main()
+
+
+def test_main_invalid_speed(mock_input, capsys):
+    with patch('builtins.input', side_effect=['40.7128, -74.006', '37.7749, -122.4194', 'abc']):
+        with pytest.raises(ValueError):
+            main()
+
+
+def test_main_zero_speed(mock_input, capsys):
+    with patch('builtins.input', side_effect=['40.7128, -74.006', '37.7749, -122.4194', '0']):
+        with pytest.raises(ValueError):
+            main()
+
+
+def test_main_same_coordinates(mock_input, capsys):
+    with patch('builtins.input', side_effect=['40.7128, -74.006', '40.7128, -74.006', '60']):
+        main()
+        captured = capsys.readouterr()
+        assert 'Distance between the two coordinates: 0.00 kilometers' in captured.out
+        assert 'Estimated travel time: 0.00 hours' in captured.out