From e5c36c8d564e6b09363aa148af9e1e97ff812c3e Mon Sep 17 00:00:00 2001 From: Arie Catsman <120491684+catsmanac@users.noreply.github.com> Date: Sun, 28 Jul 2024 16:36:36 +0200 Subject: [PATCH] Refactor asserts in enphase_envoy test_sensor (#122726) refactor asserts in enphase_envoy test_sensor --- tests/components/enphase_envoy/test_sensor.py | 86 ++++++++++--------- 1 file changed, 46 insertions(+), 40 deletions(-) diff --git a/tests/components/enphase_envoy/test_sensor.py b/tests/components/enphase_envoy/test_sensor.py index 1b066ca9f59..273f81173ff 100644 --- a/tests/components/enphase_envoy/test_sensor.py +++ b/tests/components/enphase_envoy/test_sensor.py @@ -88,7 +88,7 @@ async def test_sensor_production_data( for name, target in list(zip(PRODUCTION_NAMES, PRODUCTION_TARGETS, strict=False)): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target PRODUCTION_PHASE_NAMES: list[str] = [ @@ -133,7 +133,7 @@ async def test_sensor_production_phase_data( zip(PRODUCTION_PHASE_NAMES, PRODUCTION_PHASE_TARGET, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CONSUMPTION_NAMES: tuple[str, ...] = ( @@ -176,7 +176,7 @@ async def test_sensor_consumption_data( for name, target in list(zip(CONSUMPTION_NAMES, CONSUMPTION_TARGETS, strict=False)): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CONSUMPTION_PHASE_NAMES: list[str] = [ @@ -221,7 +221,7 @@ async def test_sensor_consumption_phase_data( zip(CONSUMPTION_PHASE_NAMES, CONSUMPTION_PHASE_TARGET, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_PRODUCTION_NAMES_INT = ("meter_status_flags_active_production_ct",) @@ -256,14 +256,14 @@ async def test_sensor_production_ct_data( zip(CT_PRODUCTION_NAMES_INT, CT_PRODUCTION_TARGETS_INT, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_PRODUCTION_TARGETS_STR = (data.metering_status,) for name, target in list( zip(CT_PRODUCTION_NAMES_STR, CT_PRODUCTION_TARGETS_STR, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == entity_state.state + assert entity_state.state == target CT_PRODUCTION_NAMES_FLOAT_PHASE = [ @@ -313,7 +313,7 @@ async def test_sensor_production_ct_phase_data( ) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_PRODUCTION_NAMES_STR_TARGET = [ phase_data.metering_status @@ -328,7 +328,7 @@ async def test_sensor_production_ct_phase_data( ) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == entity_state.state + assert entity_state.state == target CT_CONSUMPTION_NAMES_FLOAT: tuple[str, ...] = ( @@ -378,14 +378,14 @@ async def test_sensor_consumption_ct_data( zip(CT_CONSUMPTION_NAMES_FLOAT, CT_CONSUMPTION_TARGETS_FLOAT, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_CONSUMPTION_TARGETS_STR = (data.metering_status,) for name, target in list( zip(CT_CONSUMPTION_NAMES_STR, CT_CONSUMPTION_TARGETS_STR, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == entity_state.state + assert entity_state.state == target CT_CONSUMPTION_NAMES_FLOAT_PHASE = [ @@ -444,7 +444,7 @@ async def test_sensor_consumption_ct_phase_data( ) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_CONSUMPTION_NAMES_STR_PHASE_TARGET = [ phase_data.metering_status @@ -459,7 +459,7 @@ async def test_sensor_consumption_ct_phase_data( ) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == entity_state.state + assert entity_state.state == target CT_STORAGE_NAMES_FLOAT = ( @@ -505,14 +505,14 @@ async def test_sensor_storage_ct_data( zip(CT_STORAGE_NAMES_FLOAT, CT_STORAGE_TARGETS_FLOAT, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_STORAGE_TARGETS_STR = (data.metering_status,) for name, target in list( zip(CT_STORAGE_NAMES_STR, CT_STORAGE_TARGETS_STR, strict=False) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == entity_state.state + assert entity_state.state == target CT_STORAGE_NAMES_FLOAT_PHASE = [ @@ -567,7 +567,7 @@ async def test_sensor_storage_ct_phase_data( ) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target CT_STORAGE_NAMES_STR_PHASE_TARGET = [ phase_data.metering_status @@ -582,7 +582,7 @@ async def test_sensor_storage_ct_phase_data( ) ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{name}")) - assert target == entity_state.state + assert entity_state.state == target @pytest.mark.parametrize( @@ -672,11 +672,11 @@ async def test_sensor_inverter_data( for sn, inverter in mock_envoy.data.inverters.items(): assert (entity_state := hass.states.get(f"{entity_base}_{sn}")) - assert (inverter.last_report_watts) == float(entity_state.state) + assert float(entity_state.state) == (inverter.last_report_watts) assert (last_reported := hass.states.get(f"{entity_base}_{sn}_last_reported")) - assert dt_util.utc_from_timestamp( - inverter.last_report_date - ) == dt_util.parse_datetime(last_reported.state) + assert dt_util.parse_datetime( + last_reported.state + ) == dt_util.utc_from_timestamp(inverter.last_report_date) @pytest.mark.parametrize( @@ -738,7 +738,7 @@ async def test_sensor_encharge_aggregate_data( ("battery_capacity", data.max_available_capacity), ): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{target[0]}")) - assert target[1] == float(entity_state.state) + assert float(entity_state.state) == target[1] @pytest.mark.parametrize( @@ -761,19 +761,22 @@ async def test_sensor_encharge_enpower_data( ENTITY_BASE = f"{Platform.SENSOR}.enpower" assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{sn}_temperature")) - assert mock_envoy.data.enpower.temperature == round( - TemperatureConverter.convert( - float(entity_state.state), - hass.config.units.temperature_unit, - UnitOfTemperature.FAHRENHEIT - if mock_envoy.data.enpower.temperature_unit == "F" - else UnitOfTemperature.CELSIUS, + assert ( + round( + TemperatureConverter.convert( + float(entity_state.state), + hass.config.units.temperature_unit, + UnitOfTemperature.FAHRENHEIT + if mock_envoy.data.enpower.temperature_unit == "F" + else UnitOfTemperature.CELSIUS, + ) ) + == mock_envoy.data.enpower.temperature ) assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{sn}_last_reported")) - assert dt_util.utc_from_timestamp( + assert dt_util.parse_datetime(entity_state.state) == dt_util.utc_from_timestamp( mock_envoy.data.enpower.last_report_date - ) == dt_util.parse_datetime(entity_state.state) + ) @pytest.mark.parametrize( @@ -815,23 +818,26 @@ async def test_sensor_encharge_power_data( for sn, sn_target in ENCHARGE_POWER_TARGETS: for name, target in list(zip(ENCHARGE_POWER_NAMES, sn_target, strict=False)): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{sn}_{name}")) - assert target == float(entity_state.state) + assert float(entity_state.state) == target for sn, encharge_inventory in mock_envoy.data.encharge_inventory.items(): assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{sn}_temperature")) - assert encharge_inventory.temperature == round( - TemperatureConverter.convert( - float(entity_state.state), - hass.config.units.temperature_unit, - UnitOfTemperature.FAHRENHEIT - if encharge_inventory.temperature_unit == "F" - else UnitOfTemperature.CELSIUS, + assert ( + round( + TemperatureConverter.convert( + float(entity_state.state), + hass.config.units.temperature_unit, + UnitOfTemperature.FAHRENHEIT + if encharge_inventory.temperature_unit == "F" + else UnitOfTemperature.CELSIUS, + ) ) + == encharge_inventory.temperature ) assert (entity_state := hass.states.get(f"{ENTITY_BASE}_{sn}_last_reported")) - assert dt_util.utc_from_timestamp( + assert dt_util.parse_datetime(entity_state.state) == dt_util.utc_from_timestamp( encharge_inventory.last_report_date - ) == dt_util.parse_datetime(entity_state.state) + ) def integration_disabled_entities(