Use unique fibaro_id in test fixtures (home-assistant#164763)

Author: rappenze

tests/components/fibaro/conftest.py

@@ -86,7 +86,7 @@ def mock_power_sensor() -> Mock:
 def mock_positionable_cover() -> Mock:
     """Fixture for a positionable cover."""
     cover = Mock()
-    cover.fibaro_id = 3
+    cover.fibaro_id = 2
     cover.parent_fibaro_id = 0
     cover.name = "Test cover"
     cover.room_id = 1
@@ -209,7 +209,7 @@ def mock_zigbee_light() -> Mock:
 def mock_thermostat() -> Mock:
     """Fixture for a thermostat."""
     climate = Mock()
-    climate.fibaro_id = 4
+    climate.fibaro_id = 13
     climate.parent_fibaro_id = 0
     climate.name = "Test climate"
     climate.room_id = 1
@@ -290,7 +290,7 @@ def mock_thermostat_with_operating_mode() -> Mock:
 def mock_thermostat_quickapp_1() -> Mock:
     """Fixture for a thermostat."""
     climate = Mock()
-    climate.fibaro_id = 6
+    climate.fibaro_id = 9
     climate.parent_fibaro_id = 0
     climate.has_endpoint_id = False
     climate.name = "Test climate"
@@ -321,7 +321,7 @@ def mock_thermostat_quickapp_1() -> Mock:
 def mock_thermostat_quickapp_2() -> Mock:
     """Fixture for a thermostat."""
     climate = Mock()
-    climate.fibaro_id = 7
+    climate.fibaro_id = 10
     climate.parent_fibaro_id = 0
     climate.has_endpoint_id = False
     climate.name = "Test climate 2"

tests/components/fibaro/test_climate.py

@@ -30,9 +30,9 @@ async def test_climate_setup(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        entry = entity_registry.async_get("climate.room_1_test_climate_4")
+        entry = entity_registry.async_get("climate.room_1_test_climate_13")
         assert entry
-        assert entry.unique_id == "hc2_111111.4"
+        assert entry.unique_id == "hc2_111111.13"
         assert entry.original_name == "Room 1 Test climate"
         assert entry.supported_features == (
             ClimateEntityFeature.TURN_ON
@@ -63,9 +63,9 @@ async def test_climate_setup_2_quickapps(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        entry1 = entity_registry.async_get("climate.room_1_test_climate_6")
+        entry1 = entity_registry.async_get("climate.room_1_test_climate_9")
         assert entry1
-        entry2 = entity_registry.async_get("climate.room_1_test_climate_2_7")
+        entry2 = entity_registry.async_get("climate.room_1_test_climate_2_10")
         assert entry2
 
 
@@ -86,7 +86,7 @@ async def test_hvac_mode_preset(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        state = hass.states.get("climate.room_1_test_climate_4")
+        state = hass.states.get("climate.room_1_test_climate_13")
         assert state.state == HVACMode.AUTO
         assert state.attributes["preset_mode"] == "CustomerSpecific"
 
@@ -109,7 +109,7 @@ async def test_hvac_mode_heat(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        state = hass.states.get("climate.room_1_test_climate_4")
+        state = hass.states.get("climate.room_1_test_climate_13")
         assert state.state == HVACMode.HEAT
         assert state.attributes["preset_mode"] is None
 
@@ -133,7 +133,7 @@ async def test_set_hvac_mode(
         await hass.services.async_call(
             "climate",
             "set_hvac_mode",
-            {"entity_id": "climate.room_1_test_climate_4", "hvac_mode": HVACMode.HEAT},
+            {"entity_id": "climate.room_1_test_climate_13", "hvac_mode": HVACMode.HEAT},
             blocking=True,
         )
 

tests/components/fibaro/test_cover.py

@@ -30,15 +30,15 @@ async def test_positionable_cover_setup(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        entry = entity_registry.async_get("cover.room_1_test_cover_3")
+        entry = entity_registry.async_get("cover.room_1_test_cover_2")
         assert entry
         assert entry.supported_features == (
             CoverEntityFeature.OPEN
             | CoverEntityFeature.CLOSE
             | CoverEntityFeature.STOP
             | CoverEntityFeature.SET_POSITION
         )
-        assert entry.unique_id == "hc2_111111.3"
+        assert entry.unique_id == "hc2_111111.2"
         assert entry.original_name == "Room 1 Test cover"
 
 
@@ -59,7 +59,7 @@ async def test_cover_opening(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        assert hass.states.get("cover.room_1_test_cover_3").state == CoverState.OPENING
+        assert hass.states.get("cover.room_1_test_cover_2").state == CoverState.OPENING
 
 
 async def test_cover_opening_closing_none(
@@ -80,7 +80,7 @@ async def test_cover_opening_closing_none(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        assert hass.states.get("cover.room_1_test_cover_3").state == CoverState.OPEN
+        assert hass.states.get("cover.room_1_test_cover_2").state == CoverState.OPEN
 
 
 async def test_cover_closing(
@@ -101,7 +101,7 @@ async def test_cover_closing(
         # Act
         await init_integration(hass, mock_config_entry)
         # Assert
-        assert hass.states.get("cover.room_1_test_cover_3").state == CoverState.CLOSING
+        assert hass.states.get("cover.room_1_test_cover_2").state == CoverState.CLOSING
 
 
 async def test_cover_setup(