Merge branch 'dev' into enhancement/ethernet-spi-interface

tests/component_tests/mipi_spi/test_init.py

@@ -69,7 +69,7 @@ def run_schema_validation(config: ConfigType) -> None:
             {
                 "id": "display_id",
                 "model": "custom",
-                "dimensions": {"width": 320, "height": 240},
+                "dimensions": {"width": 260, "height": 260},
                 "draw_rounding": 13,
                 "init_sequence": [[0xA0, 0x01]],
             },
@@ -336,7 +336,7 @@ def test_native_generation(
 
     main_cpp = generate_main(component_fixture_path("native.yaml"))
     assert (
-        "mipi_spi::MipiSpiBuffer<uint16_t, mipi_spi::PIXEL_MODE_16, true, mipi_spi::PIXEL_MODE_16, mipi_spi::BUS_TYPE_QUAD, 360, 360, 0, 1, display::DISPLAY_ROTATION_0_DEGREES, 1>()"
+        "mipi_spi::MipiSpiBuffer<uint16_t, mipi_spi::PIXEL_MODE_16, true, mipi_spi::PIXEL_MODE_16, mipi_spi::BUS_TYPE_QUAD, 360, 360, 0, 1, display::DISPLAY_ROTATION_0_DEGREES, 1, 1>()"
         in main_cpp
     )
     assert "set_init_sequence({240, 1, 8, 242" in main_cpp

tests/component_tests/packages/test_packages.py

@@ -5,7 +5,8 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 
-from esphome.components.packages import do_packages_pass
+from esphome.components.packages import CONFIG_SCHEMA, do_packages_pass
+from esphome.config import resolve_extend_remove
 from esphome.config_helpers import Extend, Remove
 import esphome.config_validation as cv
 from esphome.const import (
@@ -64,13 +65,20 @@ def fixture_basic_esphome():
     return {CONF_NAME: TEST_DEVICE_NAME, CONF_PLATFORM: TEST_PLATFORM}
 
 
+def packages_pass(config):
+    """Wrapper around packages_pass that also resolves Extend and Remove."""
+    config = do_packages_pass(config)
+    resolve_extend_remove(config)
+    return config
+
+
 def test_package_unused(basic_esphome, basic_wifi):
     """
     Ensures do_package_pass does not change a config if packages aren't used.
     """
     config = {CONF_ESPHOME: basic_esphome, CONF_WIFI: basic_wifi}
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == config
 
 
@@ -83,7 +91,51 @@ def test_package_invalid_dict(basic_esphome, basic_wifi):
     config = {CONF_ESPHOME: basic_esphome, CONF_PACKAGES: basic_wifi | {CONF_URL: ""}}
 
     with pytest.raises(cv.Invalid):
-        do_packages_pass(config)
+        packages_pass(config)
+
+
+@pytest.mark.parametrize(
+    "package",
+    [
+        {"package1": "github://esphome/non-existant-repo/file1.yml@main"},
+        {"package2": "github://esphome/non-existant-repo/file1.yml"},
+        {"package3": "github://esphome/non-existant-repo/other-folder/file1.yml"},
+        [
+            "github://esphome/non-existant-repo/file1.yml@main",
+            "github://esphome/non-existant-repo/file1.yml",
+            "github://esphome/non-existant-repo/other-folder/file1.yml",
+        ],
+    ],
+)
+def test_package_shorthand(package):
+    CONFIG_SCHEMA(package)
+
+
+@pytest.mark.parametrize(
+    "package",
+    [
+        # not github
+        {"package1": "someplace://esphome/non-existant-repo/file1.yml@main"},
+        # missing repo
+        {"package2": "github://esphome/file1.yml"},
+        # missing file
+        {"package3": "github://esphome/non-existant-repo/@main"},
+        {"a": "invalid string, not shorthand"},
+        "some string",
+        3,
+        False,
+        {"a": 8},
+        ["someplace://esphome/non-existant-repo/file1.yml@main"],
+        ["github://esphome/file1.yml"],
+        ["github://esphome/non-existant-repo/@main"],
+        ["some string"],
+        [True],
+        [3],
+    ],
+)
+def test_package_invalid(package):
+    with pytest.raises(cv.Invalid):
+        CONFIG_SCHEMA(package)
 
 
 def test_package_include(basic_wifi, basic_esphome):
@@ -99,7 +151,7 @@ def test_package_include(basic_wifi, basic_esphome):
 
     expected = {CONF_ESPHOME: basic_esphome, CONF_WIFI: basic_wifi}
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -124,7 +176,7 @@ def test_package_append(basic_wifi, basic_esphome):
         },
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -148,7 +200,7 @@ def test_package_override(basic_wifi, basic_esphome):
         },
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -177,7 +229,7 @@ def test_multiple_package_order():
         },
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -233,7 +285,7 @@ def test_package_list_merge():
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -311,7 +363,7 @@ def test_package_list_merge_by_id():
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -350,13 +402,13 @@ def test_package_merge_by_id_with_list():
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
 def test_package_merge_by_missing_id():
     """
-    Ensures that components with missing IDs are not merged.
+    Ensures that a validation error is thrown when trying to extend a missing ID.
     """
 
     config = {
@@ -379,25 +431,15 @@ def test_package_merge_by_missing_id():
         ],
     }
 
