Skip to content

Commit 2ce2765

Browse files
epenetepenet
authored
Adjust light test helpers to use Kelvin, and cleanup unused helpers (home-assistant#133048)
Cleanup light test helper methods
1 parent 33c799b commit 2ce2765

File tree

6 files changed

+28
-114
lines changed

6 files changed

+28
-114
lines changed

‎.core_files.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ tests: &tests
132132
- tests/components/conftest.py
133133
- tests/components/diagnostics/**
134134
- tests/components/history/**
135+
- tests/components/light/common.py
135136
- tests/components/logbook/**
136137
- tests/components/recorder/**
137138
- tests/components/repairs/**

‎tests/components/light/common.py

+5-102
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
ATTR_BRIGHTNESS,
1111
ATTR_BRIGHTNESS_PCT,
1212
ATTR_COLOR_NAME,
13-
ATTR_COLOR_TEMP,
13+
ATTR_COLOR_TEMP_KELVIN,
1414
ATTR_EFFECT,
1515
ATTR_FLASH,
1616
ATTR_HS_COLOR,
17-
ATTR_KELVIN,
1817
ATTR_PROFILE,
1918
ATTR_RGB_COLOR,
2019
ATTR_RGBW_COLOR,
@@ -35,54 +34,10 @@
3534
SERVICE_TURN_ON,
3635
)
3736
from homeassistant.core import HomeAssistant
38-
from homeassistant.loader import bind_hass
3937

4038
from tests.common import MockToggleEntity
4139

4240

43-
@bind_hass
44-
def turn_on(
45-
hass: HomeAssistant,
46-
entity_id: str = ENTITY_MATCH_ALL,
47-
transition: float | None = None,
48-
brightness: int | None = None,
49-
brightness_pct: float | None = None,
50-
rgb_color: tuple[int, int, int] | None = None,
51-
rgbw_color: tuple[int, int, int, int] | None = None,
52-
rgbww_color: tuple[int, int, int, int, int] | None = None,
53-
xy_color: tuple[float, float] | None = None,
54-
hs_color: tuple[float, float] | None = None,
55-
color_temp: int | None = None,
56-
kelvin: int | None = None,
57-
profile: str | None = None,
58-
flash: str | None = None,
59-
effect: str | None = None,
60-
color_name: str | None = None,
61-
white: bool | None = None,
62-
) -> None:
63-
"""Turn all or specified light on."""
64-
hass.add_job(
65-
async_turn_on,
66-
hass,
67-
entity_id,
68-
transition,
69-
brightness,
70-
brightness_pct,
71-
rgb_color,
72-
rgbw_color,
73-
rgbww_color,
74-
xy_color,
75-
hs_color,
76-
color_temp,
77-
kelvin,
78-
profile,
79-
flash,
80-
effect,
81-
color_name,
82-
white,
83-
)
84-
85-
8641
async def async_turn_on(
8742
hass: HomeAssistant,
8843
entity_id: str = ENTITY_MATCH_ALL,
@@ -94,8 +49,7 @@ async def async_turn_on(
9449
rgbww_color: tuple[int, int, int, int, int] | None = None,
9550
xy_color: tuple[float, float] | None = None,
9651
hs_color: tuple[float, float] | None = None,
97-
color_temp: int | None = None,
98-
kelvin: int | None = None,
52+
color_temp_kelvin: int | None = None,
9953
profile: str | None = None,
10054
flash: str | None = None,
10155
effect: str | None = None,
@@ -116,8 +70,7 @@ async def async_turn_on(
11670
(ATTR_RGBWW_COLOR, rgbww_color),
11771
(ATTR_XY_COLOR, xy_color),
11872
(ATTR_HS_COLOR, hs_color),
119-
(ATTR_COLOR_TEMP, color_temp),
120-
(ATTR_KELVIN, kelvin),
73+
(ATTR_COLOR_TEMP_KELVIN, color_temp_kelvin),
12174
(ATTR_FLASH, flash),
12275
(ATTR_EFFECT, effect),
12376
(ATTR_COLOR_NAME, color_name),
@@ -129,17 +82,6 @@ async def async_turn_on(
12982
await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, data, blocking=True)
13083

13184

132-
@bind_hass
133-
def turn_off(
134-
hass: HomeAssistant,
135-
entity_id: str = ENTITY_MATCH_ALL,
136-
transition: float | None = None,
137-
flash: str | None = None,
138-
) -> None:
139-
"""Turn all or specified light off."""
140-
hass.add_job(async_turn_off, hass, entity_id, transition, flash)
141-
142-
14385
async def async_turn_off(
14486
hass: HomeAssistant,
14587
entity_id: str = ENTITY_MATCH_ALL,
@@ -160,43 +102,6 @@ async def async_turn_off(
160102
await hass.services.async_call(DOMAIN, SERVICE_TURN_OFF, data, blocking=True)
161103

162104

163-
@bind_hass
164-
def toggle(
165-
hass: HomeAssistant,
166-
entity_id: str = ENTITY_MATCH_ALL,
167-
transition: float | None = None,
168-
brightness: int | None = None,
169-
brightness_pct: float | None = None,
170-
rgb_color: tuple[int, int, int] | None = None,
171-
xy_color: tuple[float, float] | None = None,
172-
hs_color: tuple[float, float] | None = None,
173-
color_temp: int | None = None,
174-
kelvin: int | None = None,
175-
profile: str | None = None,
176-
flash: str | None = None,
177-
effect: str | None = None,
178-
color_name: str | None = None,
179-
) -> None:
180-
"""Toggle all or specified light."""
181-
hass.add_job(
182-
async_toggle,
183-
hass,
184-
entity_id,
185-
transition,
186-
brightness,
187-
brightness_pct,
188-
rgb_color,
189-
xy_color,
190-
hs_color,
191-
color_temp,
192-
kelvin,
193-
profile,
194-
flash,
195-
effect,
196-
color_name,
197-
)
198-
199-
200105
async def async_toggle(
201106
hass: HomeAssistant,
202107
entity_id: str = ENTITY_MATCH_ALL,
@@ -206,8 +111,7 @@ async def async_toggle(
206111
rgb_color: tuple[int, int, int] | None = None,
207112
xy_color: tuple[float, float] | None = None,
208113
hs_color: tuple[float, float] | None = None,
209-
color_temp: int | None = None,
210-
kelvin: int | None = None,
114+
color_temp_kelvin: int | None = None,
211115
profile: str | None = None,
212116
flash: str | None = None,
213117
effect: str | None = None,
@@ -225,8 +129,7 @@ async def async_toggle(
225129
(ATTR_RGB_COLOR, rgb_color),
226130
(ATTR_XY_COLOR, xy_color),
227131
(ATTR_HS_COLOR, hs_color),
228-
(ATTR_COLOR_TEMP, color_temp),
229-
(ATTR_KELVIN, kelvin),
132+
(ATTR_COLOR_TEMP_KELVIN, color_temp_kelvin),
230133
(ATTR_FLASH, flash),
231134
(ATTR_EFFECT, effect),
232135
(ATTR_COLOR_NAME, color_name),

‎tests/components/mqtt/test_light.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@ async def test_sending_mqtt_commands_and_optimistic(
11481148
assert state.attributes.get(light.ATTR_COLOR_MODE) == "xy"
11491149
assert state.attributes.get(light.ATTR_SUPPORTED_COLOR_MODES) == color_modes
11501150

1151-
await common.async_turn_on(hass, "light.test", color_temp=125)
1151+
await common.async_turn_on(hass, "light.test", color_temp_kelvin=8000)
11521152
mqtt_mock.async_publish.assert_has_calls(
11531153
[
11541154
call("test_light_rgb/color_temp/set", "125", 2, False),
@@ -1321,7 +1321,7 @@ async def test_sending_mqtt_color_temp_command_with_template(
13211321
state = hass.states.get("light.test")
13221322
assert state.state == STATE_UNKNOWN
13231323

1324-
await common.async_turn_on(hass, "light.test", color_temp=100)
1324+
await common.async_turn_on(hass, "light.test", color_temp_kelvin=10000)
13251325

13261326
mqtt_mock.async_publish.assert_has_calls(
13271327
[

‎tests/components/mqtt/test_light_json.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,9 @@ async def test_single_color_mode(
423423
state = hass.states.get("light.test")
424424
assert state.state == STATE_UNKNOWN
425425

426-
await common.async_turn_on(hass, "light.test", brightness=50, color_temp=192)
426+
await common.async_turn_on(
427+
hass, "light.test", brightness=50, color_temp_kelvin=5208
428+
)
427429

428430
async_fire_mqtt_message(
429431
hass,
@@ -458,7 +460,9 @@ async def test_turn_on_with_unknown_color_mode_optimistic(
458460
assert state.state == STATE_ON
459461

460462
# Turn on the light with brightness or color_temp attributes
461-
await common.async_turn_on(hass, "light.test", brightness=50, color_temp=192)
463+
await common.async_turn_on(
464+
hass, "light.test", brightness=50, color_temp_kelvin=5208
465+
)
462466
state = hass.states.get("light.test")
463467
assert state.attributes.get("color_mode") == light.ColorMode.COLOR_TEMP
464468
assert state.attributes.get("brightness") == 50
@@ -1083,7 +1087,7 @@ async def test_sending_mqtt_commands_and_optimistic(
10831087
state = hass.states.get("light.test")
10841088
assert state.state == STATE_ON
10851089

1086-
await common.async_turn_on(hass, "light.test", color_temp=90)
1090+
await common.async_turn_on(hass, "light.test", color_temp_kelvin=11111)
10871091

10881092
mqtt_mock.async_publish.assert_called_once_with(
10891093
"test_light_rgb/set",
@@ -1244,7 +1248,7 @@ async def test_sending_mqtt_commands_and_optimistic2(
12441248
assert state.state == STATE_ON
12451249

12461250
# Turn the light on with color temperature
1247-
await common.async_turn_on(hass, "light.test", color_temp=90)
1251+
await common.async_turn_on(hass, "light.test", color_temp_kelvin=11111)
12481252
mqtt_mock.async_publish.assert_called_once_with(
12491253
"test_light_rgb/set",
12501254
JsonValidator('{"state":"ON","color_temp":90}'),

‎tests/components/mqtt/test_light_template.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@ async def test_single_color_mode(
205205
state = hass.states.get("light.test")
206206
assert state.state == STATE_UNKNOWN
207207

208-
await common.async_turn_on(hass, "light.test", brightness=50, color_temp=192)
208+
await common.async_turn_on(
209+
hass, "light.test", brightness=50, color_temp_kelvin=5208
210+
)
209211
async_fire_mqtt_message(hass, "test_light", "on,50,192")
210212
color_modes = [light.ColorMode.COLOR_TEMP]
211213
state = hass.states.get("light.test")
@@ -463,7 +465,7 @@ async def test_sending_mqtt_commands_and_optimistic(
463465
assert state.state == STATE_ON
464466

465467
# Set color_temp
466-
await common.async_turn_on(hass, "light.test", color_temp=70)
468+
await common.async_turn_on(hass, "light.test", color_temp_kelvin=14285)
467469
mqtt_mock.async_publish.assert_called_once_with(
468470
"test_light_rgb/set", "on,,70,--,-", 2, False
469471
)
@@ -594,7 +596,7 @@ async def test_sending_mqtt_commands_non_optimistic_brightness_template(
594596
assert state.state == STATE_UNKNOWN
595597

596598
# Set color_temp
597-
await common.async_turn_on(hass, "light.test", color_temp=70)
599+
await common.async_turn_on(hass, "light.test", color_temp_kelvin=14285)
598600
mqtt_mock.async_publish.assert_called_once_with(
599601
"test_light_rgb/set", "on,,70,--,-", 0, False
600602
)

‎tests/components/tasmota/test_light.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ async def test_sending_mqtt_commands_rgbww(
11081108
)
11091109
mqtt_mock.async_publish.reset_mock()
11101110

1111-
await common.async_turn_on(hass, "light.tasmota_test", color_temp=200)
1111+
await common.async_turn_on(hass, "light.tasmota_test", color_temp_kelvin=5000)
11121112
mqtt_mock.async_publish.assert_called_once_with(
11131113
"tasmota_49A3BC/cmnd/Backlog",
11141114
"NoDelay;Power1 ON;NoDelay;CT 200",
@@ -1350,7 +1350,9 @@ async def test_transition(
13501350
assert state.attributes.get("color_temp") == 153
13511351

13521352
# Set color_temp of the light from 153 to 500 @ 50%: Speed should be 6*2*2=24
1353-
await common.async_turn_on(hass, "light.tasmota_test", color_temp=500, transition=6)
1353+
await common.async_turn_on(
1354+
hass, "light.tasmota_test", color_temp_kelvin=2000, transition=6
1355+
)
13541356
mqtt_mock.async_publish.assert_called_once_with(
13551357
"tasmota_49A3BC/cmnd/Backlog",
13561358
"NoDelay;Fade2 1;NoDelay;Speed2 24;NoDelay;Power1 ON;NoDelay;CT 500",
@@ -1369,7 +1371,9 @@ async def test_transition(
13691371
assert state.attributes.get("color_temp") == 500
13701372

13711373
# Set color_temp of the light from 500 to 326 @ 50%: Speed should be 6*2*2*2=48->40
1372-
await common.async_turn_on(hass, "light.tasmota_test", color_temp=326, transition=6)
1374+
await common.async_turn_on(
1375+
hass, "light.tasmota_test", color_temp_kelvin=3067, transition=6
1376+
)
13731377
mqtt_mock.async_publish.assert_called_once_with(
13741378
"tasmota_49A3BC/cmnd/Backlog",
13751379
"NoDelay;Fade2 1;NoDelay;Speed2 40;NoDelay;Power1 ON;NoDelay;CT 326",

0 commit comments

Comments
 (0)