From 231d434b760097ac142da3968892ce034e5d0f38 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Fri, 3 Dec 2021 18:25:22 +0100 Subject: [PATCH] Use new Platform enum in Onewire (#60904) * Use new Platform enum in Onewire * Use Platform in tests Co-authored-by: epenet --- homeassistant/components/onewire/const.py | 10 ++-- tests/components/onewire/const.py | 60 +++++++++---------- .../components/onewire/test_binary_sensor.py | 10 ++-- tests/components/onewire/test_sensor.py | 16 ++--- tests/components/onewire/test_switch.py | 12 ++-- 5 files changed, 52 insertions(+), 56 deletions(-) diff --git a/homeassistant/components/onewire/const.py b/homeassistant/components/onewire/const.py index f9f40e49ced..91f931e2517 100644 --- a/homeassistant/components/onewire/const.py +++ b/homeassistant/components/onewire/const.py @@ -1,9 +1,7 @@ """Constants for 1-Wire component.""" from __future__ import annotations -from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN -from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN +from homeassistant.const import Platform CONF_MOUNT_DIR = "mount_dir" CONF_NAMES = "names" @@ -48,7 +46,7 @@ READ_MODE_FLOAT = "float" READ_MODE_INT = "int" PLATFORMS = [ - BINARY_SENSOR_DOMAIN, - SENSOR_DOMAIN, - SWITCH_DOMAIN, + Platform.BINARY_SENSOR, + Platform.SENSOR, + Platform.SWITCH, ] diff --git a/tests/components/onewire/const.py b/tests/components/onewire/const.py index c38f5e53847..2153e153961 100644 --- a/tests/components/onewire/const.py +++ b/tests/components/onewire/const.py @@ -2,20 +2,18 @@ from pi1wire import InvalidCRCException, UnsupportResponseException from pyownet.protocol import Error as ProtocolError -from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN from homeassistant.components.onewire.const import ( DOMAIN, MANUFACTURER_EDS, MANUFACTURER_HOBBYBOARDS, MANUFACTURER_MAXIM, + Platform, ) from homeassistant.components.sensor import ( ATTR_STATE_CLASS, - DOMAIN as SENSOR_DOMAIN, SensorDeviceClass, SensorStateClass, ) -from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, @@ -70,7 +68,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS2405", ATTR_NAME: "05.111111111111", }, - SWITCH_DOMAIN: [ + Platform.SWITCH: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "switch.05_111111111111_pio", @@ -90,7 +88,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS18S20", ATTR_NAME: "10.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.my_ds18b20_temperature", @@ -112,7 +110,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS2406", ATTR_NAME: "12.111111111111", }, - BINARY_SENSOR_DOMAIN: [ + Platform.BINARY_SENSOR: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "binary_sensor.12_111111111111_sensed_a", @@ -128,7 +126,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_UNIQUE_ID: "/12.111111111111/sensed.B", }, ], - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEFAULT_DISABLED: True, ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, @@ -150,7 +148,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_UNIT_OF_MEASUREMENT: PRESSURE_MBAR, }, ], - SWITCH_DOMAIN: [ + Platform.SWITCH: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "switch.12_111111111111_pio_a", @@ -191,7 +189,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS2423", ATTR_NAME: "1D.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_ENTITY_ID: "sensor.1d_111111111111_counter_a", ATTR_INJECT_READS: b" 251123", @@ -236,7 +234,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_INJECT_READS: [ b"DS2423", # read device type ], - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_FILE: "/1F.111111111111/main/1D.111111111111/counter.A", ATTR_ENTITY_ID: "sensor.1d_111111111111_counter_a", @@ -270,7 +268,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS1822", ATTR_NAME: "22.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.22_111111111111_temperature", @@ -292,7 +290,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS2438", ATTR_NAME: "26.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.26_111111111111_temperature", @@ -403,7 +401,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_UNIT_OF_MEASUREMENT: ELECTRIC_POTENTIAL_VOLT, }, ], - SWITCH_DOMAIN: [ + Platform.SWITCH: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_CATEGORY: EntityCategory.CONFIG, @@ -424,7 +422,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS18B20", ATTR_NAME: "28.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.28_111111111111_temperature", @@ -446,7 +444,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS2408", ATTR_NAME: "29.111111111111", }, - BINARY_SENSOR_DOMAIN: [ + Platform.BINARY_SENSOR: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "binary_sensor.29_111111111111_sensed_0", @@ -504,7 +502,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_UNIQUE_ID: "/29.111111111111/sensed.7", }, ], - SWITCH_DOMAIN: [ + Platform.SWITCH: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "switch.29_111111111111_pio_0", @@ -629,7 +627,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS2413", ATTR_NAME: "3A.111111111111", }, - BINARY_SENSOR_DOMAIN: [ + Platform.BINARY_SENSOR: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "binary_sensor.3a_111111111111_sensed_a", @@ -645,7 +643,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_UNIQUE_ID: "/3A.111111111111/sensed.B", }, ], - SWITCH_DOMAIN: [ + Platform.SWITCH: [ { ATTR_DEFAULT_DISABLED: True, ATTR_ENTITY_ID: "switch.3a_111111111111_pio_a", @@ -672,7 +670,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS1825", ATTR_NAME: "3B.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.3b_111111111111_temperature", @@ -694,7 +692,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "DS28EA00", ATTR_NAME: "42.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.42_111111111111_temperature", @@ -716,7 +714,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "HobbyBoards_EF", ATTR_NAME: "EF.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.HUMIDITY, ATTR_ENTITY_ID: "sensor.ef_111111111111_humidity", @@ -760,7 +758,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "HB_MOISTURE_METER", ATTR_NAME: "EF.111111111112", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.HUMIDITY, ATTR_ENTITY_ID: "sensor.ef_111111111112_wetness_0", @@ -810,7 +808,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "EDS0068", ATTR_NAME: "7E.111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.7e_111111111111_temperature", @@ -860,7 +858,7 @@ MOCK_OWPROXY_DEVICES = { ATTR_MODEL: "EDS0066", ATTR_NAME: "7E.222222222222", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.7e_222222222222_temperature", @@ -894,7 +892,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "10", ATTR_NAME: "10-111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.my_ds18b20_temperature", @@ -913,7 +911,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "22", ATTR_NAME: "22-111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.22_111111111111_temperature", @@ -932,7 +930,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "28", ATTR_NAME: "28-111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.28_111111111111_temperature", @@ -951,7 +949,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "3B", ATTR_NAME: "3B-111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.3b_111111111111_temperature", @@ -970,7 +968,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "42", ATTR_NAME: "42-111111111111", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.42_111111111111_temperature", @@ -989,7 +987,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "42", ATTR_NAME: "42-111111111112", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.42_111111111112_temperature", @@ -1008,7 +1006,7 @@ MOCK_SYSBUS_DEVICES = { ATTR_MODEL: "42", ATTR_NAME: "42-111111111113", }, - SENSOR_DOMAIN: [ + Platform.SENSOR: [ { ATTR_DEVICE_CLASS: SensorDeviceClass.TEMPERATURE, ATTR_ENTITY_ID: "sensor.42_111111111113_temperature", diff --git a/tests/components/onewire/test_binary_sensor.py b/tests/components/onewire/test_binary_sensor.py index 32a2c018028..ee55a550cea 100644 --- a/tests/components/onewire/test_binary_sensor.py +++ b/tests/components/onewire/test_binary_sensor.py @@ -4,8 +4,8 @@ from unittest.mock import MagicMock, patch import pytest -from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN from homeassistant.config_entries import ConfigEntry +from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers.config_validation import ensure_list @@ -23,7 +23,7 @@ from tests.common import mock_device_registry, mock_registry @pytest.fixture(autouse=True) def override_platforms(): """Override PLATFORMS.""" - with patch("homeassistant.components.onewire.PLATFORMS", [BINARY_SENSOR_DOMAIN]): + with patch("homeassistant.components.onewire.PLATFORMS", [Platform.BINARY_SENSOR]): yield @@ -42,10 +42,10 @@ async def test_owserver_binary_sensor( entity_registry = mock_registry(hass) mock_device = MOCK_OWPROXY_DEVICES[device_id] - expected_entities = mock_device.get(BINARY_SENSOR_DOMAIN, []) + expected_entities = mock_device.get(Platform.BINARY_SENSOR, []) expected_devices = ensure_list(mock_device.get(ATTR_DEVICE_INFO)) - setup_owproxy_mock_devices(owproxy, BINARY_SENSOR_DOMAIN, [device_id]) + setup_owproxy_mock_devices(owproxy, Platform.BINARY_SENSOR, [device_id]) with caplog.at_level(logging.WARNING, logger="homeassistant.components.onewire"): await hass.config_entries.async_setup(config_entry.entry_id) await hass.async_block_till_done() @@ -58,7 +58,7 @@ async def test_owserver_binary_sensor( assert len(entity_registry.entities) == len(expected_entities) check_and_enable_disabled_entities(entity_registry, expected_entities) - setup_owproxy_mock_devices(owproxy, BINARY_SENSOR_DOMAIN, [device_id]) + setup_owproxy_mock_devices(owproxy, Platform.BINARY_SENSOR, [device_id]) await hass.config_entries.async_reload(config_entry.entry_id) await hass.async_block_till_done() diff --git a/tests/components/onewire/test_sensor.py b/tests/components/onewire/test_sensor.py index 81143943057..6bfc68d85c8 100644 --- a/tests/components/onewire/test_sensor.py +++ b/tests/components/onewire/test_sensor.py @@ -4,8 +4,8 @@ from unittest.mock import MagicMock, patch import pytest -from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN from homeassistant.config_entries import ConfigEntry +from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers.config_validation import ensure_list @@ -29,7 +29,7 @@ from tests.common import mock_device_registry, mock_registry @pytest.fixture(autouse=True) def override_platforms(): """Override PLATFORMS.""" - with patch("homeassistant.components.onewire.PLATFORMS", [SENSOR_DOMAIN]): + with patch("homeassistant.components.onewire.PLATFORMS", [Platform.SENSOR]): yield @@ -48,14 +48,14 @@ async def test_owserver_sensor( entity_registry = mock_registry(hass) mock_device = MOCK_OWPROXY_DEVICES[device_id] - expected_entities = mock_device.get(SENSOR_DOMAIN, []) + expected_entities = mock_device.get(Platform.SENSOR, []) if "branches" in mock_device: for branch_details in mock_device["branches"].values(): for sub_device in branch_details.values(): - expected_entities += sub_device[SENSOR_DOMAIN] + expected_entities += sub_device[Platform.SENSOR] expected_devices = ensure_list(mock_device.get(ATTR_DEVICE_INFO)) - setup_owproxy_mock_devices(owproxy, SENSOR_DOMAIN, [device_id]) + setup_owproxy_mock_devices(owproxy, Platform.SENSOR, [device_id]) with caplog.at_level(logging.WARNING, logger="homeassistant.components.onewire"): await hass.config_entries.async_setup(config_entry.entry_id) await hass.async_block_till_done() @@ -68,7 +68,7 @@ async def test_owserver_sensor( assert len(entity_registry.entities) == len(expected_entities) check_and_enable_disabled_entities(entity_registry, expected_entities) - setup_owproxy_mock_devices(owproxy, SENSOR_DOMAIN, [device_id]) + setup_owproxy_mock_devices(owproxy, Platform.SENSOR, [device_id]) await hass.config_entries.async_reload(config_entry.entry_id) await hass.async_block_till_done() @@ -88,11 +88,11 @@ async def test_onewiredirect_setup_valid_device( entity_registry = mock_registry(hass) glob_result, read_side_effect = setup_sysbus_mock_devices( - SENSOR_DOMAIN, [device_id] + Platform.SENSOR, [device_id] ) mock_device = MOCK_SYSBUS_DEVICES[device_id] - expected_entities = mock_device.get(SENSOR_DOMAIN, []) + expected_entities = mock_device.get(Platform.SENSOR, []) expected_devices = ensure_list(mock_device.get(ATTR_DEVICE_INFO)) with patch("pi1wire._finder.glob.glob", return_value=glob_result,), patch( diff --git a/tests/components/onewire/test_switch.py b/tests/components/onewire/test_switch.py index f170d8a85d6..336dafb15a1 100644 --- a/tests/components/onewire/test_switch.py +++ b/tests/components/onewire/test_switch.py @@ -4,7 +4,6 @@ from unittest.mock import MagicMock, patch import pytest -from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN from homeassistant.config_entries import ConfigEntry from homeassistant.const import ( ATTR_ENTITY_ID, @@ -12,6 +11,7 @@ from homeassistant.const import ( SERVICE_TOGGLE, STATE_OFF, STATE_ON, + Platform, ) from homeassistant.core import HomeAssistant from homeassistant.helpers.config_validation import ensure_list @@ -30,7 +30,7 @@ from tests.common import mock_device_registry, mock_registry @pytest.fixture(autouse=True) def override_platforms(): """Override PLATFORMS.""" - with patch("homeassistant.components.onewire.PLATFORMS", [SWITCH_DOMAIN]): + with patch("homeassistant.components.onewire.PLATFORMS", [Platform.SWITCH]): yield @@ -49,10 +49,10 @@ async def test_owserver_switch( entity_registry = mock_registry(hass) mock_device = MOCK_OWPROXY_DEVICES[device_id] - expected_entities = mock_device.get(SWITCH_DOMAIN, []) + expected_entities = mock_device.get(Platform.SWITCH, []) expected_devices = ensure_list(mock_device.get(ATTR_DEVICE_INFO)) - setup_owproxy_mock_devices(owproxy, SWITCH_DOMAIN, [device_id]) + setup_owproxy_mock_devices(owproxy, Platform.SWITCH, [device_id]) with caplog.at_level(logging.WARNING, logger="homeassistant.components.onewire"): await hass.config_entries.async_setup(config_entry.entry_id) await hass.async_block_till_done() @@ -65,7 +65,7 @@ async def test_owserver_switch( assert len(entity_registry.entities) == len(expected_entities) check_and_enable_disabled_entities(entity_registry, expected_entities) - setup_owproxy_mock_devices(owproxy, SWITCH_DOMAIN, [device_id]) + setup_owproxy_mock_devices(owproxy, Platform.SWITCH, [device_id]) await hass.config_entries.async_reload(config_entry.entry_id) await hass.async_block_till_done() @@ -83,7 +83,7 @@ async def test_owserver_switch( expected_entity[ATTR_STATE] = STATE_ON await hass.services.async_call( - SWITCH_DOMAIN, + Platform.SWITCH, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id}, blocking=True,