Show device details in homekit accessory service info (#35100)
* Show device info in homekit accessory service info * fix conflict
This commit is contained in:
1 parent
6d9f561853
commit
0a9b373edb
8 files changed
+168
-44
No files matched your search
@@ -14,6 +14,10 @@ from homeassistant.components.homekit.accessories import (
|
||||
)
|
||||
from homeassistant.components.homekit.const import (
|
||||
ATTR_DISPLAY_NAME,
|
||||
ATTR_INTERGRATION,
|
||||
ATTR_MANUFACTURER,
|
||||
ATTR_MODEL,
|
||||
ATTR_SOFTWARE_VERSION,
|
||||
ATTR_VALUE,
|
||||
BRIDGE_MODEL,
|
||||
BRIDGE_NAME,
|
||||
@@ -80,11 +84,17 @@ async def test_debounce(hass):
|
||||
|
||||
async def test_home_accessory(hass, hk_driver):
|
||||
"""Test HomeAccessory class."""
|
||||
entity_id = "homekit.accessory"
|
||||
entity_id = "sensor.accessory"
|
||||
entity_id2 = "light.accessory"
|
||||
|
||||
hass.states.async_set(entity_id, None)
|
||||
hass.states.async_set(entity_id2, None)
|
||||
|
||||
await hass.async_block_till_done()
|
||||
|
||||
acc = HomeAccessory(hass, hk_driver, "Home Accessory", entity_id, 2, None)
|
||||
acc = HomeAccessory(
|
||||
hass, hk_driver, "Home Accessory", entity_id, 2, {"platform": "isy994"}
|
||||
)
|
||||
assert acc.hass == hass
|
||||
assert acc.display_name == "Home Accessory"
|
||||
assert acc.aid == 2
|
||||
@@ -93,9 +103,35 @@ async def test_home_accessory(hass, hk_driver):
|
||||
serv = acc.services[0] # SERV_ACCESSORY_INFO
|
||||
assert serv.display_name == SERV_ACCESSORY_INFO
|
||||
assert serv.get_characteristic(CHAR_NAME).value == "Home Accessory"
|
||||
assert serv.get_characteristic(CHAR_MANUFACTURER).value == MANUFACTURER
|
||||
assert serv.get_characteristic(CHAR_MODEL).value == "Homekit"
|
||||
assert serv.get_characteristic(CHAR_SERIAL_NUMBER).value == "homekit.accessory"
|
||||
assert serv.get_characteristic(CHAR_MANUFACTURER).value == "Isy994"
|
||||
assert serv.get_characteristic(CHAR_MODEL).value == "Sensor"
|
||||
assert serv.get_characteristic(CHAR_SERIAL_NUMBER).value == "sensor.accessory"
|
||||
|
||||
acc2 = HomeAccessory(hass, hk_driver, "Home Accessory", entity_id2, 3, {})
|
||||
serv = acc2.services[0] # SERV_ACCESSORY_INFO
|
||||
assert serv.get_characteristic(CHAR_NAME).value == "Home Accessory"
|
||||
assert serv.get_characteristic(CHAR_MANUFACTURER).value == f"{MANUFACTURER} Light"
|
||||
assert serv.get_characteristic(CHAR_MODEL).value == "Light"
|
||||
assert serv.get_characteristic(CHAR_SERIAL_NUMBER).value == "light.accessory"
|
||||
|
||||
acc3 = HomeAccessory(
|
||||
hass,
|
||||
hk_driver,
|
||||
"Home Accessory",
|
||||
entity_id2,
|
||||
3,
|
||||
{
|
||||
ATTR_MODEL: "Awesome",
|
||||
ATTR_MANUFACTURER: "Lux Brands",
|
||||
ATTR_SOFTWARE_VERSION: "0.4.3",
|
||||
ATTR_INTERGRATION: "luxe",
|
||||
},
|
||||
)
|
||||
serv = acc3.services[0] # SERV_ACCESSORY_INFO
|
||||
assert serv.get_characteristic(CHAR_NAME).value == "Home Accessory"
|
||||
assert serv.get_characteristic(CHAR_MANUFACTURER).value == "Lux Brands"
|
||||
assert serv.get_characteristic(CHAR_MODEL).value == "Awesome"
|
||||
assert serv.get_characteristic(CHAR_SERIAL_NUMBER).value == "light.accessory"
|
||||
|
||||
hass.states.async_set(entity_id, "on")
|
||||
await hass.async_block_till_done()
|
||||
@@ -441,9 +477,7 @@ async def test_battery_appears_after_startup(hass, hk_driver, caplog):
|
||||
hass.states.async_set(entity_id, None, {})
|
||||
await hass.async_block_till_done()
|
||||
|
||||
acc = HomeAccessory(
|
||||
hass, hk_driver, "Accessory without battery", entity_id, 2, None
|
||||
)
|
||||
acc = HomeAccessory(hass, hk_driver, "Accessory without battery", entity_id, 2, {})
|
||||
assert acc._char_battery is None
|
||||
|
||||
with patch(
|
||||
@@ -469,7 +503,7 @@ async def test_call_service(hass, hk_driver, events):
|
||||
hass.states.async_set(entity_id, None)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
acc = HomeAccessory(hass, hk_driver, "Home Accessory", entity_id, 2, None)
|
||||
acc = HomeAccessory(hass, hk_driver, "Home Accessory", entity_id, 2, {})
|
||||
call_service = async_mock_service(hass, "cover", "open_cover")
|
||||
|
||||
test_domain = "cover"
|
||||
|
||||
@@ -5,6 +5,7 @@ import homeassistant.components.climate as climate
|
||||
import homeassistant.components.cover as cover
|
||||
from homeassistant.components.homekit.accessories import TYPES, get_accessory
|
||||
from homeassistant.components.homekit.const import (
|
||||
ATTR_INTERGRATION,
|
||||
CONF_FEATURE_LIST,
|
||||
FEATURE_ON_OFF,
|
||||
TYPE_FAUCET,
|
||||
@@ -61,10 +62,12 @@ def test_not_supported_media_player():
|
||||
def test_customize_options(config, name):
|
||||
"""Test with customized options."""
|
||||
mock_type = Mock()
|
||||
conf = config.copy()
|
||||
conf[ATTR_INTERGRATION] = "platform_name"
|
||||
with patch.dict(TYPES, {"Light": mock_type}):
|
||||
entity_state = State("light.demo", "on")
|
||||
get_accessory(None, None, entity_state, 2, config)
|
||||
mock_type.assert_called_with(None, None, name, "light.demo", 2, config)
|
||||
get_accessory(None, None, entity_state, 2, conf)
|
||||
mock_type.assert_called_with(None, None, name, "light.demo", 2, conf)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
@@ -254,7 +257,7 @@ def test_type_switches(type_name, entity_id, state, attrs, config):
|
||||
| vacuum.SUPPORT_RETURN_HOME
|
||||
},
|
||||
),
|
||||
("Switch", "vacuum.basic_vacuum", "off", {},),
|
||||
("Switch", "vacuum.basic_vacuum", "off", {}),
|
||||
],
|
||||
)
|
||||
def test_type_vacuum(type_name, entity_id, state, attrs):
|
||||
|
||||
@@ -703,25 +703,28 @@ async def test_homekit_finds_linked_batteries(
|
||||
config_entry.add_to_hass(hass)
|
||||
device_entry = device_reg.async_get_or_create(
|
||||
config_entry_id=config_entry.entry_id,
|
||||
sw_version="0.16.0",
|
||||
model="Powerwall 2",
|
||||
manufacturer="Tesla",
|
||||
connections={(device_registry.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
|
||||
)
|
||||
|
||||
binary_charging_sensor = entity_reg.async_get_or_create(
|
||||
"binary_sensor",
|
||||
"light",
|
||||
"powerwall",
|
||||
"battery_charging",
|
||||
device_id=device_entry.id,
|
||||
device_class=DEVICE_CLASS_BATTERY_CHARGING,
|
||||
)
|
||||
battery_sensor = entity_reg.async_get_or_create(
|
||||
"sensor",
|
||||
"light",
|
||||
"powerwall",
|
||||
"battery",
|
||||
device_id=device_entry.id,
|
||||
device_class=DEVICE_CLASS_BATTERY,
|
||||
)
|
||||
light = entity_reg.async_get_or_create(
|
||||
"light", "light", "demo", device_id=device_entry.id
|
||||
"light", "powerwall", "demo", device_id=device_entry.id
|
||||
)
|
||||
|
||||
hass.states.async_set(
|
||||
@@ -751,8 +754,11 @@ async def test_homekit_finds_linked_batteries(
|
||||
ANY,
|
||||
ANY,
|
||||
{
|
||||
"linked_battery_charging_sensor": "binary_sensor.light_battery_charging",
|
||||
"linked_battery_sensor": "sensor.light_battery",
|
||||
"manufacturer": "Tesla",
|
||||
"model": "Powerwall 2",
|
||||
"sw_version": "0.16.0",
|
||||
"linked_battery_charging_sensor": "binary_sensor.powerwall_battery_charging",
|
||||
"linked_battery_sensor": "sensor.powerwall_battery",
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user