Rename settings variables (remove prefixes)

tests/test_weatherbrightsky.py

@@ -17,7 +17,7 @@ FILE_TESTDATA_WEATHERBRIGHTSKY_2_JSON = DIR_TESTDATA.joinpath("weatherforecast_b
 
 
 @pytest.fixture
-def weather_provider(monkeypatch):
+def provider(monkeypatch):
     """Fixture to create a WeatherProvider instance."""
     monkeypatch.setenv("EOS_WEATHER__WEATHER_PROVIDER", "BrightSky")
     monkeypatch.setenv("EOS_PREDICTION__LATITUDE", "50.0")
@@ -52,27 +52,27 @@ def cache_store():
 # ------------------------------------------------
 
 
-def test_singleton_instance(weather_provider):
+def test_singleton_instance(provider):
     """Test that WeatherForecast behaves as a singleton."""
     another_instance = WeatherBrightSky()
-    assert weather_provider is another_instance
+    assert provider is another_instance
 
 
-def test_invalid_provider(weather_provider, monkeypatch):
-    """Test requesting an unsupported weather_provider."""
+def test_invalid_provider(provider, monkeypatch):
+    """Test requesting an unsupported provider."""
     monkeypatch.setenv("EOS_WEATHER__WEATHER_PROVIDER", "<invalid>")
-    weather_provider.config.reset_settings()
-    assert not weather_provider.enabled()
+    provider.config.reset_settings()
+    assert not provider.enabled()
 
 
-def test_invalid_coordinates(weather_provider, monkeypatch):
+def test_invalid_coordinates(provider, monkeypatch):
     """Test invalid coordinates raise ValueError."""
     monkeypatch.setenv("EOS_PREDICTION__LATITUDE", "1000")
     monkeypatch.setenv("EOS_PREDICTION__LONGITUDE", "1000")
     with pytest.raises(
         ValueError,  # match="Latitude '1000' and/ or longitude `1000` out of valid range."
     ):
-        weather_provider.config.reset_settings()
+        provider.config.reset_settings()
 
 
 # ------------------------------------------------
@@ -80,15 +80,13 @@ def test_invalid_coordinates(weather_provider, monkeypatch):
 # ------------------------------------------------
 
 
-def test_irridiance_estimate_from_cloud_cover(weather_provider):
+def test_irridiance_estimate_from_cloud_cover(provider):
     """Test cloud cover to irradiance estimation."""
     cloud_cover_data = pd.Series(
         data=[20, 50, 80], index=pd.date_range("2023-10-22", periods=3, freq="h")
     )
 
-    ghi, dni, dhi = weather_provider.estimate_irradiance_from_cloud_cover(
-        50.0, 10.0, cloud_cover_data
-    )
+    ghi, dni, dhi = provider.estimate_irradiance_from_cloud_cover(50.0, 10.0, cloud_cover_data)
 
     assert ghi == [0, 0, 0]
     assert dhi == [0, 0, 0]
@@ -101,7 +99,7 @@ def test_irridiance_estimate_from_cloud_cover(weather_provider):
 
 
 @patch("requests.get")
-def test_request_forecast(mock_get, weather_provider, sample_brightsky_1_json):
+def test_request_forecast(mock_get, provider, sample_brightsky_1_json):
     """Test requesting forecast from BrightSky."""
     # Mock response object
     mock_response = Mock()
@@ -110,10 +108,10 @@ def test_request_forecast(mock_get, weather_provider, sample_brightsky_1_json):
     mock_get.return_value = mock_response
 
     # Preset, as this is usually done by update()
-    weather_provider.config.update()
+    provider.config.update()
 
     # Test function
-    brightsky_data = weather_provider._request_forecast()
+    brightsky_data = provider._request_forecast()
 
     assert isinstance(brightsky_data, dict)
     assert brightsky_data["weather"][0] == {
@@ -150,7 +148,7 @@ def test_request_forecast(mock_get, weather_provider, sample_brightsky_1_json):
 
 
 @patch("requests.get")
-def test_update_data(mock_get, weather_provider, sample_brightsky_1_json, cache_store):
+def test_update_data(mock_get, provider, sample_brightsky_1_json, cache_store):
     """Test fetching forecast from BrightSky."""
     # Mock response object
     mock_response = Mock()
@@ -163,14 +161,14 @@ def test_update_data(mock_get, weather_provider, sample_brightsky_1_json, cache_
     # Call the method
     ems_eos = get_ems()
     ems_eos.set_start_datetime(to_datetime("2024-10-26 00:00:00", in_timezone="Europe/Berlin"))
-    weather_provider.update_data(force_enable=True, force_update=True)
+    provider.update_data(force_enable=True, force_update=True)
 
     # Assert: Verify the result is as expected
     mock_get.assert_called_once()
-    assert len(weather_provider) == 338
+    assert len(provider) == 338
 
     # with open(FILE_TESTDATA_WEATHERBRIGHTSKY_2_JSON, "w") as f_out:
-    #    f_out.write(weather_provider.to_json())
+    #    f_out.write(provider.to_json())
 
 
 # ------------------------------------------------
@@ -179,14 +177,14 @@ def test_update_data(mock_get, weather_provider, sample_brightsky_1_json, cache_
 
 
 @pytest.mark.skip(reason="For development only")
-def test_brightsky_development_forecast_data(weather_provider):
+def test_brightsky_development_forecast_data(provider):
     """Fetch data from real BrightSky server."""
     # Preset, as this is usually done by update_data()
-    weather_provider.start_datetime = to_datetime("2024-10-26 00:00:00")
-    weather_provider.latitude = 50.0
-    weather_provider.longitude = 10.0
+    provider.start_datetime = to_datetime("2024-10-26 00:00:00")
+    provider.latitude = 50.0
+    provider.longitude = 10.0
 
-    brightsky_data = weather_provider._request_forecast()
+    brightsky_data = provider._request_forecast()
 
     with open(FILE_TESTDATA_WEATHERBRIGHTSKY_1_JSON, "w") as f_out:
         json.dump(brightsky_data, f_out, indent=4)