-    expected = {
-        CONF_SENSOR: [
-            {
-                CONF_ID: TEST_SENSOR_ID_1,
-                CONF_FILTERS: [{CONF_MULTIPLY: 42.0}],
-            },
-            {
-                CONF_ID: TEST_SENSOR_ID_1,
-                CONF_FILTERS: [{CONF_MULTIPLY: 10.0}],
-            },
-            {
-                CONF_ID: Extend(TEST_SENSOR_ID_2),
-                CONF_FILTERS: [{CONF_OFFSET: 146.0}],
-            },
-        ]
-    }
+    error_raised = False
+    try:
+        packages_pass(config)
+        assert False, "Expected validation error for missing ID"
+    except cv.Invalid as err:
+        error_raised = True
+        assert err.path == [CONF_SENSOR, 2]
 
-    actual = do_packages_pass(config)
-    assert actual == expected
+    assert error_raised
 
 
 def test_package_list_remove_by_id():
@@ -447,7 +489,7 @@ def test_package_list_remove_by_id():
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -493,7 +535,7 @@ def test_multiple_package_list_remove_by_id():
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -514,7 +556,7 @@ def test_package_dict_remove_by_id(basic_wifi, basic_esphome):
         CONF_ESPHOME: basic_esphome,
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -545,7 +587,6 @@ def test_package_remove_by_missing_id():
     }
 
     expected = {
-        "missing_key": Remove(),
         CONF_SENSOR: [
             {
                 CONF_ID: TEST_SENSOR_ID_1,
@@ -555,14 +596,10 @@ def test_package_remove_by_missing_id():
                 CONF_ID: TEST_SENSOR_ID_1,
                 CONF_FILTERS: [{CONF_MULTIPLY: 10.0}],
             },
-            {
-                CONF_ID: Remove(TEST_SENSOR_ID_2),
-                CONF_FILTERS: [{CONF_OFFSET: 146.0}],
-            },
         ],
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -634,7 +671,7 @@ def test_remote_packages_with_files_list(
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected
 
 
@@ -730,5 +767,5 @@ def test_remote_packages_with_files_and_vars(
         ]
     }
 
-    actual = do_packages_pass(config)
+    actual = packages_pass(config)
     assert actual == expected

tests/component_tests/text/test_text.py

@@ -58,7 +58,7 @@ def test_text_config_value_mode_set(generate_main):
 
 def test_text_config_lamda_is_set(generate_main):
     """
-    Test if lambda is set for lambda mode
+    Test if lambda is set for lambda mode (optimized with stateless lambda)
     """
     # Given
 
@@ -66,5 +66,5 @@ def test_text_config_lamda_is_set(generate_main):
     main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
 
     # Then
-    assert "it_4->set_template([=]() -> esphome::optional<std::string> {" in main_cpp
+    assert "it_4->set_template([]() -> esphome::optional<std::string> {" in main_cpp
     assert 'return std::string{"Hello"};' in main_cpp

tests/components/.gitignore

@@ -0,0 +1,5 @@
+# Gitignore settings for ESPHome
+# This is an example and may include too much for your use-case.
+# You can modify this file to suit your needs.
+/.esphome/
+/secrets.yaml

tests/components/README.md

@@ -0,0 +1,32 @@
+# How to write C++ ESPHome unit tests
+
+1. Locate the folder with your component or create a new one with the same name as the component.
+2. Write the tests. You can add as many `.cpp` and `.h` files as you need to organize your tests.
+
+**IMPORTANT**: wrap all your testing code in a unique namespace to avoid linker collisions when compiling
+testing binaries that combine many components. By convention, this unique namespace is `esphome::component::testing`
+(where "component" is the component under test), for example: `esphome::uart::testing`.
+
+
+## Running component unit tests
+
+(from the repository root)
+```bash
+./script/cpp_unit_test.py component1 component2 ...
+```
+
+The above will compile and run the provided components and their tests.
+
+To run all tests, you can invoke `cpp_unit_test.py` with the special `--all` flag:
+
+```bash
+./script/cpp_unit_test.py --all
+```
+
+To run a specific test suite, you can provide a Google Test filter:
+
+```bash
+GTEST_FILTER='UART*' ./script/cpp_unit_test.py uart modbus
+```
+
+The process will return `0` for success or nonzero for failure. In case of failure, the errors will be printed out to the console.

tests/components/a01nyub/common.yaml

@@ -1,11 +1,4 @@
-uart:
-  - id: uart_a01nyub
-    tx_pin: ${tx_pin}
-    rx_pin: ${rx_pin}
-    baud_rate: 9600
-
 sensor:
   - platform: a01nyub
     id: a01nyub_sensor
     name: a01nyub Distance
-    uart_id: uart_a01nyub

tests/components/a01nyub/test.esp32-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  tx_pin: GPIO17
-  rx_pin: GPIO16
-
-<<: !include common.yaml

tests/components/a01nyub/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
-
-<<: !include common.yaml

tests/components/a01nyub/test.esp32-c3-idf.yaml

@@ -1,3 +1,6 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/esp32-c3-idf.yaml
+
 substitutions:
   tx_pin: GPIO4
   rx_pin: GPIO5

tests/components/a01nyub/test.esp32-idf.yaml

@@ -1,5 +1,8 @@
 substitutions:
-  tx_pin: GPIO17
-  rx_pin: GPIO16
+  tx_pin: GPIO4
+  rx_pin: GPIO5
+
+packages:
+  uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/a01nyub/test.esp8266-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
+packages:
+  uart: !include ../../test_build_components/common/uart/esp8266-ard.yaml
 
 <<: !include common.yaml

tests/components/a01nyub/test.rp2040-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
+packages:
+  uart: !include ../../test_build_components/common/uart/rp2040-ard.yaml
 
 <<: !include common.yaml

tests/components/a02yyuw/common.yaml

@@ -1,11 +1,4 @@
-uart:
-  - id: uart_a02yyuw
-    tx_pin: ${tx_pin}
-    rx_pin: ${rx_pin}
-    baud_rate: 9600
-
 sensor:
   - platform: a02yyuw
     id: a02yyuw_sensor
     name: a02yyuw Distance
-    uart_id: uart_a02yyuw

tests/components/a02yyuw/test.esp32-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  tx_pin: GPIO17
-  rx_pin: GPIO16
-
-<<: !include common.yaml

tests/components/a02yyuw/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
-
-<<: !include common.yaml

tests/components/a02yyuw/test.esp32-c3-idf.yaml

@@ -1,3 +1,6 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/esp32-c3-idf.yaml
+
 substitutions:
   tx_pin: GPIO4
   rx_pin: GPIO5

tests/components/a02yyuw/test.esp32-idf.yaml

@@ -1,5 +1,8 @@
 substitutions:
-  tx_pin: GPIO17
-  rx_pin: GPIO16
+  tx_pin: GPIO4
+  rx_pin: GPIO5
+
+packages:
+  uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/a02yyuw/test.esp8266-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
+packages:
+  uart: !include ../../test_build_components/common/uart/esp8266-ard.yaml
 
 <<: !include common.yaml

tests/components/a02yyuw/test.rp2040-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
+packages:
+  uart: !include ../../test_build_components/common/uart/rp2040-ard.yaml
 
 <<: !include common.yaml

tests/components/a4988/test.esp32-ard.yaml

@@ -1,6 +0,0 @@
-substitutions:
-  step_pin: GPIO22
-  dir_pin: GPIO23
-  sleep_pin: GPIO25
-
-<<: !include common.yaml

tests/components/a4988/test.esp32-c3-ard.yaml

@@ -1,6 +0,0 @@
-substitutions:
-  step_pin: GPIO2
-  dir_pin: GPIO3
-  sleep_pin: GPIO5
-
-<<: !include common.yaml

tests/components/a4988/test.esp32-idf.yaml

@@ -1,6 +1,6 @@
 substitutions:
   step_pin: GPIO22
-  dir_pin: GPIO23
+  dir_pin: GPIO4
   sleep_pin: GPIO25
 
 <<: !include common.yaml

tests/components/a4988/test.esp8266-ard.yaml

@@ -1,6 +1,6 @@
 substitutions:
   step_pin: GPIO1
   dir_pin: GPIO2
-  sleep_pin: GPIO5
+  sleep_pin: GPIO0
 
 <<: !include common.yaml

tests/components/absolute_humidity/common.yaml

@@ -8,14 +8,12 @@ sensor:
     lambda: |-
       if (millis() > 10000) {
         return 0.6;
-      } else {
-        return 0.0;
       }
+      return 0.0;
   - platform: template
     id: template_temperature
     lambda: |-
       if (millis() > 10000) {
         return 42.0;
-      } else {
-        return 0.0;
       }
+      return 0.0;

tests/components/ac_dimmer/test.esp32-ard.yaml

@@ -1,5 +1,5 @@
 substitutions:
-  gate_pin: GPIO18
-  zero_cross_pin: GPIO19
+  gate_pin: GPIO4
+  zero_cross_pin: GPIO5
 
 <<: !include common.yaml

tests/components/ac_dimmer/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  gate_pin: GPIO5
-  zero_cross_pin: GPIO4
-
-<<: !include common.yaml

tests/components/ac_dimmer/test.esp8266-ard.yaml

@@ -1,5 +1,5 @@
 substitutions:
-  gate_pin: GPIO5
-  zero_cross_pin: GPIO4
+  gate_pin: GPIO0
+  zero_cross_pin: GPIO2
 
 <<: !include common.yaml

tests/components/adc/common.yaml

@@ -1,11 +0,0 @@
-sensor:
-  - id: my_sensor
-    platform: adc
-    name: ADC Test sensor
-    update_interval: "1:01"
-    attenuation: 2.5db
-    unit_of_measurement: "°C"
-    icon: "mdi:water-percent"
-    accuracy_decimals: 5
-    setup_priority: -100
-    force_update: true

tests/components/adc/test.bk72xx-ard.yaml

@@ -1,7 +1,11 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
+  - id: my_sensor
+    platform: adc
     pin: P23
-    attenuation: !remove
+    name: ADC Test sensor
+    update_interval: "1:01"
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.esp32-ard.yaml

@@ -1,6 +0,0 @@
-packages:
-  base: !include common.yaml
-
-sensor:
-  - id: !extend my_sensor
-    pin: A0

tests/components/adc/test.esp32-c3-ard.yaml

@@ -1,6 +0,0 @@
-packages:
-  base: !include common.yaml
-
-sensor:
-  - id: !extend my_sensor
-    pin: 4

tests/components/adc/test.esp32-c3-idf.yaml

@@ -1,6 +1,12 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
-    pin: 4
+  - id: my_sensor
+    platform: adc
+    pin: GPIO1
+    name: ADC Test sensor
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.esp32-idf.yaml

@@ -1,6 +1,12 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
+  - id: my_sensor
+    platform: adc
     pin: A0
+    name: ADC Test sensor
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.esp32-p4-idf.yaml

@@ -1,6 +1,12 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
-    pin: GPIO50
+  - id: my_sensor
+    platform: adc
+    pin: GPIO16
+    name: ADC Test sensor
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.esp32-s2-ard.yaml

@@ -1,6 +0,0 @@
-packages:
-  base: !include common.yaml
-
-sensor:
-  - id: !extend my_sensor
-    pin: 1

tests/components/adc/test.esp32-s2-idf.yaml

@@ -1,6 +1,12 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
-    pin: 1
+  - id: my_sensor
+    platform: adc
+    pin: GPIO1
+    name: ADC Test sensor
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.esp32-s3-ard.yaml

@@ -1,6 +0,0 @@
-packages:
-  base: !include common.yaml
-
-sensor:
-  - id: !extend my_sensor
-    pin: 1

tests/components/adc/test.esp32-s3-idf.yaml

@@ -1,6 +1,12 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
-    pin: 1
+  - id: my_sensor
+    platform: adc
+    pin: GPIO1
+    name: ADC Test sensor
+    update_interval: "1:01"
+    attenuation: 2.5db
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.esp8266-ard.yaml

@@ -1,7 +1,11 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
+  - id: my_sensor
+    platform: adc
     pin: VCC
-    attenuation: !remove
+    name: ADC Test sensor
+    update_interval: "1:01"
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.ln882x-ard.yaml

@@ -1,7 +1,11 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
-    pin: PA0
-    attenuation: !remove
+  - id: my_sensor
+    platform: adc
+    pin: A5
+    name: ADC Test sensor
+    update_interval: "1:01"
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc/test.rp2040-ard.yaml

@@ -1,7 +1,11 @@
-packages:
-  base: !include common.yaml
-
 sensor:
-  - id: !extend my_sensor
+  - id: my_sensor
+    platform: adc
     pin: VCC
-    attenuation: !remove
+    name: ADC Test sensor
+    update_interval: "1:01"
+    unit_of_measurement: "°C"
+    icon: "mdi:water-percent"
+    accuracy_decimals: 5
+    setup_priority: -100
+    force_update: true

tests/components/adc128s102/common.yaml

@@ -1,9 +1,3 @@
-spi:
-  - id: spi_adc128s102
-    clk_pin: ${clk_pin}
-    mosi_pin: ${mosi_pin}
-    miso_pin: ${miso_pin}
-
 adc128s102:
   cs_pin: ${cs_pin}
   id: adc128s102_adc

tests/components/adc128s102/test.esp32-ard.yaml

@@ -1,7 +0,0 @@
-substitutions:
-  clk_pin: GPIO16
-  mosi_pin: GPIO17
-  miso_pin: GPIO15
-  cs_pin: GPIO12
-
-<<: !include common.yaml

tests/components/adc128s102/test.esp32-c3-ard.yaml

@@ -1,7 +0,0 @@
-substitutions:
-  clk_pin: GPIO6
-  mosi_pin: GPIO7
-  miso_pin: GPIO5
-  cs_pin: GPIO2
-
-<<: !include common.yaml

tests/components/adc128s102/test.esp32-c3-idf.yaml

@@ -1,7 +1,7 @@
 substitutions:
-  clk_pin: GPIO6
-  mosi_pin: GPIO7
-  miso_pin: GPIO5
   cs_pin: GPIO2
 
+packages:
+  spi: !include ../../test_build_components/common/spi/esp32-c3-idf.yaml
+
 <<: !include common.yaml

tests/components/adc128s102/test.esp32-idf.yaml

@@ -1,7 +1,7 @@
 substitutions:
-  clk_pin: GPIO16
-  mosi_pin: GPIO17
-  miso_pin: GPIO15
   cs_pin: GPIO12
 
+packages:
+  spi: !include ../../test_build_components/common/spi/esp32-idf.yaml
+
 <<: !include common.yaml

tests/components/adc128s102/test.esp8266-ard.yaml

@@ -1,7 +1,10 @@
 substitutions:
-  clk_pin: GPIO14
-  mosi_pin: GPIO13
-  miso_pin: GPIO12
+  clk_pin: GPIO0
+  mosi_pin: GPIO2
+  miso_pin: GPIO16
   cs_pin: GPIO15
 
+packages:
+  spi: !include ../../test_build_components/common/spi/esp8266-ard.yaml
+
 <<: !include common.yaml

tests/components/adc128s102/test.rp2040-ard.yaml

@@ -4,4 +4,7 @@ substitutions:
   miso_pin: GPIO4
   cs_pin: GPIO5
 
+packages:
+  spi: !include ../../test_build_components/common/spi/rp2040-ard.yaml
+
 <<: !include common.yaml

tests/components/addressable_light/esp32_rmt_led_strip.esp32-ard.yaml

@@ -1,4 +0,0 @@
-substitutions:
-  pin: GPIO2
-
-<<: !include common-ard-esp32_rmt_led_strip.yaml

tests/components/addressable_light/esp32_rmt_led_strip.esp32-c3-ard.yaml

@@ -1,4 +0,0 @@
-substitutions:
-  pin: GPIO2
-
-<<: !include common-ard-esp32_rmt_led_strip.yaml

tests/components/addressable_light/fastled_clockless.esp32-ard.yaml

@@ -1,4 +0,0 @@
-substitutions:
-  pin: GPIO2
-
-<<: !include common-ard-fastled.yaml

tests/components/ade7880/common.yaml

@@ -1,11 +1,6 @@
-i2c:
-  - id: i2c_ade7880
-    scl: ${scl_pin}
-    sda: ${sda_pin}
-
 sensor:
   - platform: ade7880
-    i2c_id: i2c_ade7880
+    i2c_id: i2c_bus
     irq0_pin: ${irq0_pin}
     irq1_pin: ${irq1_pin}
     reset_pin: ${reset_pin}

tests/components/ade7880/test.esp32-ard.yaml

@@ -1,8 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-  irq0_pin: GPIO13
-  irq1_pin: GPIO15
-  reset_pin: GPIO16
-
-<<: !include common.yaml

tests/components/ade7880/test.esp32-c3-ard.yaml

@@ -1,8 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-  irq0_pin: GPIO6
-  irq1_pin: GPIO7
-  reset_pin: GPIO10
-
-<<: !include common.yaml

tests/components/ade7880/test.esp32-c3-idf.yaml

@@ -1,8 +1,9 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
   irq0_pin: GPIO6
   irq1_pin: GPIO7
-  reset_pin: GPIO10
+  reset_pin: GPIO9
+
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
 
 <<: !include common.yaml

tests/components/ade7880/test.esp32-idf.yaml

@@ -1,8 +1,9 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
   irq0_pin: GPIO13
   irq1_pin: GPIO15
-  reset_pin: GPIO16
+  reset_pin: GPIO12
+
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/ade7880/test.esp8266-ard.yaml

@@ -1,8 +1,9 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-  irq0_pin: GPIO13
+  irq0_pin: GPIO0
   irq1_pin: GPIO15
   reset_pin: GPIO16
 
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
+
 <<: !include common.yaml

tests/components/ade7880/test.rp2040-ard.yaml

@@ -1,8 +1,9 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
   irq0_pin: GPIO13
   irq1_pin: GPIO15
   reset_pin: GPIO16
 
+packages:
+  i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
+
 <<: !include common.yaml

tests/components/ade7953_i2c/common.yaml

@@ -1,20 +1,16 @@
-i2c:
-  - id: i2c_ade7953
-    scl: ${scl_pin}
-    sda: ${sda_pin}
-
 sensor:
   - platform: ade7953_i2c
+    i2c_id: i2c_bus
     irq_pin: ${irq_pin}
     voltage:
       name: ADE7953 Voltage
-      id: ade7953_voltage
+      id: ade7953_i2c_voltage
     current_a:
       name: ADE7953 Current A
-      id: ade7953_current_a
+      id: ade7953_i2c_current_a
     current_b:
       name: ADE7953 Current B
-      id: ade7953_current_b
+      id: ade7953_i2c_current_b
     power_factor_a:
       name: ADE7953 Power Factor A
     power_factor_b:

tests/components/ade7953_i2c/test.esp32-ard.yaml

@@ -1,6 +0,0 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
-  irq_pin: GPIO15
-
-<<: !include common.yaml

tests/components/ade7953_i2c/test.esp32-c3-ard.yaml

@@ -1,6 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-  irq_pin: GPIO6
-
-<<: !include common.yaml

tests/components/ade7953_i2c/test.esp32-c3-idf.yaml

@@ -1,6 +1,7 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
   irq_pin: GPIO6
 
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
+
 <<: !include common.yaml

tests/components/ade7953_i2c/test.esp32-idf.yaml

@@ -1,6 +1,7 @@
 substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
   irq_pin: GPIO15
 
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
+
 <<: !include common.yaml

tests/components/ade7953_i2c/test.esp8266-ard.yaml

@@ -1,6 +1,7 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
   irq_pin: GPIO15
 
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
+
 <<: !include common.yaml

tests/components/ade7953_i2c/test.rp2040-ard.yaml

@@ -1,6 +1,7 @@
 substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
   irq_pin: GPIO6
 
+packages:
+  i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
+
 <<: !include common.yaml

tests/components/ade7953_spi/common.yaml

@@ -1,22 +1,16 @@
-spi:
-  - id: spi_ade7953
-    clk_pin: ${clk_pin}
-    mosi_pin: ${mosi_pin}
-    miso_pin: ${miso_pin}
-
 sensor:
   - platform: ade7953_spi
     cs_pin: ${cs_pin}
     irq_pin: ${irq_pin}
     voltage:
       name: ADE7953 Voltage
-      id: ade7953_voltage
+      id: ade7953_spi_voltage
     current_a:
       name: ADE7953 Current A
-      id: ade7953_current_a
+      id: ade7953_spi_current_a
     current_b:
       name: ADE7953 Current B
-      id: ade7953_current_b
+      id: ade7953_spi_current_b
     power_factor_a:
       name: ADE7953 Power Factor A
     power_factor_b:

tests/components/ade7953_spi/test.esp32-ard.yaml

@@ -1,8 +0,0 @@
-substitutions:
-  clk_pin: GPIO16
-  mosi_pin: GPIO17
-  miso_pin: GPIO15
-  irq_pin: GPIO13
-  cs_pin: GPIO5
-
-<<: !include common.yaml

tests/components/ade7953_spi/test.esp32-c3-ard.yaml

@@ -1,8 +0,0 @@
-substitutions:
-  clk_pin: GPIO6
-  mosi_pin: GPIO7
-  miso_pin: GPIO5
-  irq_pin: GPIO9
-  cs_pin: GPIO8
-
-<<: !include common.yaml

tests/components/ade7953_spi/test.esp32-c3-idf.yaml

@@ -1,8 +1,7 @@
 substitutions:
-  clk_pin: GPIO6
-  mosi_pin: GPIO7
-  miso_pin: GPIO5
   irq_pin: GPIO9
   cs_pin: GPIO8
+packages:
+  spi: !include ../../test_build_components/common/spi/esp32-c3-idf.yaml
 
 <<: !include common.yaml

tests/components/ade7953_spi/test.esp32-idf.yaml

@@ -1,8 +1,8 @@
 substitutions:
-  clk_pin: GPIO16
-  mosi_pin: GPIO17
-  miso_pin: GPIO15
   irq_pin: GPIO13
   cs_pin: GPIO5
 
+packages:
+  spi: !include ../../test_build_components/common/spi/esp32-idf.yaml
+
 <<: !include common.yaml

tests/components/ade7953_spi/test.esp8266-ard.yaml

@@ -1,8 +1,11 @@
 substitutions:
-  clk_pin: GPIO14
-  mosi_pin: GPIO13
-  miso_pin: GPIO12
+  clk_pin: GPIO0
+  mosi_pin: GPIO2
+  miso_pin: GPIO16
   irq_pin: GPIO5
   cs_pin: GPIO15
 
+packages:
+  spi: !include ../../test_build_components/common/spi/esp8266-ard.yaml
+
 <<: !include common.yaml

tests/components/ade7953_spi/test.rp2040-ard.yaml

@@ -5,4 +5,7 @@ substitutions:
   irq_pin: GPIO5
   cs_pin: GPIO6
 
+packages:
+  spi: !include ../../test_build_components/common/spi/rp2040-ard.yaml
+
 <<: !include common.yaml

tests/components/ads1115/common.yaml

@@ -1,9 +1,5 @@
-i2c:
-  - id: i2c_ads1115
-    scl: ${scl_pin}
-    sda: ${sda_pin}
-
 ads1115:
+  i2c_id: i2c_bus
   address: 0x48
 
 sensor:

tests/components/ads1115/test.esp32-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
-
-<<: !include common.yaml

tests/components/ads1115/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-
-<<: !include common.yaml

tests/components/ads1115/test.esp32-c3-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
 
 <<: !include common.yaml

tests/components/ads1115/test.esp32-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/ads1115/test.esp8266-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
 
 <<: !include common.yaml

tests/components/ads1115/test.rp2040-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
 
 <<: !include common.yaml

tests/components/ags10/common.yaml

@@ -1,9 +1,3 @@
-i2c:
-  - id: i2c_ags10
-    scl: ${scl_pin}
-    sda: ${sda_pin}
-    frequency: 10kHz
-
 sensor:
   - platform: ags10
     id: ags10_1

tests/components/ags10/test.esp32-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
-
-<<: !include common.yaml

tests/components/ags10/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-
-<<: !include common.yaml

tests/components/ags10/test.esp32-c3-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c_low_freq: !include ../../test_build_components/common/i2c_low_freq/esp32-c3-idf.yaml
 
 <<: !include common.yaml

tests/components/ags10/test.esp32-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
+packages:
+  i2c_low_freq: !include ../../test_build_components/common/i2c_low_freq/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/ags10/test.esp8266-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c_low_freq: !include ../../test_build_components/common/i2c_low_freq/esp8266-ard.yaml
 
 <<: !include common.yaml

tests/components/aht10/common.yaml

@@ -1,10 +1,6 @@
-i2c:
-  - id: i2c_aht10
-    scl: ${scl_pin}
-    sda: ${sda_pin}
-
 sensor:
   - platform: aht10
+    i2c_id: i2c_bus
     temperature:
       name: Temperature
     humidity:

tests/components/aht10/test.esp32-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
-
-<<: !include common.yaml

tests/components/aht10/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-
-<<: !include common.yaml

tests/components/aht10/test.esp32-c3-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
 
 <<: !include common.yaml

tests/components/aht10/test.esp32-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/aht10/test.esp8266-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
 
 <<: !include common.yaml

tests/components/aht10/test.rp2040-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/rp2040-ard.yaml
 
 <<: !include common.yaml

tests/components/aic3204/common.yaml

@@ -6,10 +6,6 @@ esphome:
       - audio_dac.set_volume:
           volume: 50%
 
-i2c:
-  - id: i2c_aic3204
-    scl: ${scl_pin}
-    sda: ${sda_pin}
-
 audio_dac:
   - platform: aic3204
+    i2c_id: i2c_bus

tests/components/aic3204/test.esp32-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
-
-<<: !include common.yaml

tests/components/aic3204/test.esp32-c3-ard.yaml

@@ -1,5 +0,0 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
-
-<<: !include common.yaml

tests/components/aic3204/test.esp32-c3-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-c3-idf.yaml
 
 <<: !include common.yaml

tests/components/aic3204/test.esp32-idf.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO16
-  sda_pin: GPIO17
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-idf.yaml
 
 <<: !include common.yaml

tests/components/aic3204/test.esp8266-ard.yaml

@@ -1,5 +1,4 @@
-substitutions:
-  scl_pin: GPIO5
-  sda_pin: GPIO4
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp8266-ard.yaml
 
 <<: !include common.yaml

tests/components/airthings_wave_mini/test.esp32-c3-idf.yaml

@@ -1 +1,4 @@
+packages:
+  ble: !include ../../test_build_components/common/ble/esp32-c3-idf.yaml
+
 <<: !include common.yaml

tests/components/airthings_wave_mini/test.esp32-idf.yaml

@@ -1 +1,4 @@
+packages:
+  ble: !include ../../test_build_components/common/ble/esp32-idf.yaml
+
 <<: !include common.yaml