Merge branch 'configure_entity' into protect_entity_setters

tests/component_tests/sensor/test_sensor.py

@@ -1,5 +1,15 @@
 """Tests for the sensor component."""
 
+import re
+
+
+def _extract_packed_value(main_cpp, var_name):
+    """Extract the third (packed) argument from a configure_entity_ call."""
+    pattern = rf"{re.escape(var_name)}->configure_entity_\([^,]+,\s*\w+,\s*(\d+)\)"
+    match = re.search(pattern, main_cpp)
+    assert match, f"configure_entity_ call not found for {var_name}"
+    return int(match.group(1))
+
 
 def test_sensor_device_class_set(generate_main):
     """
@@ -10,5 +20,6 @@ def test_sensor_device_class_set(generate_main):
     # When
     main_cpp = generate_main("tests/component_tests/sensor/test_sensor.yaml")
 
-    # Then
-    assert "s_1->configure_entity_(" in main_cpp
+    # Then: device_class: voltage means packed value must be non-zero
+    packed = _extract_packed_value(main_cpp, "s_1")
+    assert packed != 0

tests/component_tests/text_sensor/test_text_sensor.py

@@ -1,5 +1,15 @@
 """Tests for the text sensor component."""
 
+import re
+
+
+def _extract_packed_value(main_cpp, var_name):
+    """Extract the third (packed) argument from a configure_entity_ call."""
+    pattern = rf"{re.escape(var_name)}->configure_entity_\([^,]+,\s*\w+,\s*(\d+)\)"
+    match = re.search(pattern, main_cpp)
+    assert match, f"configure_entity_ call not found for {var_name}"
+    return int(match.group(1))
+
 
 def test_text_sensor_is_setup(generate_main):
     """
@@ -54,6 +64,9 @@ def test_text_sensor_device_class_set(generate_main):
     # When
     main_cpp = generate_main("tests/component_tests/text_sensor/test_text_sensor.yaml")
 
-    # Then
-    assert "ts_2->configure_entity_(" in main_cpp
-    assert "ts_3->configure_entity_(" in main_cpp
+    # Then: ts_2 has device_class: timestamp, ts_3 has device_class: date
+    # so their packed values must be non-zero
+    packed_ts_2 = _extract_packed_value(main_cpp, "ts_2")
+    assert packed_ts_2 != 0
+    packed_ts_3 = _extract_packed_value(main_cpp, "ts_3")
+    assert packed_ts_3 != 0