add tests

homeassistant/components/automation/__init__.py

@@ -159,6 +159,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "text",
     "update",
     "vacuum",
+    "valve",
 }
 
 

homeassistant/components/valve/icons.json

@@ -32,5 +32,13 @@
     "toggle": {
       "service": "mdi:valve-open"
     }
+  },
+  "triggers": {
+    "closed": {
+      "trigger": "mdi:valve-closed"
+    },
+    "opened": {
+      "trigger": "mdi:valve-open"
+    }
   }
 }

homeassistant/components/valve/strings.json

@@ -1,4 +1,8 @@
 {
+  "common": {
+    "trigger_behavior_description": "The behavior of the targeted valves to trigger on.",
+    "trigger_behavior_name": "Behavior"
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::valve::title%]",
@@ -22,6 +26,15 @@
       "name": "Water"
     }
   },
+  "selector": {
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "close_valve": {
       "description": "Closes a valve.",
@@ -50,5 +63,27 @@
       "name": "[%key:common::action::toggle%]"
     }
   },
-  "title": "Valve"
+  "title": "Valve",
+  "triggers": {
+    "closed": {
+      "description": "Triggers after one or more valves close.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::valve::common::trigger_behavior_description%]",
+          "name": "[%key:component::valve::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Valve closed"
+    },
+    "opened": {
+      "description": "Triggers after one or more valves open.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::valve::common::trigger_behavior_description%]",
+          "name": "[%key:component::valve::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Valve opened"
+    }
+  }
 }

homeassistant/components/valve/trigger.py

@@ -0,0 +1,18 @@
+"""Provides triggers for valves."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.trigger import Trigger, make_entity_target_state_trigger
+
+from .const import DOMAIN, ValveState
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "closed": make_entity_target_state_trigger(DOMAIN, ValveState.CLOSED),
+    "opened": make_entity_target_state_trigger(
+        DOMAIN, {ValveState.OPEN, ValveState.OPENING}
+    ),
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for valves."""
+    return TRIGGERS

homeassistant/components/valve/triggers.yaml

@@ -0,0 +1,18 @@
+.trigger_common: &trigger_common
+  target:
+    entity:
+      domain: valve
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: trigger_behavior
+          options:
+            - first
+            - last
+            - any
+
+closed: *trigger_common
+opened: *trigger_common

tests/components/valve/test_trigger.py

