Merge branch '2025-testtips'

Author: egges

2025/testtips/tests/test_tips.py

@@ -1,73 +1,62 @@
-# tests/test_weather.py
-
 import sys
+from typing import Any
 
 import pytest
-from weather import WeatherService
 
-# from hypothesis import given
-# from hypothesis.strategies import floats
+from weather import WeatherService
 
 
-# ✅ Parametrization
 @pytest.mark.parametrize(
-    "city,expected_temp", [("London", 15), ("Berlin", 20), ("Paris", 17)]
+    "city,expected_temp",
+    [
+        ("London", 15),
+        ("Berlin", 20),
+        ("Rome", 18),
+    ],
 )
-def test_get_temperature_multiple_cities(monkeypatch, city, expected_temp):
-    def fake_get(url, params):
+def test_parametrized_temperatures(
+    monkeypatch: pytest.MonkeyPatch, city: str, expected_temp: float
+) -> None:
+    def fake_get(url: str, params: dict[str, Any]) -> Any:
         class FakeResponse:
-            def raise_for_status(self):
+            def raise_for_status(self) -> None:
                 pass
 
-            def json(self):
+            def json(self) -> dict[str, Any]:
                 return {"current": {"temp_c": expected_temp}}
 
         return FakeResponse()
 
-    monkeypatch.setattr("weather.httpx.get", fake_get)
-
+    monkeypatch.setattr("httpx.get", fake_get)
     service = WeatherService(api_key="fake-key")
-    temp = service.get_temperature(city)
+    assert service.get_temperature(city) == expected_temp
 
-    assert temp == expected_temp
 
-
-# ✅ pytest.raises
-def test_get_temperature_raises_http_error(monkeypatch):
-    def fake_get(url, params):
+def test_temperature_raises_error(monkeypatch: pytest.MonkeyPatch) -> None:
+    def fake_get(url: str, params: dict[str, Any]) -> Any:
         class FakeResponse:
-            def raise_for_status(self):
+            def raise_for_status(self) -> None:
                 raise Exception("API error")
 
         return FakeResponse()
 
-    monkeypatch.setattr("weather.httpx.get", fake_get)
-
+    monkeypatch.setattr("httpx.get", fake_get)
     service = WeatherService(api_key="fake-key")
 
     with pytest.raises(Exception):
-        service.get_temperature("Tokyo")
+        service.get_temperature("Oslo")
 
 
-# ✅ pytest.mark.skip
-@pytest.mark.skip(reason="Skipping this test for demonstration purposes.")
-def test_skipped_example():
+@pytest.mark.skip(reason="Temporarily skipping for demo purposes")
+def test_skipped() -> None:
     assert False
 
 
-# ✅ pytest.mark.skipif
-@pytest.mark.skipif(sys.platform == "win32", reason="Does not run on Windows")
-def test_only_runs_on_non_windows():
+@pytest.mark.skipif(sys.platform == "win32", reason="Fails on Windows")
+def test_non_windows_behavior() -> None:
     assert True
 
 
-# ✅ pytest.mark.xfail
-@pytest.mark.xfail(reason="Known bug: API sometimes returns wrong temperature")
-def test_expected_failure_example():
-    assert 2 + 2 == 5
-
-
-# ✅ Hypothesis property-based test
-# @given(floats(min_value=-50, max_value=50))
-# def test_temperature_range_property(temp):
-#     assert -50 <= temp <= 50
+@pytest.mark.xfail(reason="Intentional failure due to API bug")
+def test_expected_failure() -> None:
+    assert 1 + 1 == 3

2025/testtips/tests/test_weather.py

@@ -1,50 +1,19 @@
 import pytest
 from weather import WeatherService
+from typing import Any
+from unittest.mock import MagicMock
 
-
-# This fixture creates a WeatherService instance you can reuse
 @pytest.fixture
-def weather_service():
+def weather_service(monkeypatch: pytest.MonkeyPatch) -> WeatherService:
+    def fake_get(url: str, params: dict[str, Any]) -> Any:
+        mock_response = MagicMock()
+        mock_response.raise_for_status.return_value = None
+        mock_response.json.return_value = {"current": {"temp_c": 25}}
+        return mock_response
+
+    monkeypatch.setattr("httpx.get", fake_get)
     return WeatherService(api_key="fake-key")
 
+def test_fixture_usage(weather_service: WeatherService) -> None:
+    assert weather_service.get_temperature("Paris") == 25
 
