From 68797feac5442ca6b9f4730b771d9da31a3ceaa9 Mon Sep 17 00:00:00 2001
From: jjlawren <jjlawren@users.noreply.github.com>
Date: Sat, 3 Feb 2024 02:20:10 -0600
Subject: [PATCH] Do not suggest area for portable Sonos speakers (#109350)

* Do not suggest area for portable speakers

* Update tests

* Improve readability, update tests
---
 homeassistant/components/sonos/entity.py    |  6 +++-
 tests/components/sonos/test_media_player.py | 31 +++++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/sonos/entity.py b/homeassistant/components/sonos/entity.py
index 90cadcdad37..05b69c54c50 100644
--- a/homeassistant/components/sonos/entity.py
+++ b/homeassistant/components/sonos/entity.py
@@ -76,6 +76,10 @@ class SonosEntity(Entity):
     @property
     def device_info(self) -> DeviceInfo:
         """Return information about the device."""
+        suggested_area: str | None = None
+        if not self.speaker.battery_info:
+            # Only set suggested area for non-portable devices
+            suggested_area = self.speaker.zone_name
         return DeviceInfo(
             identifiers={(DOMAIN, self.soco.uid)},
             name=self.speaker.zone_name,
@@ -86,7 +90,7 @@ class SonosEntity(Entity):
                 (dr.CONNECTION_UPNP, f"uuid:{self.speaker.uid}"),
             },
             manufacturer="Sonos",
-            suggested_area=self.speaker.zone_name,
+            suggested_area=suggested_area,
             configuration_url=f"http://{self.soco.ip_address}:1400/support/review",
         )
 
diff --git a/tests/components/sonos/test_media_player.py b/tests/components/sonos/test_media_player.py
index fa37b2210e7..ddf550dc376 100644
--- a/tests/components/sonos/test_media_player.py
+++ b/tests/components/sonos/test_media_player.py
@@ -1,26 +1,45 @@
 """Tests for the Sonos Media Player platform."""
 from homeassistant.const import STATE_IDLE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.device_registry import (
+    CONNECTION_NETWORK_MAC,
+    CONNECTION_UPNP,
+    DeviceRegistry,
+)
 
 
 async def test_device_registry(
-    hass: HomeAssistant, async_autosetup_sonos, soco
+    hass: HomeAssistant, device_registry: DeviceRegistry, async_autosetup_sonos, soco
 ) -> None:
     """Test sonos device registered in the device registry."""
-    device_registry = dr.async_get(hass)
     reg_device = device_registry.async_get_device(
         identifiers={("sonos", "RINCON_test")}
     )
+    assert reg_device is not None
     assert reg_device.model == "Model Name"
     assert reg_device.sw_version == "13.1"
     assert reg_device.connections == {
-        (dr.CONNECTION_NETWORK_MAC, "00:11:22:33:44:55"),
-        (dr.CONNECTION_UPNP, "uuid:RINCON_test"),
+        (CONNECTION_NETWORK_MAC, "00:11:22:33:44:55"),
+        (CONNECTION_UPNP, "uuid:RINCON_test"),
     }
     assert reg_device.manufacturer == "Sonos"
-    assert reg_device.suggested_area == "Zone A"
     assert reg_device.name == "Zone A"
+    # Default device provides battery info, area should not be suggested
+    assert reg_device.suggested_area is None
+
+
+async def test_device_registry_not_portable(
+    hass: HomeAssistant, device_registry: DeviceRegistry, async_setup_sonos, soco
+) -> None:
+    """Test non-portable sonos device registered in the device registry to ensure area suggested."""
+    soco.get_battery_info.return_value = {}
+    await async_setup_sonos()
+
+    reg_device = device_registry.async_get_device(
+        identifiers={("sonos", "RINCON_test")}
+    )
+    assert reg_device is not None
+    assert reg_device.suggested_area == "Zone A"
 
 
 async def test_entity_basic(