Use position percentage for closed status in Velux (home-assistant#151679)

Co-authored-by: Copilot <[email protected]>

Author: 2 people

CODEOWNERS

@@ -4,8 +4,15 @@
 
 from typing import Any, cast
 
-from pyvlx import OpeningDevice, Position
-from pyvlx.opening_device import Awning, Blind, GarageDoor, Gate, RollerShutter
+from pyvlx import (
+    Awning,
+    Blind,
+    GarageDoor,
+    Gate,
+    OpeningDevice,
+    Position,
+    RollerShutter,
+)
 
 from homeassistant.components.cover import (
     ATTR_POSITION,
@@ -97,7 +104,10 @@ def current_cover_tilt_position(self) -> int | None:
     @property
     def is_closed(self) -> bool:
         """Return if the cover is closed."""
-        return self.node.position.closed
+        # do not use the node's closed state but rely on cover position
+        # until https://github.com/Julius2342/pyvlx/pull/543 is merged.
+        # once merged this can again return self.node.position.closed
+        return self.current_cover_position == 0
 
     @property
     def is_opening(self) -> bool:

homeassistant/components/velux/cover.py

@@ -1,7 +1,7 @@
 {
   "domain": "velux",
   "name": "Velux",
-  "codeowners": ["@Julius2342", "@DeerMaximum", "@pawlizio"],
+  "codeowners": ["@Julius2342", "@DeerMaximum", "@pawlizio", "@wollew"],
   "config_flow": true,
   "dhcp": [
     {

homeassistant/components/velux/manifest.json

@@ -1 +1,31 @@
 """Tests for the Velux integration."""
+
+from unittest.mock import MagicMock
+
+from freezegun.api import FrozenDateTimeFactory
+
+from homeassistant.helpers.device_registry import HomeAssistant
+from homeassistant.helpers.entity_platform import timedelta
+
+from tests.common import async_fire_time_changed
+
+
+async def update_callback_entity(
+    hass: HomeAssistant, mock_velux_node: MagicMock
+) -> None:
+    """Simulate an update triggered by the pyvlx lib for a Velux node."""
+
+    callback = mock_velux_node.register_device_updated_cb.call_args[0][0]
+    await callback(mock_velux_node)
+    await hass.async_block_till_done()
+
+
+async def update_polled_entities(
+    hass: HomeAssistant, freezer: FrozenDateTimeFactory
+) -> None:
+    """Simulate an update trigger from polling."""
+    # just fire a time changed event to trigger the polling
+
+    freezer.tick(timedelta(minutes=5))
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()

tests/components/velux/__init__.py

@@ -72,6 +72,9 @@ def mock_window() -> AsyncMock:
     window.rain_sensor = True
     window.serial_number = "123456789"
     window.get_limitation.return_value = MagicMock(min_value=0)
+    window.is_opening = False
+    window.is_closing = False
+    window.position = MagicMock(position_percent=30, closed=False)
     return window
 
 

tests/components/velux/conftest.py

@@ -1,6 +1,5 @@
 """Tests for the Velux binary sensor platform."""
 
-from datetime import timedelta
 from unittest.mock import MagicMock, patch
 
 from freezegun.api import FrozenDateTimeFactory
@@ -11,7 +10,9 @@
 from homeassistant.helpers.device_registry import DeviceRegistry
 from homeassistant.helpers.entity_registry import EntityRegistry
 
-from tests.common import MockConfigEntry, async_fire_time_changed
+from . import update_polled_entities
+
+from tests.common import MockConfigEntry
 
 
 @pytest.mark.usefixtures("entity_registry_enabled_by_default")
@@ -33,9 +34,7 @@ async def test_rain_sensor_state(
     test_entity_id = "binary_sensor.test_window_rain_sensor"
 
     # simulate no rain detected
-    freezer.tick(timedelta(minutes=5))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
+    await update_polled_entities(hass, freezer)
     state = hass.states.get(test_entity_id)
     assert state is not None
     assert state.state == STATE_OFF
@@ -49,9 +48,7 @@ async def test_rain_sensor_state(
 
     # simulate rain detected (other Velux models report 93)
     mock_window.get_limitation.return_value.min_value = 93
-    freezer.tick(timedelta(minutes=5))
-    async_fire_time_changed(hass)
-    await hass.async_block_till_done()
+    await update_polled_entities(hass, freezer)
     state = hass.states.get(test_entity_id)
     assert state is not None
     assert state.state == STATE_ON

tests/components/velux/test_binary_sensor.py

@@ -0,0 +1,48 @@
+"""Tests for the Velux cover platform."""
+
+from unittest.mock import AsyncMock, patch
+
+from freezegun.api import FrozenDateTimeFactory
+import pytest
+
+from homeassistant.const import STATE_CLOSED, STATE_OPEN, Platform
+from homeassistant.core import HomeAssistant
+
+from . import update_callback_entity
+
+from tests.common import MockConfigEntry
+
+
+@pytest.mark.usefixtures("mock_module")
+async def test_cover_closed(
+    hass: HomeAssistant,
+    mock_window: AsyncMock,
+    mock_config_entry: MockConfigEntry,
+    freezer: FrozenDateTimeFactory,
+) -> None:
+    """Test the cover closed state."""
+
+    mock_config_entry.add_to_hass(hass)
+    with patch("homeassistant.components.velux.PLATFORMS", [Platform.COVER]):
+        assert await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    test_entity_id = "cover.test_window"
+
+    # Initial state should be open
+    state = hass.states.get(test_entity_id)
+    assert state is not None
+    assert state.state == STATE_OPEN
+
+    # Update mock window position to closed percentage
+    mock_window.position.position_percent = 100
+    # Also directly set position to closed, so this test should
+    # continue to be green after the lib is fixed
+    mock_window.position.closed = True
+
+    # Trigger entity state update via registered callback
+    await update_callback_entity(hass, mock_window)
+
+    state = hass.states.get(test_entity_id)
+    assert state is not None
+    assert state.state == STATE_CLOSED