Skip to content

Commit 653d3a0

Browse files
tomer-wtomer-w
committed
Fix tests
1 parent 5398d6f commit 653d3a0

2 files changed

Lines changed: 43 additions & 37 deletions

File tree

‎tests/snapshots/test_hub.ambr‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
'disabled_by': None,
1414
'domain': 'binary_sensor',
1515
'entity_category': None,
16-
'entity_id': 'binary_sensor.ev_charging_station_connected',
16+
'entity_id': 'binary_sensor.victron_mqtt_123_evcharger_0_evcharger_connected',
1717
'has_entity_name': True,
1818
'hidden_by': None,
1919
'icon': None,
2020
'id': <ANY>,
2121
'labels': set({
2222
}),
2323
'name': None,
24-
'object_id_base': 'Connected',
24+
'object_id_base': None,
2525
'options': dict({
2626
}),
2727
'original_device_class': None,
2828
'original_icon': None,
2929
'original_name': 'Connected',
3030
'platform': 'victron_mqtt',
3131
'previous_unique_id': None,
32-
'suggested_object_id': None,
32+
'suggested_object_id': 'victron_mqtt_123_evcharger_0_evcharger_connected',
3333
'supported_features': 0,
3434
'translation_key': 'evcharger_connected',
3535
'unique_id': 'binary_sensor.victron_mqtt_123_evcharger_0_evcharger_connected',
@@ -89,23 +89,23 @@
8989
'disabled_by': None,
9090
'domain': 'button',
9191
'entity_category': None,
92-
'entity_id': 'button.victron_venus_device_reboot',
92+
'entity_id': 'button.victron_mqtt_123_system_0_platform_device_reboot',
9393
'has_entity_name': True,
9494
'hidden_by': None,
9595
'icon': None,
9696
'id': <ANY>,
9797
'labels': set({
9898
}),
9999
'name': None,
100-
'object_id_base': 'Device reboot',
100+
'object_id_base': None,
101101
'options': dict({
102102
}),
103103
'original_device_class': None,
104104
'original_icon': None,
105105
'original_name': 'Device reboot',
106106
'platform': 'victron_mqtt',
107107
'previous_unique_id': None,
108-
'suggested_object_id': None,
108+
'suggested_object_id': 'victron_mqtt_123_system_0_platform_device_reboot',
109109
'supported_features': 0,
110110
'translation_key': 'platform_device_reboot',
111111
'unique_id': 'button.victron_mqtt_123_system_0_platform_device_reboot',
@@ -170,23 +170,23 @@
170170
'disabled_by': None,
171171
'domain': 'number',
172172
'entity_category': None,
173-
'entity_id': 'number.ev_charging_station_set_current',
173+
'entity_id': 'number.victron_mqtt_123_evcharger_0_evcharger_set_current',
174174
'has_entity_name': True,
175175
'hidden_by': None,
176176
'icon': None,
177177
'id': <ANY>,
178178
'labels': set({
179179
}),
180180
'name': None,
181-
'object_id_base': 'Set current',
181+
'object_id_base': None,
182182
'options': dict({
183183
}),
184184
'original_device_class': <NumberDeviceClass.CURRENT: 'current'>,
185185
'original_icon': None,
186186
'original_name': 'Set current',
187187
'platform': 'victron_mqtt',
188188
'previous_unique_id': None,
189-
'suggested_object_id': None,
189+
'suggested_object_id': 'victron_mqtt_123_evcharger_0_evcharger_set_current',
190190
'supported_features': 0,
191191
'translation_key': 'evcharger_set_current',
192192
'unique_id': 'number.victron_mqtt_123_evcharger_0_evcharger_set_current',
@@ -257,23 +257,23 @@
257257
'disabled_by': None,
258258
'domain': 'select',
259259
'entity_category': None,
260-
'entity_id': 'select.ev_charging_station_mode',
260+
'entity_id': 'select.victron_mqtt_123_evcharger_0_evcharger_mode',
261261
'has_entity_name': True,
262262
'hidden_by': None,
263263
'icon': None,
264264
'id': <ANY>,
265265
'labels': set({
266266
}),
267267
'name': None,
268-
'object_id_base': 'Mode',
268+
'object_id_base': None,
269269
'options': dict({
270270
}),
271271
'original_device_class': None,
272272
'original_icon': None,
273273
'original_name': 'Mode',
274274
'platform': 'victron_mqtt',
275275
'previous_unique_id': None,
276-
'suggested_object_id': None,
276+
'suggested_object_id': 'victron_mqtt_123_evcharger_0_evcharger_mode',
277277
'supported_features': 0,
278278
'translation_key': 'evcharger_mode',
279279
'unique_id': 'select.victron_mqtt_123_evcharger_0_evcharger_mode',
@@ -341,15 +341,15 @@
341341
'disabled_by': None,
342342
'domain': 'sensor',
343343
'entity_category': None,
344-
'entity_id': 'sensor.battery_dc_bus_current',
344+
'entity_id': 'sensor.victron_mqtt_123_battery_0_battery_current',
345345
'has_entity_name': True,
346346
'hidden_by': None,
347347
'icon': None,
348348
'id': <ANY>,
349349
'labels': set({
350350
}),
351351
'name': None,
352-
'object_id_base': 'DC bus current',
352+
'object_id_base': None,
353353
'options': dict({
354354
'sensor': dict({
355355
'suggested_display_precision': 1,
@@ -360,7 +360,7 @@
360360
'original_name': 'DC bus current',
361361
'platform': 'victron_mqtt',
362362
'previous_unique_id': None,
363-
'suggested_object_id': None,
363+
'suggested_object_id': 'victron_mqtt_123_battery_0_battery_current',
364364
'supported_features': 0,
365365
'translation_key': 'battery_current',
366366
'unique_id': 'sensor.victron_mqtt_123_battery_0_battery_current',
@@ -448,23 +448,23 @@
448448
'disabled_by': None,
449449
'domain': 'select',
450450
'entity_category': None,
451-
'entity_id': 'select.victron_venus_ess_batterylife_schedule_charge_2_days',
451+
'entity_id': 'select.victron_mqtt_123_system_0_system_ess_schedule_charge_2_days',
452452
'has_entity_name': True,
453453
'hidden_by': None,
454454
'icon': None,
455455
'id': <ANY>,
456456
'labels': set({
457457
}),
458458
'name': None,
459-
'object_id_base': 'ESS BatteryLife schedule charge 2 days',
459+
'object_id_base': None,
460460
'options': dict({
461461
}),
462462
'original_device_class': None,
463463
'original_icon': None,
464464
'original_name': 'ESS BatteryLife schedule charge 2 days',
465465
'platform': 'victron_mqtt',
466466
'previous_unique_id': None,
467-
'suggested_object_id': None,
467+
'suggested_object_id': 'victron_mqtt_123_system_0_system_ess_schedule_charge_2_days',
468468
'supported_features': 0,
469469
'translation_key': 'system_ess_schedule_charge_slot_days',
470470
'unique_id': 'select.victron_mqtt_123_system_0_system_ess_schedule_charge_2_days',
@@ -482,23 +482,23 @@
482482
'disabled_by': None,
483483
'domain': 'switch',
484484
'entity_category': None,
485-
'entity_id': 'switch.victron_venus_ess_batterylife_schedule_charge_2_enabled',
485+
'entity_id': 'switch.victron_mqtt_123_system_0_system_ess_schedule_charge_2_enabled',
486486
'has_entity_name': True,
487487
'hidden_by': None,
488488
'icon': None,
489489
'id': <ANY>,
490490
'labels': set({
491491
}),
492492
'name': None,
493-
'object_id_base': 'ESS BatteryLife schedule charge 2 enabled',
493+
'object_id_base': None,
494494
'options': dict({
495495
}),
496496
'original_device_class': None,
497497
'original_icon': None,
498498
'original_name': 'ESS BatteryLife schedule charge 2 enabled',
499499
'platform': 'victron_mqtt',
500500
'previous_unique_id': None,
501-
'suggested_object_id': None,
501+
'suggested_object_id': 'victron_mqtt_123_system_0_system_ess_schedule_charge_2_enabled',
502502
'supported_features': 0,
503503
'translation_key': 'system_ess_schedule_charge_slot_enabled',
504504
'unique_id': 'switch.victron_mqtt_123_system_0_system_ess_schedule_charge_2_enabled',
@@ -617,15 +617,15 @@
617617
'disabled_by': None,
618618
'domain': 'sensor',
619619
'entity_category': None,
620-
'entity_id': 'sensor.victron_venus_pv_power',
620+
'entity_id': 'sensor.victron_mqtt_123_system_0_system_dc_pv_power',
621621
'has_entity_name': True,
622622
'hidden_by': None,
623623
'icon': None,
624624
'id': <ANY>,
625625
'labels': set({
626626
}),
627627
'name': None,
628-
'object_id_base': 'PV power',
628+
'object_id_base': None,
629629
'options': dict({
630630
'sensor': dict({
631631
'suggested_display_precision': 1,
@@ -636,7 +636,7 @@
636636
'original_name': 'PV power',
637637
'platform': 'victron_mqtt',
638638
'previous_unique_id': None,
639-
'suggested_object_id': None,
639+
'suggested_object_id': 'victron_mqtt_123_system_0_system_dc_pv_power',
640640
'supported_features': 0,
641641
'translation_key': 'system_dc_pv_power',
642642
'unique_id': 'sensor.victron_mqtt_123_system_0_system_dc_pv_power',
@@ -647,7 +647,7 @@
647647
}),
648648
'area_id': None,
649649
'capabilities': dict({
650-
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
650+
'state_class': <SensorStateClass.TOTAL: 'total'>,
651651
}),
652652
'config_entry_id': <ANY>,
653653
'config_subentry_id': <ANY>,
@@ -656,15 +656,15 @@
656656
'disabled_by': None,
657657
'domain': 'sensor',
658658
'entity_category': None,
659-
'entity_id': 'sensor.victron_venus_pv_energy',
659+
'entity_id': 'sensor.victron_mqtt_123_system_0_system_dc_pv_energy',
660660
'has_entity_name': True,
661661
'hidden_by': None,
662662
'icon': None,
663663
'id': <ANY>,
664664
'labels': set({
665665
}),
666666
'name': None,
667-
'object_id_base': 'PV energy',
667+
'object_id_base': None,
668668
'options': dict({
669669
'sensor': dict({
670670
'suggested_display_precision': 3,
@@ -675,7 +675,7 @@
675675
'original_name': 'PV energy',
676676
'platform': 'victron_mqtt',
677677
'previous_unique_id': None,
678-
'suggested_object_id': None,
678+
'suggested_object_id': 'victron_mqtt_123_system_0_system_dc_pv_energy',
679679
'supported_features': 0,
680680
'translation_key': 'system_dc_pv_energy',
681681
'unique_id': 'sensor.victron_mqtt_123_system_0_system_dc_pv_energy',
@@ -729,7 +729,7 @@
729729
}),
730730
'area_id': None,
731731
'capabilities': dict({
732-
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
732+
'state_class': <SensorStateClass.TOTAL: 'total'>,
733733
}),
734734
'config_entry_id': <ANY>,
735735
'config_subentry_id': <ANY>,
@@ -779,23 +779,23 @@
779779
'disabled_by': None,
780780
'domain': 'switch',
781781
'entity_category': None,
782-
'entity_id': 'switch.generator_manual_start',
782+
'entity_id': 'switch.victron_mqtt_123_generator_0_generator_manual_start',
783783
'has_entity_name': True,
784784
'hidden_by': None,
785785
'icon': None,
786786
'id': <ANY>,
787787
'labels': set({
788788
}),
789789
'name': None,
790-
'object_id_base': 'Manual start',
790+
'object_id_base': None,
791791
'options': dict({
792792
}),
793793
'original_device_class': None,
794794
'original_icon': None,
795795
'original_name': 'Manual start',
796796
'platform': 'victron_mqtt',
797797
'previous_unique_id': None,
798-
'suggested_object_id': None,
798+
'suggested_object_id': 'victron_mqtt_123_generator_0_generator_manual_start',
799799
'supported_features': 0,
800800
'translation_key': 'generator_manual_start',
801801
'unique_id': 'switch.victron_mqtt_123_generator_0_generator_manual_start',
@@ -855,23 +855,23 @@
855855
'disabled_by': None,
856856
'domain': 'time',
857857
'entity_category': None,
858-
'entity_id': 'time.victron_venus_ess_batterylife_schedule_charge_0_start',
858+
'entity_id': 'time.victron_mqtt_123_system_0_system_ess_schedule_charge_0_start',
859859
'has_entity_name': True,
860860
'hidden_by': None,
861861
'icon': None,
862862
'id': <ANY>,
863863
'labels': set({
864864
}),
865865
'name': None,
866-
'object_id_base': 'ESS BatteryLife schedule charge 0 start',
866+
'object_id_base': None,
867867
'options': dict({
868868
}),
869869
'original_device_class': None,
870870
'original_icon': None,
871871
'original_name': 'ESS BatteryLife schedule charge 0 start',
872872
'platform': 'victron_mqtt',
873873
'previous_unique_id': None,
874-
'suggested_object_id': None,
874+
'suggested_object_id': 'victron_mqtt_123_system_0_system_ess_schedule_charge_0_start',
875875
'supported_features': 0,
876876
'translation_key': 'system_ess_schedule_charge_slot_start',
877877
'unique_id': 'time.victron_mqtt_123_system_0_system_ess_schedule_charge_0_start',

‎tests/test_hub.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,14 @@ async def test_sensor_with_baseline(
455455
# Mock time.monotonic() to return a fixed time
456456
mock_time.return_value = 0
457457

458-
# The entity_id follows the new naming convention: sensor.<device_name>_<metric_name>
459-
entity_id = "sensor.victron_venus_pv_energy"
458+
# The entity_id depends on the naming convention:
459+
# simple_naming: HA generates from device name + entity name
460+
# complex_naming: includes installation_id in the unique_id/entity_id
461+
simple_naming = mock_config_entry.data[CONF_SIMPLE_NAMING]
462+
if simple_naming:
463+
entity_id = "sensor.victron_venus_pv_energy"
464+
else:
465+
entity_id = "sensor.victron_mqtt_123_system_0_system_dc_pv_energy"
460466

461467
# Mock the restore cache with a previous state value of 1000.0
462468
mock_restore_cache(hass, [State(entity_id, "1000.0")])

0 commit comments

Comments
 (0)