fix: cached_method deprecated and test

cachebox deprecated the method decorator. Used cached instead.

Fix cache integration tests that were accessing real world addresses.

Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>

tests/test_cache.py

@@ -16,7 +16,6 @@ from akkudoktoreos.core.cache import (
     CacheFileStore,
     cache_energy_management,
     cache_in_file,
-    cachemethod_energy_management,
 )
 from akkudoktoreos.utils.datetimeutil import compare_datetimes, to_datetime, to_duration
 
@@ -64,10 +63,10 @@ class TestCacheEnergyManagementStore:
 
 class TestCacheUntilUpdateDecorators:
     def test_cachemethod_energy_management(self, cache_energy_management_store):
-        """Test that cachemethod_energy_management caches method results."""
+        """Test that cache_energy_management caches method results."""
 
         class MyClass:
-            @cachemethod_energy_management
+            @cache_energy_management
             def compute(self, value: int) -> int:
                 return value * 2
 
@@ -102,7 +101,7 @@ class TestCacheUntilUpdateDecorators:
         """Test that caching works for different arguments."""
 
         class MyClass:
-            @cachemethod_energy_management
+            @cache_energy_management
             def compute(self, value: int) -> int:
                 return value * 2
 
@@ -123,7 +122,7 @@ class TestCacheUntilUpdateDecorators:
         """Test that cache is cleared between EMS update cycles."""
 
         class MyClass:
-            @cachemethod_energy_management
+            @cache_energy_management
             def compute(self, value: int) -> int:
                 return value * 2
 

tests/test_elecpriceakkudoktor.py

@@ -173,11 +173,20 @@ def test_request_forecast_status_codes(
         provider._request_forecast()
 
 
+@patch("requests.get")
 @patch("akkudoktoreos.core.cache.CacheFileStore")
-def test_cache_integration(mock_cache, provider):
+def test_cache_integration(mock_cache, mock_get, provider, sample_akkudoktor_1_json):
     """Test caching of 8-day electricity price data."""
+    # Mock response object
+    mock_response = Mock()
+    mock_response.status_code = 200
+    mock_response.content = json.dumps(sample_akkudoktor_1_json)
+    mock_get.return_value = mock_response
+
+    # Mock cache object
     mock_cache_instance = mock_cache.return_value
     mock_cache_instance.get.return_value = None  # Simulate no cache
+
     provider._update_data(force_update=True)
     mock_cache_instance.create.assert_called_once()
     mock_cache_instance.get.assert_called_once()

tests/test_elecpriceenergycharts.py

@@ -167,11 +167,20 @@ def test_request_forecast_status_codes(
         provider._request_forecast()
 
 
+@patch("requests.get")
 @patch("akkudoktoreos.core.cache.CacheFileStore")
-def test_cache_integration(mock_cache, provider):
+def test_cache_integration(mock_cache, mock_get, provider, sample_energycharts_json):
     """Test caching of 8-day electricity price data."""
+    # Mock response object
+    mock_response = Mock()
+    mock_response.status_code = 200
+    mock_response.content = json.dumps(sample_energycharts_json)
+    mock_get.return_value = mock_response
+
+    # Mock cache object
     mock_cache_instance = mock_cache.return_value
     mock_cache_instance.get.return_value = None  # Simulate no cache
+
     provider._update_data(force_update=True)
     mock_cache_instance.create.assert_called_once()
     mock_cache_instance.get.assert_called_once()
@@ -195,7 +204,7 @@ def test_key_to_array_resampling(provider):
 
 
 @pytest.mark.skip(reason="For development only")
-def test_akkudoktor_development_forecast_data(provider):
+def test_energycharts_development_forecast_data(provider):
     """Fetch data from real Energy-Charts server."""
     # Preset, as this is usually done by update_data()
     provider.ems_start_datetime = to_datetime("2024-10-26 00:00:00")