Skip to content

[pull] dev from home-assistant:dev #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class AreaAlarmControlPanel(BoschAlarmAreaEntity, AlarmControlPanelEntity):

def __init__(self, panel: Panel, area_id: int, unique_id: str) -> None:
"""Initialise a Bosch Alarm control panel entity."""
super().__init__(panel, area_id, unique_id, False, False, True)
super().__init__(panel, area_id, unique_id, True, False, True)
self._attr_unique_id = self._area_unique_id

@property
Expand Down
10 changes: 10 additions & 0 deletions tests/components/bosch_alarm/test_alarm_control_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ async def test_update_alarm_device(

assert hass.states.get(entity_id).state == AlarmControlPanelState.ARMED_AWAY

area.is_triggered.return_value = True

await call_observable(hass, area.alarm_observer)

assert hass.states.get(entity_id).state == AlarmControlPanelState.TRIGGERED

area.is_triggered.return_value = False

await call_observable(hass, area.alarm_observer)

await hass.services.async_call(
ALARM_CONTROL_PANEL_DOMAIN,
SERVICE_ALARM_DISARM,
Expand Down
70 changes: 38 additions & 32 deletions tests/components/sonos/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ def __init__(self, service_type, ip_address="192.168.42.2") -> None:
self.subscribe = AsyncMock(return_value=SonosMockSubscribe(ip_address))


class SonosMockAlarmClock(SonosMockService):
"""Mock a Sonos AlarmClock Service used in callbacks."""

def __init__(self, return_value: dict[str, str], ip_address="192.168.42.2") -> None:
"""Initialize the instance."""
super().__init__("AlarmClock", ip_address)
self.ListAlarms = Mock(return_value=return_value)
self.UpdateAlarm = Mock()


class SonosMockEvent:
"""Mock a sonos Event used in callbacks."""

Expand Down Expand Up @@ -593,43 +603,39 @@ def music_library_fixture(


@pytest.fixture(name="alarm_clock")
def alarm_clock_fixture():
def alarm_clock_fixture() -> SonosMockAlarmClock:
"""Create alarmClock fixture."""
alarm_clock = SonosMockService("AlarmClock")
# pylint: disable-next=attribute-defined-outside-init
alarm_clock.ListAlarms = Mock()
alarm_clock.ListAlarms.return_value = {
"CurrentAlarmListVersion": "RINCON_test:14",
"CurrentAlarmList": "<Alarms>"
'<Alarm ID="14" StartTime="07:00:00" Duration="02:00:00" Recurrence="DAILY" '
'Enabled="1" RoomUUID="RINCON_test" ProgramURI="x-rincon-buzzer:0" '
'ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" Volume="25" '
'IncludeLinkedZones="0"/>'
"</Alarms>",
}
return alarm_clock
return SonosMockAlarmClock(
{
"CurrentAlarmListVersion": "RINCON_test:14",
"CurrentAlarmList": "<Alarms>"
'<Alarm ID="14" StartTime="07:00:00" Duration="02:00:00" Recurrence="DAILY" '
'Enabled="1" RoomUUID="RINCON_test" ProgramURI="x-rincon-buzzer:0" '
'ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" Volume="25" '
'IncludeLinkedZones="0"/>'
"</Alarms>",
}
)


@pytest.fixture(name="alarm_clock_extended")
def alarm_clock_fixture_extended():
def alarm_clock_fixture_extended() -> SonosMockAlarmClock:
"""Create alarmClock fixture."""
alarm_clock = SonosMockService("AlarmClock")
# pylint: disable-next=attribute-defined-outside-init
alarm_clock.ListAlarms = Mock()
alarm_clock.ListAlarms.return_value = {
"CurrentAlarmListVersion": "RINCON_test:15",
"CurrentAlarmList": "<Alarms>"
'<Alarm ID="14" StartTime="07:00:00" Duration="02:00:00" Recurrence="DAILY" '
'Enabled="1" RoomUUID="RINCON_test" ProgramURI="x-rincon-buzzer:0" '
'ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" Volume="25" '
'IncludeLinkedZones="0"/>'
'<Alarm ID="15" StartTime="07:00:00" Duration="02:00:00" '
'Recurrence="DAILY" Enabled="1" RoomUUID="RINCON_test" '
'ProgramURI="x-rincon-buzzer:0" ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" '
'Volume="25" IncludeLinkedZones="0"/>'
"</Alarms>",
}
return alarm_clock
return SonosMockAlarmClock(
{
"CurrentAlarmListVersion": "RINCON_test:15",
"CurrentAlarmList": "<Alarms>"
'<Alarm ID="14" StartTime="07:00:00" Duration="02:00:00" Recurrence="DAILY" '
'Enabled="1" RoomUUID="RINCON_test" ProgramURI="x-rincon-buzzer:0" '
'ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" Volume="25" '
'IncludeLinkedZones="0"/>'
'<Alarm ID="15" StartTime="07:00:00" Duration="02:00:00" '
'Recurrence="DAILY" Enabled="1" RoomUUID="RINCON_test" '
'ProgramURI="x-rincon-buzzer:0" ProgramMetaData="" PlayMode="SHUFFLE_NOREPEAT" '
'Volume="25" IncludeLinkedZones="0"/>'
"</Alarms>",
}
)


@pytest.fixture(name="speaker_model")
Expand Down
41 changes: 39 additions & 2 deletions tests/components/sonos/test_switch.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from datetime import timedelta
from unittest.mock import patch

import pytest

from homeassistant.components.sonos.const import DATA_SONOS_DISCOVERY_MANAGER
from homeassistant.components.sonos.switch import (
ATTR_DURATION,
Expand All @@ -13,13 +15,21 @@
ATTR_RECURRENCE,
ATTR_VOLUME,
)
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY
from homeassistant.const import ATTR_TIME, STATE_OFF, STATE_ON
from homeassistant.const import (
ATTR_ENTITY_ID,
ATTR_TIME,
SERVICE_TURN_OFF,
SERVICE_TURN_ON,
STATE_OFF,
STATE_ON,
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from homeassistant.util import dt as dt_util

from .conftest import SonosMockEvent
from .conftest import MockSoCo, SonosMockEvent

from tests.common import async_fire_time_changed

Expand Down Expand Up @@ -132,6 +142,33 @@ async def test_switch_attributes(
assert touch_controls_state.state == STATE_ON


@pytest.mark.parametrize(
("service", "expected_result"),
[
(SERVICE_TURN_OFF, "0"),
(SERVICE_TURN_ON, "1"),
],
)
async def test_switch_alarm_turn_on(
hass: HomeAssistant,
async_setup_sonos,
soco: MockSoCo,
service: str,
expected_result: str,
) -> None:
"""Test enabling and disabling of alarm."""
await async_setup_sonos()

await hass.services.async_call(
SWITCH_DOMAIN, service, {ATTR_ENTITY_ID: "switch.sonos_alarm_14"}, blocking=True
)

assert soco.alarmClock.UpdateAlarm.call_count == 1
call_args = soco.alarmClock.UpdateAlarm.call_args[0]
assert call_args[0][0] == ("ID", "14")
assert call_args[0][4] == ("Enabled", expected_result)


async def test_alarm_create_delete(
hass: HomeAssistant,
async_setup_sonos,
Expand Down