Set Matter battery sensors as diagnostic

homeassistant/components/matter/binary_sensor.py

@@ -13,7 +13,7 @@
     BinarySensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -99,6 +99,7 @@ def _update_from_device(self) -> None:
         entity_description=MatterBinarySensorEntityDescription(
             key="BatteryChargeLevel",
             device_class=BinarySensorDeviceClass.BATTERY,
+            entity_category=EntityCategory.DIAGNOSTIC,
             measurement_to_ha=lambda x: x
             != clusters.PowerSource.Enums.BatChargeLevelEnum.kOk,
         ),

homeassistant/components/matter/sensor.py

@@ -16,6 +16,7 @@
 from homeassistant.const import (
     LIGHT_LUX,
     PERCENTAGE,
+    EntityCategory,
     Platform,
     UnitOfPressure,
     UnitOfTemperature,
@@ -127,6 +128,7 @@ def _update_from_device(self) -> None:
             key="PowerSource",
             native_unit_of_measurement=PERCENTAGE,
             device_class=SensorDeviceClass.BATTERY,
+            entity_category=EntityCategory.DIAGNOSTIC,
             # value has double precision
             measurement_to_ha=lambda x: int(x / 2),
         ),

tests/components/matter/conftest.py

@@ -5,12 +5,15 @@
 from collections.abc import AsyncGenerator, Generator
 from unittest.mock import AsyncMock, MagicMock, patch
 
+from matter_server.client.models.node import MatterNode
 from matter_server.common.const import SCHEMA_VERSION
 from matter_server.common.models import ServerInfoMessage
 import pytest
 
 from homeassistant.core import HomeAssistant
 
+from .common import setup_integration_with_node_fixture
+
 from tests.common import MockConfigEntry
 
 MOCK_FABRIC_ID = 12341234
@@ -210,3 +213,21 @@ def update_addon_fixture() -> Generator[AsyncMock, None, None]:
         "homeassistant.components.hassio.addon_manager.async_update_addon"
     ) as update_addon:
         yield update_addon
+
+
+@pytest.fixture(name="door_lock")
+async def door_lock_fixture(
+    hass: HomeAssistant, matter_client: MagicMock
+) -> MatterNode:
+    """Fixture for a door lock node."""
+    return await setup_integration_with_node_fixture(hass, "door-lock", matter_client)
+
+
+@pytest.fixture(name="eve_contact_sensor_node")
+async def eve_contact_sensor_node_fixture(
+    hass: HomeAssistant, matter_client: MagicMock
+) -> MatterNode:
+    """Fixture for a contact sensor node."""
+    return await setup_integration_with_node_fixture(
+        hass, "eve-contact-sensor", matter_client
+    )