Skip to content

Commit bbde282

Browse files
bouwewbouwew
committed
Save updated fixture and test-data json
1 parent 69357b5 commit bbde282

File tree

7 files changed

+64
-20
lines changed

7 files changed

+64
-20
lines changed

‎fixtures/adam_multiple_devices_per_zone/all_data.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"off"
3333
],
3434
"climate_mode": "auto",
35+
"control_state": "idle",
3536
"dev_class": "climate",
3637
"model": "ThermoZone",
3738
"name": "Badkamer",
@@ -72,6 +73,7 @@
7273
"off"
7374
],
7475
"climate_mode": "heat",
76+
"control_state": "idle",
7577
"dev_class": "climate",
7678
"model": "ThermoZone",
7779
"name": "Bios",
@@ -136,6 +138,7 @@
136138
"off"
137139
],
138140
"climate_mode": "heat",
141+
"control_state": "idle",
139142
"dev_class": "climate",
140143
"model": "ThermoZone",
141144
"name": "Garage",
@@ -291,6 +294,7 @@
291294
"off"
292295
],
293296
"climate_mode": "auto",
297+
"control_state": "idle",
294298
"dev_class": "climate",
295299
"model": "ThermoZone",
296300
"name": "Jessie",
@@ -445,6 +449,7 @@
445449
"off"
446450
],
447451
"climate_mode": "auto",
452+
"control_state": "heating",
448453
"dev_class": "climate",
449454
"model": "ThermoZone",
450455
"name": "Woonkamer",
@@ -630,7 +635,7 @@
630635
"cooling_present": false,
631636
"gateway_id": "fe799307f1624099878210aa0b9f1475",
632637
"heater_id": "90986d591dcd426cae3ec3e8111ff730",
633-
"item_count": 364,
638+
"item_count": 369,
634639
"notifications": {
635640
"af82e4ccf9c548528166d38e560662a4": {
636641
"warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."

‎fixtures/adam_plus_anna/all_data.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"off"
88
],
99
"climate_mode": "auto",
10+
"control_state": "idle",
1011
"dev_class": "climate",
1112
"model": "ThermoZone",
1213
"name": "Living room",
@@ -138,7 +139,7 @@
138139
"cooling_present": false,
139140
"gateway_id": "b128b4bbbd1f47e9bf4d756e8fb5ee94",
140141
"heater_id": "2743216f626f43948deec1f7ab3b3d70",
141-
"item_count": 79,
142+
"item_count": 80,
142143
"notifications": {
143144
"6fb89e35caeb4b1cb275184895202d84": {
144145
"error": "There is no OpenTherm communication with the boiler."

‎fixtures/adam_zone_per_device/all_data.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"off"
3333
],
3434
"climate_mode": "auto",
35+
"control_state": "idle",
3536
"dev_class": "climate",
3637
"model": "ThermoZone",
3738
"name": "Badkamer",
@@ -73,6 +74,7 @@
7374
"off"
7475
],
7576
"climate_mode": "heat",
77+
"control_state": "idle",
7678
"dev_class": "climate",
7779
"model": "ThermoZone",
7880
"name": "Bios",
@@ -137,6 +139,7 @@
137139
"off"
138140
],
139141
"climate_mode": "heat",
142+
"control_state": "idle",
140143
"dev_class": "climate",
141144
"model": "ThermoZone",
142145
"name": "Garage",
@@ -292,6 +295,7 @@
292295
"off"
293296
],
294297
"climate_mode": "auto",
298+
"control_state": "idle",
295299
"dev_class": "climate",
296300
"model": "ThermoZone",
297301
"name": "Jessie",
@@ -446,6 +450,7 @@
446450
"off"
447451
],
448452
"climate_mode": "auto",
453+
"control_state": "heating",
449454
"dev_class": "climate",
450455
"model": "ThermoZone",
451456
"name": "Woonkamer",
@@ -631,7 +636,7 @@
631636
"cooling_present": false,
632637
"gateway_id": "fe799307f1624099878210aa0b9f1475",
633638
"heater_id": "90986d591dcd426cae3ec3e8111ff730",
634-
"item_count": 364,
639+
"item_count": 369,
635640
"notifications": {
636641
"af82e4ccf9c548528166d38e560662a4": {
637642
"warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."

‎tests/data/adam/adam_multiple_devices_per_zone.json‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"entities": {
2+
"devices": {
33
"02cf28bfec924855854c544690a609ef": {
44
"available": true,
55
"dev_class": "vcr_plug",
@@ -32,7 +32,9 @@
3232
"off"
3333
],
3434
"climate_mode": "auto",
35+
"control_state": "idle",
3536
"dev_class": "climate",
37+
"model": "ThermoZone",
3638
"name": "Badkamer",
3739
"preset_modes": [
3840
"home",
@@ -57,7 +59,8 @@
5759
"680423ff840043738f42cc7f1ff97a36"
5860
],
5961
"secondary": []
60-
}
62+
},
63+
"vendor": "Plugwise"
6164
},
6265
"12493538af164a409c6a1c79e38afe1c": {
6366
"active_preset": "away",
@@ -70,7 +73,9 @@
7073
"off"
7174
],
7275
"climate_mode": "heat",
76+
"control_state": "idle",
7377
"dev_class": "climate",
78+
"model": "ThermoZone",
7479
"name": "Bios",
7580
"preset_modes": [
7681
"home",
@@ -98,7 +103,8 @@
98103
"secondary": [
99104
"a2c3583e0a6349358998b760cea82d2a"
100105
]
101-
}
106+
},
107+
"vendor": "Plugwise"
102108
},
103109
"21f2b542c49845e6bb416884c55778d6": {
104110
"available": true,
@@ -132,7 +138,9 @@
132138
"off"
133139
],
134140
"climate_mode": "heat",
141+
"control_state": "idle",
135142
"dev_class": "climate",
143+
"model": "ThermoZone",
136144
"name": "Garage",
137145
"preset_modes": [
138146
"home",
@@ -156,7 +164,8 @@
156164
"e7693eb9582644e5b865dba8d4447cf1"
157165
],
158166
"secondary": []
159-
}
167+
},
168+
"vendor": "Plugwise"
160169
},
161170
"4a810418d5394b3f82727340b91ba740": {
162171
"available": true,
@@ -285,7 +294,9 @@
285294
"off"
286295
],
287296
"climate_mode": "auto",
297+
"control_state": "idle",
288298
"dev_class": "climate",
299+
"model": "ThermoZone",
289300
"name": "Jessie",
290301
"preset_modes": [
291302
"home",
@@ -311,7 +322,8 @@
311322
"secondary": [
312323
"d3da73bde12a47d5a6b8f9dad971f2ec"
313324
]
314-
}
325+
},
326+
"vendor": "Plugwise"
315327
},
316328
"90986d591dcd426cae3ec3e8111ff730": {
317329
"binary_sensors": {
@@ -437,7 +449,9 @@
437449
"off"
438450
],
439451
"climate_mode": "auto",
452+
"control_state": "heating",
440453
"dev_class": "climate",
454+
"model": "ThermoZone",
441455
"name": "Woonkamer",
442456
"preset_modes": [
443457
"home",
@@ -465,7 +479,8 @@
465479
"secondary": [
466480
"b310b72a0e354bfab43089919b9a88bf"
467481
]
468-
}
482+
},
483+
"vendor": "Plugwise"
469484
},
470485
"cd0ddb54ef694e11ac18ed1cbce5dbbd": {
471486
"available": true,

‎tests/data/adam/adam_plus_anna.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
{
2-
"entities": {
2+
"devices": {
33
"009490cc2f674ce6b576863fbb64f867": {
44
"active_preset": "home",
55
"available_schedules": [
66
"Weekschema",
77
"off"
88
],
99
"climate_mode": "auto",
10+
"control_state": "idle",
1011
"dev_class": "climate",
12+
"model": "ThermoZone",
1113
"name": "Living room",
1214
"preset_modes": [
1315
"home",
@@ -33,7 +35,8 @@
3335
"ee62cad889f94e8ca3d09021f03a660b"
3436
],
3537
"secondary": []
36-
}
38+
},
39+
"vendor": "Plugwise"
3740
},
3841
"2743216f626f43948deec1f7ab3b3d70": {
3942
"available": false,

‎tests/data/adam/adam_zone_per_device.json‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"entities": {
2+
"devices": {
33
"02cf28bfec924855854c544690a609ef": {
44
"available": true,
55
"dev_class": "vcr_plug",
@@ -32,7 +32,9 @@
3232
"off"
3333
],
3434
"climate_mode": "auto",
35+
"control_state": "idle",
3536
"dev_class": "climate",
37+
"model": "ThermoZone",
3638
"name": "Badkamer",
3739
"preset_modes": [
3840
"home",
@@ -58,7 +60,8 @@
5860
"secondary": [
5961
"680423ff840043738f42cc7f1ff97a36"
6062
]
61-
}
63+
},
64+
"vendor": "Plugwise"
6265
},
6366
"12493538af164a409c6a1c79e38afe1c": {
6467
"active_preset": "away",
@@ -71,7 +74,9 @@
7174
"off"
7275
],
7376
"climate_mode": "heat",
77+
"control_state": "idle",
7478
"dev_class": "climate",
79+
"model": "ThermoZone",
7580
"name": "Bios",
7681
"preset_modes": [
7782
"home",
@@ -99,7 +104,8 @@
99104
"secondary": [
100105
"a2c3583e0a6349358998b760cea82d2a"
101106
]
102-
}
107+
},
108+
"vendor": "Plugwise"
103109
},
104110
"21f2b542c49845e6bb416884c55778d6": {
105111
"available": true,
@@ -133,7 +139,9 @@
133139
"off"
134140
],
135141
"climate_mode": "heat",
142+
"control_state": "idle",
136143
"dev_class": "climate",
144+
"model": "ThermoZone",
137145
"name": "Garage",
138146
"preset_modes": [
139147
"home",
@@ -157,7 +165,8 @@
157165
"e7693eb9582644e5b865dba8d4447cf1"
158166
],
159167
"secondary": []
160-
}
168+
},
169+
"vendor": "Plugwise"
161170
},
162171
"4a810418d5394b3f82727340b91ba740": {
163172
"available": true,
@@ -286,7 +295,9 @@
286295
"off"
287296
],
288297
"climate_mode": "auto",
298+
"control_state": "idle",
289299
"dev_class": "climate",
300+
"model": "ThermoZone",
290301
"name": "Jessie",
291302
"preset_modes": [
292303
"home",
@@ -312,7 +323,8 @@
312323
"secondary": [
313324
"d3da73bde12a47d5a6b8f9dad971f2ec"
314325
]
315-
}
326+
},
327+
"vendor": "Plugwise"
316328
},
317329
"90986d591dcd426cae3ec3e8111ff730": {
318330
"binary_sensors": {
@@ -438,7 +450,9 @@
438450
"off"
439451
],
440452
"climate_mode": "auto",
453+
"control_state": "heating",
441454
"dev_class": "climate",
455+
"model": "ThermoZone",
442456
"name": "Woonkamer",
443457
"preset_modes": [
444458
"home",
@@ -466,7 +480,8 @@
466480
"secondary": [
467481
"b310b72a0e354bfab43089919b9a88bf"
468482
]
469-
}
483+
},
484+
"vendor": "Plugwise"
470485
},
471486
"cd0ddb54ef694e11ac18ed1cbce5dbbd": {
472487
"available": true,

‎tests/test_adam.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ async def test_connect_adam_zone_per_device(self):
203203
assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
204204
assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
205205
assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
206-
assert self.entity_items == 364
206+
assert self.entity_items == 369
207207

208208
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
209209
await smile.delete_notification()
@@ -281,7 +281,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
281281
assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
282282
assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
283283
assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
284-
assert self.entity_items == 364
284+
assert self.entity_items == 369
285285

286286
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
287287

@@ -365,7 +365,7 @@ async def test_connect_adam_plus_anna(self):
365365
await self.device_test(smile, "2020-03-22 00:00:01", testdata)
366366
assert smile.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
367367
assert smile._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
368-
assert self.entity_items == 79
368+
assert self.entity_items == 80
369369
assert "6fb89e35caeb4b1cb275184895202d84" in self.notifications
370370

371371
result = await self.tinker_thermostat(

0 commit comments

Comments
 (0)