Fix unit tests

Author: puddly

tests/test_number.py

@@ -120,19 +120,19 @@ async def test_number(
 
     assert cluster.read_attributes.call_count == 3
 
-    assert entity.description == "PWM1"
+    assert entity.fallback_name == "PWM1"
 
     # test that the state is 15.0
     assert entity.state["state"] == 15.0
 
     # test attributes
-    assert entity.info_object.min_value == 1.0
-    assert entity.info_object.max_value == 100.0
-    assert entity.info_object.step == 1.1
+    assert entity.info_object.native_min_value == 1.0
+    assert entity.info_object.native_max_value == 100.0
+    assert entity.info_object.native_step == 1.1
+    assert entity.info_object.mode == NumberMode.AUTO
 
     assert entity.icon == "mdi:percent"
     assert entity.native_unit_of_measurement == "%"
-    assert entity.mode == NumberMode.AUTO
     assert entity.native_min_value == 1.0
     assert entity.native_max_value == 100.0
     assert entity.native_step == 1.1
@@ -149,7 +149,7 @@ async def test_number(
     assert entity.state["state"] == 20.0
 
     # change value from client
-    await entity.async_set_value(30.0)
+    await entity.async_set_native_value(30.0)
     await zha_gateway.async_block_till_done()
 
     assert len(cluster.write_attributes.mock_calls) == 1
@@ -241,7 +241,7 @@ async def test_level_control_number(
     assert entity._attr_entity_category == EntityCategory.CONFIG
 
     assert entity.icon is None
-    assert entity.description is None
+    assert entity.fallback_name is None
     assert entity.native_unit_of_measurement is None
     assert entity.mode == NumberMode.AUTO
     assert entity.native_min_value == 0

zha/application/platforms/__init__.py

@@ -114,12 +114,13 @@ class BaseEntity(LogMixin, EventBase):
 
     PLATFORM: Platform = Platform.UNKNOWN
 
-    _attr_fallback_name: str | None
-    _attr_translation_key: str | None
-    _attr_entity_category: EntityCategory | None
+    _attr_fallback_name: str | None = None
+    _attr_icon: str | None = None
+    _attr_translation_key: str | None = None
+    _attr_entity_category: EntityCategory | None = None
     _attr_entity_registry_enabled_default: bool = True
-    _attr_device_class: str | None
-    _attr_state_class: str | None
+    _attr_device_class: str | None = None
+    _attr_state_class: str | None = None
     _attr_enabled: bool = True
     _attr_always_supported: bool = False
     _attr_primary: bool = False
@@ -187,14 +188,12 @@ def primary_weight(self) -> int:
     @property
     def fallback_name(self) -> str | None:
         """Return the entity fallback name for when a translation key is unavailable."""
-        if hasattr(self, "_attr_fallback_name"):
-            return self._attr_fallback_name
-        return None
+        return self._attr_fallback_name
 
     @property
     def icon(self) -> str | None:
         """Return the entity icon."""
-        return None
+        return self._attr_icon
 
     @property
     def translation_key(self) -> str | None:
@@ -218,16 +217,12 @@ def entity_registry_enabled_default(self) -> bool:
     @property
     def device_class(self) -> str | None:
         """Return the device class."""
-        if hasattr(self, "_attr_device_class"):
-            return self._attr_device_class
-        return None
+        return self._attr_device_class
 
     @property
     def state_class(self) -> str | None:
         """Return the state class."""
-        if hasattr(self, "_attr_state_class"):
-            return self._attr_state_class
-        return None
+        return self._attr_state_class
 
     @final
     @property