Improve code quality in huawei_lte (#76583)

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

homeassistant/components/huawei_lte/__init__.py

@@ -279,11 +279,12 @@ class Router:
         self._get_data(
             KEY_WLAN_WIFI_GUEST_NETWORK_SWITCH,
             lambda: next(
-                filter(
-                    lambda ssid: ssid.get("wifiisguestnetwork") == "1",
-                    self.client.wlan.multi_basic_settings()
+                (
+                    ssid
+                    for ssid in self.client.wlan.multi_basic_settings()
                     .get("Ssids", {})
-                    .get("Ssid", []),
+                    .get("Ssid", [])
+                    if isinstance(ssid, dict) and ssid.get("wifiisguestnetwork") == "1"
                 ),
                 {},
             ),

homeassistant/components/huawei_lte/switch.py

@@ -37,7 +37,7 @@ async def async_setup_entry(
     if router.data.get(KEY_DIALUP_MOBILE_DATASWITCH):
         switches.append(HuaweiLteMobileDataSwitch(router))
 
-    if router.data.get(KEY_WLAN_WIFI_GUEST_NETWORK_SWITCH).get("WifiEnable"):
+    if router.data.get(KEY_WLAN_WIFI_GUEST_NETWORK_SWITCH, {}).get("WifiEnable"):
         switches.append(HuaweiLteWifiGuestNetworkSwitch(router))
 
     async_add_entities(switches, True)
@@ -151,6 +151,6 @@ class HuaweiLteWifiGuestNetworkSwitch(HuaweiLteBaseSwitch):
         return "mdi:wifi" if self.is_on else "mdi:wifi-off"
 
     @property
-    def extra_state_attributes(self) -> dict[str, str]:
+    def extra_state_attributes(self) -> dict[str, str | None]:
         """Return the state attributes."""
         return {"ssid": self.router.data[self.key].get("WifiSsid")}

tests/components/huawei_lte/test_switches.py

@@ -2,7 +2,6 @@
 from unittest.mock import MagicMock, patch
 
 from huawei_lte_api.enums.cradle import ConnectionStatusEnum
-from pytest import fixture
 
 from homeassistant.components.huawei_lte.const import DOMAIN
 from homeassistant.components.switch import (
@@ -20,94 +19,70 @@ from tests.common import MockConfigEntry
 SWITCH_WIFI_GUEST_NETWORK = "switch.lte_wifi_guest_network"
 
 
-@fixture
+def magic_client(multi_basic_settings_value: dict) -> MagicMock:
+    """Mock huawei_lte.Client."""
+    information = MagicMock(return_value={"SerialNumber": "test-serial-number"})
+    check_notifications = MagicMock(return_value={"SmsStorageFull": 0})
+    status = MagicMock(
+        return_value={"ConnectionStatus": ConnectionStatusEnum.CONNECTED.value}
+    )
+    multi_basic_settings = MagicMock(return_value=multi_basic_settings_value)
+    wifi_feature_switch = MagicMock(return_value={"wifi24g_switch_enable": 1})
+    device = MagicMock(information=information)
+    monitoring = MagicMock(check_notifications=check_notifications, status=status)
+    wlan = MagicMock(
+        multi_basic_settings=multi_basic_settings,
+        wifi_feature_switch=wifi_feature_switch,
+    )
+    return MagicMock(device=device, monitoring=monitoring, wlan=wlan)
+
+
 @patch("homeassistant.components.huawei_lte.Connection", MagicMock())
-@patch(
-    "homeassistant.components.huawei_lte.Client",
-    return_value=MagicMock(
-        device=MagicMock(
-            information=MagicMock(return_value={"SerialNumber": "test-serial-number"})
-        ),
-        monitoring=MagicMock(
-            check_notifications=MagicMock(return_value={"SmsStorageFull": 0}),
-            status=MagicMock(
-                return_value={"ConnectionStatus": ConnectionStatusEnum.CONNECTED.value}
-            ),
-        ),
-        wlan=MagicMock(
-            multi_basic_settings=MagicMock(
-                return_value={
-                    "Ssids": {"Ssid": [{"wifiisguestnetwork": "1", "WifiEnable": "0"}]}
-                }
-            ),
-            wifi_feature_switch=MagicMock(return_value={"wifi24g_switch_enable": 1}),
-        ),
-    ),
-)
-async def setup_component_with_wifi_guest_network(
-    client: MagicMock, hass: HomeAssistant
-) -> None:
-    """Initialize huawei_lte components."""
-    assert client
-    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
-    huawei_lte.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(huawei_lte.entry_id)
-    await hass.async_block_till_done()
-
-
-@fixture
-@patch("homeassistant.components.huawei_lte.Connection", MagicMock())
-@patch(
-    "homeassistant.components.huawei_lte.Client",
-    return_value=MagicMock(
-        device=MagicMock(
-            information=MagicMock(return_value={"SerialNumber": "test-serial-number"})
-        ),
-        monitoring=MagicMock(
-            check_notifications=MagicMock(return_value={"SmsStorageFull": 0}),
-            status=MagicMock(
-                return_value={"ConnectionStatus": ConnectionStatusEnum.CONNECTED.value}
-            ),
-        ),
-        wlan=MagicMock(
-            multi_basic_settings=MagicMock(return_value={}),
-            wifi_feature_switch=MagicMock(return_value={"wifi24g_switch_enable": 1}),
-        ),
-    ),
-)
-async def setup_component_without_wifi_guest_network(
-    client: MagicMock, hass: HomeAssistant
-) -> None:
-    """Initialize huawei_lte components."""
-    assert client
-    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
-    huawei_lte.add_to_hass(hass)
-    assert await hass.config_entries.async_setup(huawei_lte.entry_id)
-    await hass.async_block_till_done()
-
-
-def test_huawei_lte_wifi_guest_network_config_entry_when_network_is_not_present(
+@patch("homeassistant.components.huawei_lte.Client", return_value=magic_client({}))
+async def test_huawei_lte_wifi_guest_network_config_entry_when_network_is_not_present(
+    client,
     hass: HomeAssistant,
-    setup_component_without_wifi_guest_network,
 ) -> None:
     """Test switch wifi guest network config entry when network is not present."""
+    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
+    huawei_lte.add_to_hass(hass)
+    await hass.config_entries.async_setup(huawei_lte.entry_id)
+    await hass.async_block_till_done()
     entity_registry: EntityRegistry = er.async_get(hass)
     assert not entity_registry.async_is_registered(SWITCH_WIFI_GUEST_NETWORK)
 
 
-def test_huawei_lte_wifi_guest_network_config_entry_when_network_is_present(
+@patch("homeassistant.components.huawei_lte.Connection", MagicMock())
+@patch(
+    "homeassistant.components.huawei_lte.Client",
+    return_value=magic_client(
+        {"Ssids": {"Ssid": [{"wifiisguestnetwork": "1", "WifiEnable": "0"}]}}
+    ),
+)
+async def test_huawei_lte_wifi_guest_network_config_entry_when_network_is_present(
+    client,
     hass: HomeAssistant,
-    setup_component_with_wifi_guest_network,
 ) -> None:
     """Test switch wifi guest network config entry when network is present."""
+    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
+    huawei_lte.add_to_hass(hass)
+    await hass.config_entries.async_setup(huawei_lte.entry_id)
+    await hass.async_block_till_done()
     entity_registry: EntityRegistry = er.async_get(hass)
     assert entity_registry.async_is_registered(SWITCH_WIFI_GUEST_NETWORK)
 
 
-async def test_turn_on_switch_wifi_guest_network(
-    hass: HomeAssistant, setup_component_with_wifi_guest_network
-) -> None:
+@patch("homeassistant.components.huawei_lte.Connection", MagicMock())
+@patch("homeassistant.components.huawei_lte.Client")
+async def test_turn_on_switch_wifi_guest_network(client, hass: HomeAssistant) -> None:
     """Test switch wifi guest network turn on method."""
+    client.return_value = magic_client(
+        {"Ssids": {"Ssid": [{"wifiisguestnetwork": "1", "WifiEnable": "0"}]}}
+    )
+    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
+    huawei_lte.add_to_hass(hass)
+    await hass.config_entries.async_setup(huawei_lte.entry_id)
+    await hass.async_block_till_done()
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_ON,
@@ -116,15 +91,20 @@ async def test_turn_on_switch_wifi_guest_network(
     )
     await hass.async_block_till_done()
     assert hass.states.is_state(SWITCH_WIFI_GUEST_NETWORK, STATE_ON)
-    hass.data[DOMAIN].routers[
-        "test-serial-number"
-    ].client.wlan.wifi_guest_network_switch.assert_called_once_with(True)
+    client.return_value.wlan.wifi_guest_network_switch.assert_called_once_with(True)
 
 
-async def test_turn_off_switch_wifi_guest_network(
-    hass: HomeAssistant, setup_component_with_wifi_guest_network
-) -> None:
+@patch("homeassistant.components.huawei_lte.Connection", MagicMock())
+@patch("homeassistant.components.huawei_lte.Client")
+async def test_turn_off_switch_wifi_guest_network(client, hass: HomeAssistant) -> None:
     """Test switch wifi guest network turn off method."""
+    client.return_value = magic_client(
+        {"Ssids": {"Ssid": [{"wifiisguestnetwork": "1", "WifiEnable": "1"}]}}
+    )
+    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
+    huawei_lte.add_to_hass(hass)
+    await hass.config_entries.async_setup(huawei_lte.entry_id)
+    await hass.async_block_till_done()
     await hass.services.async_call(
         SWITCH_DOMAIN,
         SERVICE_TURN_OFF,
@@ -133,6 +113,44 @@ async def test_turn_off_switch_wifi_guest_network(
     )
     await hass.async_block_till_done()
     assert hass.states.is_state(SWITCH_WIFI_GUEST_NETWORK, STATE_OFF)
-    hass.data[DOMAIN].routers[
-        "test-serial-number"
-    ].client.wlan.wifi_guest_network_switch.assert_called_with(False)
+    client.return_value.wlan.wifi_guest_network_switch.assert_called_with(False)
+
+
+@patch("homeassistant.components.huawei_lte.Connection", MagicMock())
+@patch(
+    "homeassistant.components.huawei_lte.Client",
+    return_value=magic_client({"Ssids": {"Ssid": "str"}}),
+)
+async def test_huawei_lte_wifi_guest_network_config_entry_when_ssid_is_str(
+    client, hass: HomeAssistant
+):
+    """Test switch wifi guest network config entry when ssid is a str.
+
+    Issue #76244. Huawai models: H312-371, E5372 and E8372.
+    """
+    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
+    huawei_lte.add_to_hass(hass)
+    await hass.config_entries.async_setup(huawei_lte.entry_id)
+    await hass.async_block_till_done()
+    entity_registry: EntityRegistry = er.async_get(hass)
+    assert not entity_registry.async_is_registered(SWITCH_WIFI_GUEST_NETWORK)
+
+
+@patch("homeassistant.components.huawei_lte.Connection", MagicMock())
+@patch(
+    "homeassistant.components.huawei_lte.Client",
+    return_value=magic_client({"Ssids": {"Ssid": None}}),
+)
+async def test_huawei_lte_wifi_guest_network_config_entry_when_ssid_is_none(
+    client, hass: HomeAssistant
+):
+    """Test switch wifi guest network config entry when ssid is a None.
+
+    Issue #76244.
+    """
+    huawei_lte = MockConfigEntry(domain=DOMAIN, data={CONF_URL: "http://huawei-lte"})
+    huawei_lte.add_to_hass(hass)
+    await hass.config_entries.async_setup(huawei_lte.entry_id)
+    await hass.async_block_till_done()
+    entity_registry: EntityRegistry = er.async_get(hass)
+    assert not entity_registry.async_is_registered(SWITCH_WIFI_GUEST_NETWORK)