Add full test coverage for Comelit cover (#144761)

homeassistant/components/comelit/cover.py

@@ -7,7 +7,7 @@ from typing import Any, cast
 from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import COVER, STATE_COVER, STATE_OFF, STATE_ON
 
-from homeassistant.components.cover import CoverDeviceClass, CoverEntity, CoverState
+from homeassistant.components.cover import CoverDeviceClass, CoverEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -68,16 +68,10 @@ class ComelitCoverEntity(ComelitBridgeBaseEntity, RestoreEntity, CoverEntity):
     def is_closed(self) -> bool | None:
         """Return if the cover is closed."""
 
-        if self._last_state in [None, "unknown"]:
-            return None
-
-        if self.device_status != STATE_COVER.index("stopped"):
-            return False
-
         if self._last_action:
             return self._last_action == STATE_COVER.index("closing")
 
-        return self._last_state == CoverState.CLOSED
+        return None
 
     @property
     def is_closing(self) -> bool:

tests/components/comelit/test_cover.py

@@ -15,6 +15,7 @@ from homeassistant.components.cover import (
     SERVICE_STOP_COVER,
     STATE_CLOSED,
     STATE_CLOSING,
+    STATE_OPEN,
     STATE_OPENING,
 )
 from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN, Platform
@@ -94,7 +95,7 @@ async def test_cover_open(
     await hass.async_block_till_done()
 
     assert (state := hass.states.get(ENTITY_ID))
-    assert state.state == STATE_UNKNOWN
+    assert state.state == STATE_OPEN
 
 
 async def test_cover_close(
@@ -159,3 +160,36 @@ async def test_cover_stop_if_stopped(
 
     assert (state := hass.states.get(ENTITY_ID))
     assert state.state == STATE_UNKNOWN
+
+
+async def test_cover_restore_state(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_serial_bridge: AsyncMock,
+    mock_serial_bridge_config_entry: MockConfigEntry,
+) -> None:
+    """Test cover restore state on reload."""
+
+    mock_serial_bridge.reset_mock()
+    await setup_integration(hass, mock_serial_bridge_config_entry)
+
+    assert (state := hass.states.get(ENTITY_ID))
+    assert state.state == STATE_UNKNOWN
+
+    # Open cover
+    await hass.services.async_call(
+        COVER_DOMAIN,
+        SERVICE_OPEN_COVER,
+        {ATTR_ENTITY_ID: ENTITY_ID},
+        blocking=True,
+    )
+    mock_serial_bridge.set_device_status.assert_called()
+
+    assert (state := hass.states.get(ENTITY_ID))
+    assert state.state == STATE_OPENING
+
+    await hass.config_entries.async_reload(mock_serial_bridge_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert (state := hass.states.get(ENTITY_ID))
+    assert state.state == STATE_OPENING