evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use wemo enums in fan entity (#64397)

Browse source
This commit is contained in:
Eric Severance 2022-01-19 00:13:25 -08:00 • committed by GitHub
parent 2f8d99bf5d
commit 35cf6d7a7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

44
homeassistant/components/wemo/fan.py
View file

@ -6,6 +6,7 @@ from datetime import timedelta
import math
from typing import Any
from pywemo.ouimeaux_device.humidifier import DesiredHumidity, FanMode, Humidifier
import voluptuous as vol
from homeassistant.components.fan import SUPPORT_SET_SPEED, FanEntity
@ -38,22 +39,7 @@ ATTR_FILTER_LIFE = "filter_life"
ATTR_FILTER_EXPIRED = "filter_expired"
ATTR_WATER_LEVEL = "water_level"
WEMO_HUMIDITY_45 = 0
WEMO_HUMIDITY_50 = 1
WEMO_HUMIDITY_55 = 2
WEMO_HUMIDITY_60 = 3
WEMO_HUMIDITY_100 = 4
WEMO_FAN_OFF = 0
WEMO_FAN_MINIMUM = 1
WEMO_FAN_MEDIUM = 4
WEMO_FAN_MAXIMUM = 5
SPEED_RANGE = (WEMO_FAN_MINIMUM, WEMO_FAN_MAXIMUM) # off is not included
WEMO_WATER_EMPTY = 0
WEMO_WATER_LOW = 1
WEMO_WATER_GOOD = 2
SPEED_RANGE = (FanMode.Minimum, FanMode.Maximum) # off is not included
SUPPORTED_FEATURES = SUPPORT_SET_SPEED
@ -101,13 +87,15 @@ async def async_setup_entry(
class WemoHumidifier(WemoBinaryStateEntity, FanEntity):
"""Representation of a WeMo humidifier."""
wemo: Humidifier
def __init__(self, coordinator: DeviceCoordinator) -> None:
"""Initialize the WeMo switch."""
super().__init__(coordinator)
if self.wemo.fan_mode != WEMO_FAN_OFF:
if self.wemo.fan_mode != FanMode.Off:
self._last_fan_on_mode = self.wemo.fan_mode
else:
self._last_fan_on_mode = WEMO_FAN_MEDIUM
self._last_fan_on_mode = FanMode.High
@property
def icon(self) -> str:
@ -144,7 +132,7 @@ class WemoHumidifier(WemoBinaryStateEntity, FanEntity):
@callback
def _handle_coordinator_update(self) -> None:
"""Handle updated data from the coordinator."""
if self.wemo.fan_mode != WEMO_FAN_OFF:
if self.wemo.fan_mode != FanMode.Off:
self._last_fan_on_mode = self.wemo.fan_mode
super()._handle_coordinator_update()
@ -161,16 +149,18 @@ class WemoHumidifier(WemoBinaryStateEntity, FanEntity):
def turn_off(self, **kwargs: Any) -> None:
"""Turn the switch off."""
with self._wemo_call_wrapper("turn off"):
self.wemo.set_state(WEMO_FAN_OFF)
self.wemo.set_state(FanMode.Off)
def set_percentage(self, percentage: int | None) -> None:
"""Set the fan_mode of the Humidifier."""
if percentage is None:
named_speed = self._last_fan_on_mode
elif percentage == 0:
named_speed = WEMO_FAN_OFF
named_speed = FanMode.Off
else:
named_speed = math.ceil(percentage_to_ranged_value(SPEED_RANGE, percentage))
named_speed = FanMode(
math.ceil(percentage_to_ranged_value(SPEED_RANGE, percentage))
)
with self._wemo_call_wrapper("set speed"):
self.wemo.set_state(named_speed)
@ -178,15 +168,15 @@ class WemoHumidifier(WemoBinaryStateEntity, FanEntity):
def set_humidity(self, target_humidity: float) -> None:
"""Set the target humidity level for the Humidifier."""
if target_humidity < 50:
pywemo_humidity = WEMO_HUMIDITY_45
pywemo_humidity = DesiredHumidity.FortyFivePercent
elif 50 <= target_humidity < 55:
pywemo_humidity = WEMO_HUMIDITY_50
pywemo_humidity = DesiredHumidity.FiftyPercent
elif 55 <= target_humidity < 60:
pywemo_humidity = WEMO_HUMIDITY_55
pywemo_humidity = DesiredHumidity.FiftyFivePercent
elif 60 <= target_humidity < 100:
pywemo_humidity = WEMO_HUMIDITY_60
pywemo_humidity = DesiredHumidity.SixtyPercent
elif target_humidity >= 100:
pywemo_humidity = WEMO_HUMIDITY_100
pywemo_humidity = DesiredHumidity.OneHundredPercent
with self._wemo_call_wrapper("set humidity"):
self.wemo.set_humidity(pywemo_humidity)

65
tests/components/wemo/test_fan.py
View file

@ -2,15 +2,20 @@
import pytest
from pywemo.exceptions import ActionException
from pywemo.ouimeaux_device.humidifier import DesiredHumidity, FanMode
from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
from homeassistant.components.fan import (
ATTR_PERCENTAGE,
DOMAIN as FAN_DOMAIN,
SERVICE_SET_PERCENTAGE,
)
from homeassistant.components.homeassistant import (
DOMAIN as HA_DOMAIN,
SERVICE_UPDATE_ENTITY,
)
from homeassistant.components.wemo import fan
from homeassistant.components.wemo.const import DOMAIN
from homeassistant.const import ATTR_ENTITY_ID, STATE_OFF, STATE_ON
from homeassistant.const import ATTR_ENTITY_ID, SERVICE_TURN_ON, STATE_OFF, STATE_ON
from homeassistant.setup import async_setup_component
from . import entity_test_helpers
@ -108,12 +113,12 @@ async def test_fan_reset_filter_service(hass, pywemo_device, wemo_entity):
@pytest.mark.parametrize(
"test_input,expected",
[
(0, fan.WEMO_HUMIDITY_45),
(45, fan.WEMO_HUMIDITY_45),
(50, fan.WEMO_HUMIDITY_50),
(55, fan.WEMO_HUMIDITY_55),
(60, fan.WEMO_HUMIDITY_60),
(100, fan.WEMO_HUMIDITY_100),
(0, DesiredHumidity.FortyFivePercent),
(45, DesiredHumidity.FortyFivePercent),
(50, DesiredHumidity.FiftyPercent),
(55, DesiredHumidity.FiftyFivePercent),
(60, DesiredHumidity.SixtyPercent),
(100, DesiredHumidity.OneHundredPercent),
],
)
async def test_fan_set_humidity_service(
@ -130,3 +135,47 @@ async def test_fan_set_humidity_service(
blocking=True,
)
pywemo_device.set_humidity.assert_called_with(expected)
@pytest.mark.parametrize(
"percentage,expected_fan_mode",
[
(0, FanMode.Off),
(10, FanMode.Minimum),
(30, FanMode.Low),
(50, FanMode.Medium),
(70, FanMode.High),
(100, FanMode.Maximum),
],
)
async def test_fan_set_percentage(
hass, pywemo_device, wemo_entity, percentage, expected_fan_mode
):
"""Verify set_percentage works properly through the entire range of FanModes."""
assert await hass.services.async_call(
FAN_DOMAIN,
SERVICE_SET_PERCENTAGE,
{ATTR_ENTITY_ID: [wemo_entity.entity_id], ATTR_PERCENTAGE: percentage},
blocking=True,
)
pywemo_device.set_state.assert_called_with(expected_fan_mode)
class TestInitialFanMode:
"""Test that the FanMode is set to High when turned on the first time."""
@pytest.fixture
def pywemo_device(self, pywemo_device):
"""Set the FanMode to off initially."""
pywemo_device.fan_mode = FanMode.Off
yield pywemo_device
async def test_fan_mode_high_initially(self, hass, pywemo_device, wemo_entity):
"""Verify the FanMode is set to High when turned on."""
assert await hass.services.async_call(
FAN_DOMAIN,
SERVICE_TURN_ON,
{ATTR_ENTITY_ID: [wemo_entity.entity_id]},
blocking=True,
)
pywemo_device.set_state.assert_called_with(FanMode.High)