diff --git a/homeassistant/components/illuminance/condition.py b/homeassistant/components/illuminance/condition.py index 97bdbd330e94..c074c3331000 100644 --- a/homeassistant/components/illuminance/condition.py +++ b/homeassistant/components/illuminance/condition.py @@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import ( DOMAIN as BINARY_SENSOR_DOMAIN, BinarySensorDeviceClass, ) -from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass from homeassistant.const import LIGHT_LUX, STATE_OFF, STATE_ON from homeassistant.core import HomeAssistant @@ -22,7 +21,6 @@ ILLUMINANCE_DETECTED_DOMAIN_SPECS = { } ILLUMINANCE_VALUE_DOMAIN_SPECS = { SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.ILLUMINANCE), - NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.ILLUMINANCE), } CONDITIONS: dict[str, type[Condition]] = { diff --git a/homeassistant/components/illuminance/conditions.yaml b/homeassistant/components/illuminance/conditions.yaml index 37980efcae49..b23ac8007e0d 100644 --- a/homeassistant/components/illuminance/conditions.yaml +++ b/homeassistant/components/illuminance/conditions.yaml @@ -23,8 +23,6 @@ is_value: entity: - domain: sensor device_class: illuminance - - domain: number - device_class: illuminance fields: behavior: *condition_behavior threshold: diff --git a/homeassistant/components/illuminance/trigger.py b/homeassistant/components/illuminance/trigger.py index 042a207beb6a..56fe49108093 100644 --- a/homeassistant/components/illuminance/trigger.py +++ b/homeassistant/components/illuminance/trigger.py @@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import ( DOMAIN as BINARY_SENSOR_DOMAIN, BinarySensorDeviceClass, ) -from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass from homeassistant.const import LIGHT_LUX, STATE_OFF, STATE_ON from homeassistant.core import HomeAssistant @@ -19,7 +18,6 @@ from homeassistant.helpers.trigger import ( ) ILLUMINANCE_DOMAIN_SPECS: dict[str, DomainSpec] = { - NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.ILLUMINANCE), SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.ILLUMINANCE), } diff --git a/homeassistant/components/illuminance/triggers.yaml b/homeassistant/components/illuminance/triggers.yaml index d015efb36b8f..c2f77fd42920 100644 --- a/homeassistant/components/illuminance/triggers.yaml +++ b/homeassistant/components/illuminance/triggers.yaml @@ -29,8 +29,6 @@ .trigger_numerical_target: &trigger_numerical_target entity: - - domain: number - device_class: illuminance - domain: sensor device_class: illuminance diff --git a/tests/components/illuminance/test_condition.py b/tests/components/illuminance/test_condition.py index 9a3b0c16c9cf..d82a29581c3d 100644 --- a/tests/components/illuminance/test_condition.py +++ b/tests/components/illuminance/test_condition.py @@ -40,12 +40,6 @@ async def target_sensors(hass: HomeAssistant) -> dict[str, list[str]]: return await target_entities(hass, "sensor") -@pytest.fixture -async def target_numbers(hass: HomeAssistant) -> dict[str, list[str]]: - """Create multiple number entities associated with different targets.""" - return await target_entities(hass, "number") - - @pytest.mark.parametrize( "condition", [ @@ -221,75 +215,3 @@ async def test_illuminance_value_condition_behavior_all( condition_options=condition_options, states=states, ) - - -@pytest.mark.usefixtures("enable_labs_preview_features") -@pytest.mark.parametrize( - ("condition_target_config", "entity_id", "entities_in_target"), - parametrize_target_entities("number"), -) -@pytest.mark.parametrize( - ("condition", "condition_options", "states"), - parametrize_numerical_condition_above_below_any( - "illuminance.is_value", - device_class="illuminance", - unit_attributes=_ILLUMINANCE_UNIT_ATTRS, - ), -) -async def test_illuminance_value_number_condition_behavior_any( - hass: HomeAssistant, - target_numbers: dict[str, list[str]], - condition_target_config: dict, - entity_id: str, - entities_in_target: int, - condition: str, - condition_options: dict[str, Any], - states: list[ConditionStateDescription], -) -> None: - """Test the illuminance value condition with number entities and 'any' behavior.""" - await assert_condition_behavior_any( - hass, - target_entities=target_numbers, - condition_target_config=condition_target_config, - entity_id=entity_id, - entities_in_target=entities_in_target, - condition=condition, - condition_options=condition_options, - states=states, - ) - - -@pytest.mark.usefixtures("enable_labs_preview_features") -@pytest.mark.parametrize( - ("condition_target_config", "entity_id", "entities_in_target"), - parametrize_target_entities("number"), -) -@pytest.mark.parametrize( - ("condition", "condition_options", "states"), - parametrize_numerical_condition_above_below_all( - "illuminance.is_value", - device_class="illuminance", - unit_attributes=_ILLUMINANCE_UNIT_ATTRS, - ), -) -async def test_illuminance_value_number_condition_behavior_all( - hass: HomeAssistant, - target_numbers: dict[str, list[str]], - condition_target_config: dict, - entity_id: str, - entities_in_target: int, - condition: str, - condition_options: dict[str, Any], - states: list[ConditionStateDescription], -) -> None: - """Test the illuminance value condition with number entities and 'all' behavior.""" - await assert_condition_behavior_all( - hass, - target_entities=target_numbers, - condition_target_config=condition_target_config, - entity_id=entity_id, - entities_in_target=entities_in_target, - condition=condition, - condition_options=condition_options, - states=states, - ) diff --git a/tests/components/illuminance/test_trigger.py b/tests/components/illuminance/test_trigger.py index a53b218d5b7d..908cb0fe39ab 100644 --- a/tests/components/illuminance/test_trigger.py +++ b/tests/components/illuminance/test_trigger.py @@ -5,7 +5,6 @@ from typing import Any import pytest from homeassistant.components.binary_sensor import BinarySensorDeviceClass -from homeassistant.components.number import NumberDeviceClass from homeassistant.components.sensor import SensorDeviceClass from homeassistant.const import ( ATTR_DEVICE_CLASS, @@ -36,12 +35,6 @@ async def target_binary_sensors(hass: HomeAssistant) -> dict[str, list[str]]: return await target_entities(hass, "binary_sensor") -@pytest.fixture -async def target_numbers(hass: HomeAssistant) -> dict[str, list[str]]: - """Create multiple number entities associated with different targets.""" - return await target_entities(hass, "number") - - @pytest.fixture async def target_sensors(hass: HomeAssistant) -> dict[str, list[str]]: """Create multiple sensor entities associated with different targets.""" @@ -340,125 +333,3 @@ async def test_illuminance_trigger_sensor_crossed_threshold_behavior_last( trigger_options=trigger_options, states=states, ) - - -# --- Number changed/crossed_threshold tests --- - - -@pytest.mark.usefixtures("enable_labs_preview_features") -@pytest.mark.parametrize( - ("trigger_target_config", "entity_id", "entities_in_target"), - parametrize_target_entities("number"), -) -@pytest.mark.parametrize( - ("trigger", "trigger_options", "states"), - [ - *parametrize_numerical_state_value_changed_trigger_states( - "illuminance.changed", - device_class=NumberDeviceClass.ILLUMINANCE, - unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX}, - ), - *parametrize_numerical_state_value_crossed_threshold_trigger_states( - "illuminance.crossed_threshold", - device_class=NumberDeviceClass.ILLUMINANCE, - unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX}, - ), - ], -) -async def test_illuminance_trigger_number_behavior_any( - hass: HomeAssistant, - target_numbers: dict[str, list[str]], - trigger_target_config: dict, - entity_id: str, - entities_in_target: int, - trigger: str, - trigger_options: dict[str, Any], - states: list[TriggerStateDescription], -) -> None: - """Test illuminance trigger fires for number entities with device_class illuminance.""" - await assert_trigger_behavior_any( - hass, - target_entities=target_numbers, - trigger_target_config=trigger_target_config, - entity_id=entity_id, - entities_in_target=entities_in_target, - trigger=trigger, - trigger_options=trigger_options, - states=states, - ) - - -@pytest.mark.usefixtures("enable_labs_preview_features") -@pytest.mark.parametrize( - ("trigger_target_config", "entity_id", "entities_in_target"), - parametrize_target_entities("number"), -) -@pytest.mark.parametrize( - ("trigger", "trigger_options", "states"), - [ - *parametrize_numerical_state_value_crossed_threshold_trigger_states( - "illuminance.crossed_threshold", - device_class=NumberDeviceClass.ILLUMINANCE, - unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX}, - ), - ], -) -async def test_illuminance_trigger_number_crossed_threshold_behavior_first( - hass: HomeAssistant, - target_numbers: dict[str, list[str]], - trigger_target_config: dict, - entity_id: str, - entities_in_target: int, - trigger: str, - trigger_options: dict[str, Any], - states: list[TriggerStateDescription], -) -> None: - """Test illuminance crossed_threshold trigger fires on the first number state change.""" - await assert_trigger_behavior_first( - hass, - target_entities=target_numbers, - trigger_target_config=trigger_target_config, - entity_id=entity_id, - entities_in_target=entities_in_target, - trigger=trigger, - trigger_options=trigger_options, - states=states, - ) - - -@pytest.mark.usefixtures("enable_labs_preview_features") -@pytest.mark.parametrize( - ("trigger_target_config", "entity_id", "entities_in_target"), - parametrize_target_entities("number"), -) -@pytest.mark.parametrize( - ("trigger", "trigger_options", "states"), - [ - *parametrize_numerical_state_value_crossed_threshold_trigger_states( - "illuminance.crossed_threshold", - device_class=NumberDeviceClass.ILLUMINANCE, - unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX}, - ), - ], -) -async def test_illuminance_trigger_number_crossed_threshold_behavior_last( - hass: HomeAssistant, - target_numbers: dict[str, list[str]], - trigger_target_config: dict, - entity_id: str, - entities_in_target: int, - trigger: str, - trigger_options: dict[str, Any], - states: list[TriggerStateDescription], -) -> None: - """Test illuminance crossed_threshold trigger fires when the last number changes state.""" - await assert_trigger_behavior_last( - hass, - target_entities=target_numbers, - trigger_target_config=trigger_target_config, - entity_id=entity_id, - entities_in_target=entities_in_target, - trigger=trigger, - trigger_options=trigger_options, - states=states, - )