-def test_get_temperature_returns_expected_value(weather_service, monkeypatch):
-    """
-    Test that get_temperature returns the correct temperature.
-    """
-
-    def fake_get(url, params):
-        class FakeResponse:
-            def raise_for_status(self):
-                pass
-
-            def json(self):
-                return {"current": {"temp_c": 20}}
-
-        return FakeResponse()
-
-    monkeypatch.setattr("weather.httpx.get", fake_get)
-
-    temp = weather_service.get_temperature("Amsterdam")
-    assert temp == 20
-
-
-def test_get_temperature_returns_float(weather_service, monkeypatch):
-    """
-    Test that get_temperature returns a float value.
-    """
-
-    def fake_get(url, params):
-        class FakeResponse:
-            def raise_for_status(self):
-                pass
-
-            def json(self):
-                return {"current": {"temp_c": 18.5}}
-
-        return FakeResponse()
-
-    monkeypatch.setattr("weather.httpx.get", fake_get)
-
-    temp = weather_service.get_temperature("Berlin")
-    assert isinstance(temp, float)

2025/testtips/tests/test_weather_fixture.py

@@ -0,0 +1,34 @@
+from typing import Any
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from weather import WeatherService
+
+
+def test_get_temperature_with_mocking_monkeypatch(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    def fake_get(url: str, params: dict[str, Any]) -> Any:
+        mock_response = MagicMock()
+        mock_response.raise_for_status.return_value = None
+        mock_response.json.return_value = {"current": {"temp_c": 25}}
+        return mock_response
+
+    monkeypatch.setattr("httpx.get", fake_get)
+    service = WeatherService(api_key="fake-key")
+    temp = service.get_temperature("Amsterdam")
+    assert temp == 25
+
+
+def test_get_temperature_with_mocking() -> None:
+    mock_response = MagicMock()
+    mock_response.raise_for_status.return_value = None
+    mock_response.json.return_value = {"current": {"temp_c": 25}}
+
+    with patch("httpx.get", return_value=mock_response) as mock_get:
+        service = WeatherService(api_key="fake-key")
+        temp = service.get_temperature("London")
+
+        assert temp == 25
+        mock_get.assert_called_once()

2025/testtips/tests/test_weather_mock.py

@@ -0,0 +1,16 @@
+from weather import WeatherService
+import pytest
+from typing import Any
+
+def test_get_temperature_with_monkeypatch(monkeypatch: pytest.MonkeyPatch) -> None:
+    def fake_get(url: str, params: dict[str, Any]) -> Any:
+        class FakeResponse:
+            def raise_for_status(self) -> None: pass
+            def json(self) -> dict[str, Any]:
+                return {"current": {"temp_c": 19}}
+        return FakeResponse()
+
+    monkeypatch.setattr("httpx.get", fake_get)
+    service = WeatherService(api_key="fake-key")
+    temp = service.get_temperature("Amsterdam")
+    assert temp == 19

2025/testtips/tests/test_weather_mock_mp.py

@@ -1,12 +1,22 @@
+from unittest.mock import MagicMock
+
+import pytest
+
 from weather_refactor import WeatherService
 
-def test_get_temperature_with_stub_client():
-    class StubClient:
-        def get(self, url, params):
-            class Response:
-                def raise_for_status(self): pass
-                def json(self): return {"current": {"temp_c": 18}}
-            return Response()
 
-    service = WeatherService(client=StubClient(), api_key="fake_key")
-    assert service.get_temperature("Oslo") == 18
+@pytest.fixture
+def weather_service() -> WeatherService:
+    mock_http_client = MagicMock()
+    mock_http_client.get.return_value = MagicMock(
+        **{
+            "raise_for_status": lambda: None,
+            "json": lambda: {"current": {"temp_c": 17}},
+        }
+    )
+    return WeatherService(client=mock_http_client, api_key="fake-key")
+
+
+def test_weather_service_with_mock_http_client(weather_service: WeatherService):
+    temp = weather_service.get_temperature("Amsterdam")
+    assert temp == 17

2025/testtips/tests/test_weather_patch.py

@@ -1,4 +1,3 @@
-# weather_service.py
 import os
 
 import httpx
@@ -8,7 +7,7 @@
 
 
 class WeatherService:
-    def __init__(self, api_key: str):
+    def __init__(self, api_key: str) -> None:
         self.api_key = api_key
 
     def get_temperature(self, city: str) -> float:
@@ -21,8 +20,8 @@ def get_temperature(self, city: str) -> float:
         return data["current"]["temp_c"]
 
 
-def main():
-    api_key = os.getenv("WEATHER_API_KEY")
+def main() -> None:
+    api_key = os.getenv("WEATHER_API_KEY", "")
     weather_service = WeatherService(api_key)
     temperature = weather_service.get_temperature("Amsterdam")
     print(f"The current temperature in Amsterdam is {temperature}°C.")