preen

tests/component_tests/binary_sensor/test_binary_sensor.py

@@ -29,7 +29,7 @@ def test_binary_sensor_sets_mandatory_fields(generate_main):
     )
 
     # Then
-    assert 'bs_1->set_name_and_object_id("test bs1", "test_bs1");' in main_cpp
+    assert 'bs_1->set_name("test bs1",' in main_cpp
     assert "bs_1->set_pin(" in main_cpp
 
 

tests/component_tests/button/test_button.py

@@ -26,7 +26,7 @@ def test_button_sets_mandatory_fields(generate_main):
     main_cpp = generate_main("tests/component_tests/button/test_button.yaml")
 
     # Then
-    assert 'wol_1->set_name_and_object_id("wol_test_1", "wol_test_1");' in main_cpp
+    assert 'wol_1->set_name("wol_test_1",' in main_cpp
     assert "wol_2->set_macaddr(18, 52, 86, 120, 144, 171);" in main_cpp
 
 

tests/component_tests/text/test_text.py

@@ -25,7 +25,7 @@ def test_text_sets_mandatory_fields(generate_main):
     main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
 
     # Then
-    assert 'it_1->set_name_and_object_id("test 1 text", "test_1_text");' in main_cpp
+    assert 'it_1->set_name("test 1 text",' in main_cpp
 
 
 def test_text_config_value_internal_set(generate_main):

tests/component_tests/text_sensor/test_text_sensor.py

@@ -25,18 +25,9 @@ def test_text_sensor_sets_mandatory_fields(generate_main):
     main_cpp = generate_main("tests/component_tests/text_sensor/test_text_sensor.yaml")
 
     # Then
-    assert (
-        'ts_1->set_name_and_object_id("Template Text Sensor 1", "template_text_sensor_1");'
-        in main_cpp
-    )
-    assert (
-        'ts_2->set_name_and_object_id("Template Text Sensor 2", "template_text_sensor_2");'
-        in main_cpp
-    )
-    assert (
-        'ts_3->set_name_and_object_id("Template Text Sensor 3", "template_text_sensor_3");'
-        in main_cpp
-    )
+    assert 'ts_1->set_name("Template Text Sensor 1",' in main_cpp
+    assert 'ts_2->set_name("Template Text Sensor 2",' in main_cpp
+    assert 'ts_3->set_name("Template Text Sensor 3",' in main_cpp
 
 
 def test_text_sensor_config_value_internal_set(generate_main):

tests/unit_tests/core/test_entity_helpers.py

@@ -27,13 +27,9 @@ from esphome.helpers import sanitize, snake_case
 
 from .common import load_config_from_fixture
 
-# Pre-compiled regex patterns for extracting object IDs from expressions
-# Matches both old format: .set_object_id("obj_id")
-# and new format: .set_name_and_object_id("name", "obj_id")
-OBJECT_ID_PATTERN = re.compile(r'\.set_object_id\(["\'](.*?)["\']\)')
-COMBINED_PATTERN = re.compile(
-    r'\.set_name_and_object_id\(["\'].*?["\']\s*,\s*["\'](.*?)["\']\)'
-)
+# Pre-compiled regex pattern for extracting names from set_name calls
+# Matches: .set_name("name", hash) or .set_name("name")
+SET_NAME_PATTERN = re.compile(r'\.set_name\(["\']([^"\']*)["\']')
 
 FIXTURES_DIR = Path(__file__).parent.parent / "fixtures" / "core" / "entity_helpers"
 
@@ -276,14 +272,16 @@ def setup_test_environment() -> Generator[list[str], None, None]:
 
 
 def extract_object_id_from_expressions(expressions: list[str]) -> str | None:
-    """Extract the object ID that was set from the generated expressions."""
+    """Extract the object ID that would be computed from set_name calls.
+
+    Since object_id is now computed from the name (via snake_case + sanitize),
+    we extract the name from set_name() calls and compute the expected object_id.
+    """
     for expr in expressions:
-        # First try new combined format: .set_name_and_object_id("name", "obj_id")
-        if match := COMBINED_PATTERN.search(expr):
-            return match.group(1)
-        # Fall back to old format: .set_object_id("obj_id")
-        if match := OBJECT_ID_PATTERN.search(expr):
-            return match.group(1)
+        if match := SET_NAME_PATTERN.search(expr):
+            name = match.group(1)
+            # Compute object_id the same way as get_base_entity_object_id
+            return sanitize(snake_case(name)) if name else None
     return None