@@ -0,0 +1,220 @@
+"""Test valve trigger."""
+
+from typing import Any
+
+import pytest
+
+from homeassistant.components.valve.const import DOMAIN, ValveState
+from homeassistant.const import ATTR_LABEL_ID, CONF_ENTITY_ID
+from homeassistant.core import HomeAssistant, ServiceCall
+
+from tests.components import (
+    TriggerStateDescription,
+    arm_trigger,
+    other_states,
+    parametrize_target_entities,
+    parametrize_trigger_states,
+    set_or_remove_state,
+    target_entities,
+)
+
+
+@pytest.fixture
+async def target_valves(hass: HomeAssistant) -> list[str]:
+    """Create multiple valve entities associated with different targets."""
+    return (await target_entities(hass, DOMAIN))["included"]
+
+
+@pytest.mark.parametrize(
+    "trigger_key",
+    [
+        "valve.closed",
+        "valve.opened",
+    ],
+)
+async def test_valve_triggers_gated_by_labs_flag(
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, trigger_key: str
+) -> None:
+    """Test the valve triggers are gated by the labs flag."""
+    await arm_trigger(hass, trigger_key, None, {ATTR_LABEL_ID: "test_label"})
+    assert (
+        "Unnamed automation failed to setup triggers and has been disabled: Trigger "
+        f"'{trigger_key}' requires the experimental 'New triggers and conditions' "
+        "feature to be enabled in Home Assistant Labs settings (feature flag: "
+        "'new_triggers_conditions')"
+    ) in caplog.text
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("trigger_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities(DOMAIN),
+)
+@pytest.mark.parametrize(
+    ("trigger", "trigger_options", "states"),
+    [
+        *parametrize_trigger_states(
+            trigger="valve.closed",
+            target_states=[ValveState.CLOSED],
+            other_states=other_states(ValveState.CLOSED),
+        ),
+        *parametrize_trigger_states(
+            trigger="valve.opened",
+            target_states=[ValveState.OPEN, ValveState.OPENING],
+            other_states=other_states([ValveState.OPEN, ValveState.OPENING]),
+        ),
+    ],
+)
+async def test_valve_state_trigger_behavior_any(
+    hass: HomeAssistant,
+    service_calls: list[ServiceCall],
+    target_valves: 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 that the valve state trigger fires when any valve state changes to a specific state."""
+    other_entity_ids = set(target_valves) - {entity_id}
+
+    # Set all valves, including the tested valve, to the initial state
+    for eid in target_valves:
+        set_or_remove_state(hass, eid, states[0]["included"])
+    await hass.async_block_till_done()
+
+    await arm_trigger(hass, trigger, trigger_options, trigger_target_config)
+
+    for state in states[1:]:
+        included_state = state["included"]
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        assert len(service_calls) == state["count"]
+        for service_call in service_calls:
+            assert service_call.data[CONF_ENTITY_ID] == entity_id
+        service_calls.clear()
+
+        # Check if changing other valves also triggers
+        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 len(service_calls) == (entities_in_target - 1) * state["count"]
+        service_calls.clear()
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("trigger_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities(DOMAIN),
+)
+@pytest.mark.parametrize(
+    ("trigger", "trigger_options", "states"),
+    [
+        *parametrize_trigger_states(
+            trigger="valve.closed",
+            target_states=[ValveState.CLOSED],
+            other_states=other_states(ValveState.CLOSED),
+        ),
+        *parametrize_trigger_states(
+            trigger="valve.opened",
+            target_states=[ValveState.OPEN, ValveState.OPENING],
+            other_states=other_states([ValveState.OPEN, ValveState.OPENING]),
+        ),
+    ],
+)
+async def test_valve_state_trigger_behavior_first(
+    hass: HomeAssistant,
+    service_calls: list[ServiceCall],
+    target_valves: list[str],
+    trigger_target_config: dict,
+    entities_in_target: int,
+    entity_id: str,
+    trigger: str,
+    trigger_options: dict[str, Any],
+    states: list[TriggerStateDescription],
+) -> None:
+    """Test that the valve state trigger fires when the first valve changes to a specific state."""
+    other_entity_ids = set(target_valves) - {entity_id}
+
+    # Set all valves, including the tested valve, to the initial state
+    for eid in target_valves:
+        set_or_remove_state(hass, eid, states[0]["included"])
+    await hass.async_block_till_done()
+
+    await arm_trigger(
+        hass, trigger, {"behavior": "first"} | trigger_options, trigger_target_config
+    )
+
+    for state in states[1:]:
+        included_state = state["included"]
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        assert len(service_calls) == state["count"]
+        for service_call in service_calls:
+            assert service_call.data[CONF_ENTITY_ID] == entity_id
+        service_calls.clear()
+
+        # Triggering other valves should not cause the trigger to fire again
+        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 len(service_calls) == 0
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("trigger_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("valve"),
+)
+@pytest.mark.parametrize(
+    ("trigger", "trigger_options", "states"),
+    [
+        *parametrize_trigger_states(
+            trigger="valve.closed",
+            target_states=[ValveState.CLOSED],
+            other_states=other_states(ValveState.CLOSED),
+        ),
+        *parametrize_trigger_states(
+            trigger="valve.opened",
+            target_states=[ValveState.OPEN, ValveState.OPENING],
+            other_states=other_states([ValveState.OPEN, ValveState.OPENING]),
+        ),
+    ],
+)
+async def test_valve_state_trigger_behavior_last(
+    hass: HomeAssistant,
+    service_calls: list[ServiceCall],
+    target_valves: list[str],
+    trigger_target_config: dict,
+    entities_in_target: int,
+    entity_id: str,
+    trigger: str,
+    trigger_options: dict[str, Any],
+    states: list[TriggerStateDescription],
+) -> None:
+    """Test that the valve state trigger fires when the last valve changes to a specific state."""
+    other_entity_ids = set(target_valves) - {entity_id}
+
+    # Set all valves, including the tested valve, to the initial state
+    for eid in target_valves:
+        set_or_remove_state(hass, eid, states[0]["included"])
+    await hass.async_block_till_done()
+
+    await arm_trigger(
+        hass, trigger, {"behavior": "last"} | trigger_options, trigger_target_config
+    )
+
+    for state in states[1:]:
+        included_state = state["included"]
+        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 len(service_calls) == 0
+
+        set_or_remove_state(hass, entity_id, included_state)
+        await hass.async_block_till_done()
+        assert len(service_calls) == state["count"]
+        for service_call in service_calls:
+            assert service_call.data[CONF_ENTITY_ID] == entity_id
+        service_calls.clear()