diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py index 1cb38a005ee..92c88c4774c 100644 --- a/homeassistant/components/automation/__init__.py +++ b/homeassistant/components/automation/__init__.py @@ -129,6 +129,7 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = { "fan", "light", "siren", + "switch", } _EXPERIMENTAL_TRIGGER_PLATFORMS = { diff --git a/homeassistant/components/switch/condition.py b/homeassistant/components/switch/condition.py new file mode 100644 index 00000000000..283524d2178 --- /dev/null +++ b/homeassistant/components/switch/condition.py @@ -0,0 +1,17 @@ +"""Provides conditions for switches.""" + +from homeassistant.const import STATE_OFF, STATE_ON +from homeassistant.core import HomeAssistant +from homeassistant.helpers.condition import Condition, make_entity_state_condition + +from .const import DOMAIN + +CONDITIONS: dict[str, type[Condition]] = { + "is_off": make_entity_state_condition(DOMAIN, STATE_OFF), + "is_on": make_entity_state_condition(DOMAIN, STATE_ON), +} + + +async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]: + """Return the switch conditions.""" + return CONDITIONS diff --git a/homeassistant/components/switch/conditions.yaml b/homeassistant/components/switch/conditions.yaml new file mode 100644 index 00000000000..f293d020b45 --- /dev/null +++ b/homeassistant/components/switch/conditions.yaml @@ -0,0 +1,17 @@ +.condition_common: &condition_common + target: + entity: + domain: switch + fields: + behavior: + required: true + default: any + selector: + select: + translation_key: condition_behavior + options: + - all + - any + +is_off: *condition_common +is_on: *condition_common diff --git a/homeassistant/components/switch/icons.json b/homeassistant/components/switch/icons.json index 694acdfba58..31505e1b3d2 100644 --- a/homeassistant/components/switch/icons.json +++ b/homeassistant/components/switch/icons.json @@ -1,4 +1,12 @@ { + "conditions": { + "is_off": { + "condition": "mdi:toggle-switch-variant-off" + }, + "is_on": { + "condition": "mdi:toggle-switch-variant" + } + }, "entity_component": { "_": { "default": "mdi:toggle-switch-variant", diff --git a/homeassistant/components/switch/strings.json b/homeassistant/components/switch/strings.json index 7343fda5240..a5e84fafda8 100644 --- a/homeassistant/components/switch/strings.json +++ b/homeassistant/components/switch/strings.json @@ -1,8 +1,32 @@ { "common": { + "condition_behavior_description": "How the state should match on the targeted switches.", + "condition_behavior_name": "Behavior", "trigger_behavior_description": "The behavior of the targeted switches to trigger on.", "trigger_behavior_name": "Behavior" }, + "conditions": { + "is_off": { + "description": "Tests if one or more switches are off.", + "fields": { + "behavior": { + "description": "[%key:component::switch::common::condition_behavior_description%]", + "name": "[%key:component::switch::common::condition_behavior_name%]" + } + }, + "name": "Switch is off" + }, + "is_on": { + "description": "Tests if one or more switches are on.", + "fields": { + "behavior": { + "description": "[%key:component::switch::common::condition_behavior_description%]", + "name": "[%key:component::switch::common::condition_behavior_name%]" + } + }, + "name": "Switch is on" + } + }, "device_automation": { "action_type": { "toggle": "[%key:common::device_automation::action_type::toggle%]", @@ -46,6 +70,12 @@ } }, "selector": { + "condition_behavior": { + "options": { + "all": "All", + "any": "Any" + } + }, "trigger_behavior": { "options": { "any": "Any", diff --git a/tests/components/switch/test_condition.py b/tests/components/switch/test_condition.py new file mode 100644 index 00000000000..172bcb2657e --- /dev/null +++ b/tests/components/switch/test_condition.py @@ -0,0 +1,178 @@ +"""Test switch conditions.""" + +from typing import Any + +import pytest + +from homeassistant.const import STATE_OFF, STATE_ON +from homeassistant.core import HomeAssistant + +from tests.components import ( + ConditionStateDescription, + assert_condition_gated_by_labs_flag, + create_target_condition, + parametrize_condition_states_all, + parametrize_condition_states_any, + parametrize_target_entities, + set_or_remove_state, + target_entities, +) + + +@pytest.fixture +async def target_lights(hass: HomeAssistant) -> list[str]: + """Create multiple light entities associated with different targets. + + Note: The lights are used to ensure that only switch entities are considered + in the condition evaluation and not other toggle entities. + """ + return (await target_entities(hass, "light"))["included"] + + +@pytest.fixture +async def target_switches(hass: HomeAssistant) -> list[str]: + """Create multiple switch entities associated with different targets.""" + return (await target_entities(hass, "switch"))["included"] + + +@pytest.mark.parametrize( + "condition", + [ + "switch.is_off", + "switch.is_on", + ], +) +async def test_switch_conditions_gated_by_labs_flag( + hass: HomeAssistant, caplog: pytest.LogCaptureFixture, condition: str +) -> None: + """Test the switch conditions are gated by the labs flag.""" + await assert_condition_gated_by_labs_flag(hass, caplog, condition) + + +@pytest.mark.usefixtures("enable_labs_preview_features") +@pytest.mark.parametrize( + ("condition_target_config", "entity_id", "entities_in_target"), + parametrize_target_entities("switch"), +) +@pytest.mark.parametrize( + ("condition", "condition_options", "states"), + [ + *parametrize_condition_states_any( + condition="switch.is_on", + target_states=[STATE_ON], + other_states=[STATE_OFF], + ), + *parametrize_condition_states_any( + condition="switch.is_off", + target_states=[STATE_OFF], + other_states=[STATE_ON], + ), + ], +) +async def test_switch_state_condition_behavior_any( + hass: HomeAssistant, + target_lights: list[str], + target_switches: 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 switch state condition with the 'any' behavior.""" + other_entity_ids = set(target_switches) - {entity_id} + + # Set all switches, including the tested switch, to the initial state + for eid in target_switches: + set_or_remove_state(hass, eid, states[0]["included"]) + await hass.async_block_till_done() + + condition = await create_target_condition( + hass, + condition=condition, + target=condition_target_config, + behavior="any", + ) + + # Set state for lights to ensure that they don't impact the condition + for state in states: + for eid in target_lights: + set_or_remove_state(hass, eid, state["included"]) + await hass.async_block_till_done() + assert condition(hass) is False + + for state in states: + included_state = state["included"] + set_or_remove_state(hass, entity_id, included_state) + await hass.async_block_till_done() + assert condition(hass) == state["condition_true"] + + # Check if changing other lights also passes the condition + for other_entity_id in other_entity_ids: + set_or_remove_state(hass, other_entity_id, included_state) + await hass.async_block_till_done() + assert condition(hass) == state["condition_true"] + + +@pytest.mark.usefixtures("enable_labs_preview_features") +@pytest.mark.parametrize( + ("condition_target_config", "entity_id", "entities_in_target"), + parametrize_target_entities("switch"), +) +@pytest.mark.parametrize( + ("condition", "condition_options", "states"), + [ + *parametrize_condition_states_all( + condition="switch.is_on", + target_states=[STATE_ON], + other_states=[STATE_OFF], + ), + *parametrize_condition_states_all( + condition="switch.is_off", + target_states=[STATE_OFF], + other_states=[STATE_ON], + ), + ], +) +async def test_switch_state_condition_behavior_all( + hass: HomeAssistant, + target_switches: 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 switch state condition with the 'all' behavior.""" + # Set state for two switches to ensure that they don't impact the condition + hass.states.async_set("switch.label_switch_1", STATE_OFF) + hass.states.async_set("switch.label_switch_2", STATE_ON) + + other_entity_ids = set(target_switches) - {entity_id} + + # Set all switches, including the tested switch, to the initial state + for eid in target_switches: + set_or_remove_state(hass, eid, states[0]["included"]) + await hass.async_block_till_done() + + condition = await create_target_condition( + hass, + condition=condition, + target=condition_target_config, + behavior="all", + ) + + for state in states: + included_state = state["included"] + + set_or_remove_state(hass, entity_id, included_state) + await hass.async_block_till_done() + assert condition(hass) == state["condition_true_first_entity"] + + for other_entity_id in other_entity_ids: + set_or_remove_state(hass, other_entity_id, included_state) + await hass.async_block_till_done() + + assert condition(hass) == state["condition_true"] diff --git a/tests/helpers/test_icon.py b/tests/helpers/test_icon.py index 222de84b21c..42a089167fa 100644 --- a/tests/helpers/test_icon.py +++ b/tests/helpers/test_icon.py @@ -188,10 +188,12 @@ async def test_caching(hass: HomeAssistant) -> None: side_effect=icon.build_resources, ) as mock_build: load1 = await icon.async_get_icons(hass, "entity_component") - assert len(mock_build.mock_calls) == 3 # entity_component, services, triggers + # conditions, entity_component, services, triggers + assert len(mock_build.mock_calls) == 4 load2 = await icon.async_get_icons(hass, "entity_component") - assert len(mock_build.mock_calls) == 3 # entity_component, services, triggers + # conditions, entity_component, services, triggers + assert len(mock_build.mock_calls) == 4 assert load1 == load2