Skip to content

Commit 8e63a5e

Browse files
bouwewbouwew
committed
Save
1 parent 4e89c86 commit 8e63a5e

File tree

6 files changed

+110
-91
lines changed

6 files changed

+110
-91
lines changed

‎fixtures/anna_v4_dhw/all_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"devices": {
2+
"entities": {
33
"01b85360fdd243d0aaad4d6ac2a5ba7e": {
44
"active_preset": "home",
55
"available_schedules": [

‎fixtures/anna_v4_no_tag/all_data.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"devices": {
2+
"entities": {
33
"01b85360fdd243d0aaad4d6ac2a5ba7e": {
44
"active_preset": "home",
55
"available_schedules": [

‎tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"device_zones": {
2+
"entities": {
33
"67d73d0bd469422db25a618a5fb8eeb0": {
44
"switches": {
55
"lock": true

‎tests/data/anna/anna_v4_UPDATED_DATA.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"device_zones": {
2+
"entities": {
33
"cd0e6156b1f04d5f952349ffbe397481": {
44
"maximum_boiler_temperature": {
55
"setpoint": 69.0,

‎tests/data/anna/anna_v4_dhw.json‎

Lines changed: 92 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,98 @@
11
{
2-
"cd0e6156b1f04d5f952349ffbe397481": {
3-
"dev_class": "heater_central",
4-
"location": "94c107dc6ac84ed98e9f68c0dd06bf71",
5-
"model": "Generic heater",
6-
"model_id": "2.32",
7-
"name": "OpenTherm",
8-
"vendor": "Bosch Thermotechniek B.V.",
9-
"maximum_boiler_temperature": {
10-
"setpoint": 70.0,
11-
"lower_bound": 0.0,
12-
"upper_bound": 100.0,
13-
"resolution": 1
2+
"entities": {
3+
"01b85360fdd243d0aaad4d6ac2a5ba7e": {
4+
"active_preset": "home",
5+
"available_schedules": [
6+
"Standaard",
7+
"Thuiswerken",
8+
"off"
9+
],
10+
"climate_mode": "heat",
11+
"dev_class": "thermostat",
12+
"firmware": "2018-02-08T11:15:53+01:00",
13+
"hardware": "6539-1301-5002",
14+
"location": "eb5309212bf5407bb143e5bfa3b18aee",
15+
"model": "ThermoTouch",
16+
"name": "Anna",
17+
"preset_modes": [
18+
"vacation",
19+
"no_frost",
20+
"away",
21+
"asleep",
22+
"home"
23+
],
24+
"select_schedule": "off",
25+
"sensors": {
26+
"illuminance": 60.0,
27+
"setpoint": 20.5,
28+
"temperature": 20.6
29+
},
30+
"temperature_offset": {
31+
"lower_bound": -2.0,
32+
"resolution": 0.1,
33+
"setpoint": 0.0,
34+
"upper_bound": 2.0
35+
},
36+
"thermostat": {
37+
"lower_bound": 4.0,
38+
"resolution": 0.1,
39+
"setpoint": 20.5,
40+
"upper_bound": 30.0
41+
},
42+
"vendor": "Plugwise"
1443
},
15-
"max_dhw_temperature": {
16-
"setpoint": 60.0,
17-
"lower_bound": 30.0,
18-
"upper_bound": 60.0,
19-
"resolution": 0.01
44+
"0466eae8520144c78afb29628384edeb": {
45+
"binary_sensors": {
46+
"plugwise_notification": false
47+
},
48+
"dev_class": "gateway",
49+
"firmware": "4.0.15",
50+
"hardware": "AME Smile 2.0 board",
51+
"location": "94c107dc6ac84ed98e9f68c0dd06bf71",
52+
"mac_address": "012345670001",
53+
"model": "Gateway",
54+
"model_id": "smile_thermo",
55+
"name": "Smile Anna",
56+
"sensors": {
57+
"outdoor_temperature": 7.44
58+
},
59+
"vendor": "Plugwise"
2060
},
21-
"available": true,
22-
"binary_sensors": {
23-
"dhw_state": true,
24-
"heating_state": false,
25-
"flame_state": true
26-
},
27-
"sensors": {
28-
"water_temperature": 45.0,
29-
"intended_boiler_temperature": 39.9,
30-
"modulation_level": 0,
31-
"return_temperature": 32.0,
32-
"water_pressure": 2.2
33-
},
34-
"switches": {
35-
"dhw_cm_switch": false
36-
}
37-
},
38-
"01b85360fdd243d0aaad4d6ac2a5ba7e": {
39-
"dev_class": "thermostat",
40-
"firmware": "2018-02-08T11:15:53+01:00",
41-
"hardware": "6539-1301-5002",
42-
"location": "eb5309212bf5407bb143e5bfa3b18aee",
43-
"model": "ThermoTouch",
44-
"name": "Anna",
45-
"vendor": "Plugwise",
46-
"thermostat": {
47-
"setpoint": 20.5,
48-
"lower_bound": 4.0,
49-
"upper_bound": 30.0,
50-
"resolution": 0.1
51-
},
52-
"preset_modes": ["vacation", "no_frost", "away", "asleep", "home"],
53-
"active_preset": "home",
54-
"available_schedules": ["Standaard", "Thuiswerken", "off"],
55-
"select_schedule": "off",
56-
"climate_mode": "heat",
57-
"sensors": {
58-
"temperature": 20.6,
59-
"setpoint": 20.5,
60-
"illuminance": 60.0
61-
}
62-
},
63-
"0466eae8520144c78afb29628384edeb": {
64-
"dev_class": "gateway",
65-
"firmware": "4.0.15",
66-
"hardware": "AME Smile 2.0 board",
67-
"location": "94c107dc6ac84ed98e9f68c0dd06bf71",
68-
"mac_address": "012345670001",
69-
"model": "Gateway",
70-
"name": "Smile Anna",
71-
"vendor": "Plugwise",
72-
"binary_sensors": {
73-
"plugwise_notification": false
74-
},
75-
"sensors": {
76-
"outdoor_temperature": 7.44
61+
"cd0e6156b1f04d5f952349ffbe397481": {
62+
"available": true,
63+
"binary_sensors": {
64+
"dhw_state": true,
65+
"flame_state": true,
66+
"heating_state": false
67+
},
68+
"dev_class": "heater_central",
69+
"location": "94c107dc6ac84ed98e9f68c0dd06bf71",
70+
"max_dhw_temperature": {
71+
"lower_bound": 30.0,
72+
"resolution": 0.01,
73+
"setpoint": 60.0,
74+
"upper_bound": 60.0
75+
},
76+
"maximum_boiler_temperature": {
77+
"lower_bound": 0.0,
78+
"resolution": 1.0,
79+
"setpoint": 70.0,
80+
"upper_bound": 100.0
81+
},
82+
"model": "Generic heater",
83+
"model_id": "2.32",
84+
"name": "OpenTherm",
85+
"sensors": {
86+
"intended_boiler_temperature": 39.9,
87+
"modulation_level": 0.0,
88+
"return_temperature": 32.0,
89+
"water_pressure": 2.2,
90+
"water_temperature": 45.0
91+
},
92+
"switches": {
93+
"dhw_cm_switch": false
94+
},
95+
"vendor": "Bosch Thermotechniek B.V."
7796
}
7897
}
7998
}

‎tests/test_anna.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ async def test_connect_anna_v4_dhw(self):
105105

106106
await self.device_test(smile, "2020-04-05 00:00:01", testdata)
107107
assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
108-
assert self.entitiy_items == 58
108+
assert self.entity_items == 58
109109
assert not self.notifications
110110

111111
result = await self.tinker_thermostat(
@@ -138,7 +138,7 @@ async def test_connect_anna_v4_no_tag(self):
138138
)
139139

140140
await self.device_test(smile, "2020-04-05 00:00:01", testdata)
141-
assert self.entitiy_items == 58
141+
assert self.entity_items == 58
142142

143143
result = await self.tinker_thermostat(
144144
smile,
@@ -167,7 +167,7 @@ async def test_connect_anna_without_boiler_fw441(self):
167167

168168
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
169169
assert smile._last_active["c34c6864216446528e95d88985e714cc"] == "Normaal"
170-
assert self.entitiy_items == 39
170+
assert self.entity_items == 39
171171
assert not self.notifications
172172

173173
result = await self.tinker_thermostat(
@@ -196,7 +196,7 @@ async def test_connect_anna_heatpump_heating(self):
196196
await self.device_test(smile, "2020-04-12 00:00:01", testdata)
197197
assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
198198
assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
199-
assert self.entitiy_items == 67
199+
assert self.entity_items == 67
200200
assert not self.notifications
201201
assert self.cooling_present
202202
assert not self._cooling_enabled
@@ -225,7 +225,7 @@ async def test_connect_anna_heatpump_heating(self):
225225
await self.device_test(
226226
smile, "2020-04-13 00:00:01", testdata_updated, initialize=False
227227
)
228-
assert self.entitiy_items == 64
228+
assert self.entity_items == 64
229229
await smile.close_connection()
230230
await self.disconnect(server, client)
231231

@@ -251,7 +251,7 @@ async def test_connect_anna_heatpump_cooling(self):
251251

252252
await self.device_test(smile, "2020-04-19 00:00:01", testdata)
253253
assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
254-
assert self.entitiy_items == 64
254+
assert self.entity_items == 64
255255
assert self.cooling_present
256256
assert not self.notifications
257257

@@ -296,7 +296,7 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
296296
)
297297

298298
await self.device_test(smile, "2020-04-19 00:00:01", testdata)
299-
assert self.entitiy_items == 64
299+
assert self.entity_items == 64
300300
assert self.cooling_present
301301
assert self._cooling_enabled
302302
assert self._cooling_active
@@ -323,7 +323,7 @@ async def test_connect_anna_elga_no_cooling(self):
323323
await self.device_test(smile, "2020-04-12 00:00:01", testdata)
324324
assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
325325
assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
326-
assert self.entitiy_items == 63
326+
assert self.entity_items == 63
327327
assert not self.notifications
328328
assert not self.cooling_present
329329

@@ -350,7 +350,7 @@ async def test_connect_anna_elga_2(self):
350350
smile._last_active["d3ce834534114348be628b61b26d9220"]
351351
== THERMOSTAT_SCHEDULE
352352
)
353-
assert self.entitiy_items == 63
353+
assert self.entity_items == 63
354354
assert smile.gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
355355
assert self.cooling_present
356356
assert not self._cooling_enabled
@@ -375,7 +375,7 @@ async def test_connect_anna_elga_2_schedule_off(self):
375375
)
376376
assert self.cooling_present
377377
assert not self._cooling_enabled
378-
assert self.entitiy_items == 63
378+
assert self.entity_items == 63
379379

380380
await smile.close_connection()
381381
await self.disconnect(server, client)
@@ -404,7 +404,7 @@ async def test_connect_anna_elga_2_cooling(self):
404404
smile._last_active["d3ce834534114348be628b61b26d9220"]
405405
== THERMOSTAT_SCHEDULE
406406
)
407-
assert self.entitiy_items == 63
407+
assert self.entity_items == 63
408408
assert not self.notifications
409409

410410
assert self.cooling_present
@@ -431,7 +431,7 @@ async def test_connect_anna_loria_heating_idle(self):
431431

432432
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
433433
assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
434-
assert self.entitiy_items == 66
434+
assert self.entity_items == 66
435435
assert self.cooling_present
436436
assert not self._cooling_enabled
437437

@@ -497,7 +497,7 @@ async def test_connect_anna_loria_cooling_active(self):
497497

498498
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
499499
assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
500-
assert self.entitiy_items == 66
500+
assert self.entity_items == 66
501501
assert self.cooling_present
502502
assert self._cooling_enabled
503503

@@ -520,7 +520,7 @@ async def test_connect_anna_loria_driessens(self):
520520
)
521521

522522
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
523-
assert self.entitiy_items == 66
523+
assert self.entity_items == 66
524524
assert self.cooling_present
525525
assert not self._cooling_enabled
526526

0 commit comments

Comments
 (0)