[rp2] Rename rp2040 platform to rp2 (#17145)

Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>

tests/unit_tests/components/test_rp2.py

@@ -0,0 +1,95 @@
+"""Tests for the ``rp2`` target-platform component.
+
+``rp2`` is the canonical name for the Raspberry Pi RP-series target
+platform. ``rp2040`` is a deprecated alias declared via
+``ALIASES = ["rp2040"]`` on the rp2 component — the framework
+(see ``esphome/loader.py`` and ``esphome/config.py``) handles both
+Python-import aliasing (via a ``sys.meta_path`` finder) and YAML-key
+aliasing (via a pre-pass in ``validate_config``), so there is no
+hand-rolled shim in ``esphome/components/rp2040/``.
+
+These tests pin down the canonical board helpers; the alias contract
+itself (Python imports, YAML key rename, deprecation warning) is covered
+by the framework tests under ``tests/unit_tests/``.
+"""
+
+
+def test_board_id_has_wifi_for_known_wifi_board() -> None:
+    """``rpipicow`` is the canonical Pico W → True."""
+    from esphome.components import rp2
+
+    assert rp2.board_id_has_wifi("rpipicow") is True
+
+
+def test_board_id_has_wifi_for_known_non_wifi_board() -> None:
+    """Plain ``rpipico`` has no CYW43 → False."""
+    from esphome.components import rp2
+
+    assert rp2.board_id_has_wifi("rpipico") is False
+
+
+def test_board_id_has_wifi_for_rp2350_w_variant() -> None:
+    """``rpipico2w`` is the RP2350 Pico 2 W → True."""
+    from esphome.components import rp2
+
+    assert rp2.board_id_has_wifi("rpipico2w") is True
+
+
+def test_board_id_has_wifi_for_unknown_board_returns_true() -> None:
+    """Unknown ids fail open so a custom board is not rejected.
+
+    The validator falls back to ESPHome's compile-time check; the
+    helper returning True here means the wizard emits a ``wifi:``
+    block and any genuinely-unsupported config trips the existing
+    "no CYW43" guard at compile time.
+    """
+    from esphome.components import rp2
+
+    assert rp2.board_id_has_wifi("not-a-real-board-id") is True
+
+
+def test_rp2_declares_rp2040_as_alias() -> None:
+    """The framework-level deprecation hook is on the ``rp2`` component.
+
+    The legacy ``rp2040:`` YAML key works because the rp2 component
+    opts in via ``ALIASES``; without this declaration the rename
+    framework wouldn't route legacy configs.
+    """
+    from esphome.components import rp2
+
+    assert "rp2040" in rp2.ALIASES
+    assert rp2.ALIAS_REMOVAL_VERSION == "2027.7.0"
+
+
+def test_rp2040_python_import_resolves_to_rp2() -> None:
+    """``from esphome.components import rp2040`` must work for external
+    custom components and external tooling (device-builder, the dashboard
+    wizard, etc.) that still import from the legacy module path.
+
+    The ``_AliasFinder`` on ``sys.meta_path`` rewrites the lookup to
+    the canonical module — both should be the same object.
+    """
+    from esphome.components import (
+        rp2,
+        rp2040,  # routed via _AliasFinder
+    )
+
+    assert rp2040 is rp2
+
+
+def test_rp2040_submodule_imports_resolve_to_rp2_submodules() -> None:
+    """Submodule imports (e.g. ``esphome.components.rp2040.boards``) must
+    also route to the canonical equivalents — the board-generator script
+    and the dashboard wizard both rely on this path.
+    """
+    from esphome.components.rp2 import (
+        boards as rp2_boards,
+        generate_boards as rp2_generate,
+    )
+    from esphome.components.rp2040 import (
+        boards as rp2040_boards,
+        generate_boards as rp2040_generate,
+    )
+
+    assert rp2040_boards is rp2_boards
+    assert rp2040_generate is rp2_generate

tests/unit_tests/components/test_rp2040.py

@@ -1,92 +0,0 @@
-"""Tests for RP2040 component public helpers and variant detection."""
-
-import pytest
-
-from esphome.components.rp2040 import _detect_variant, board_id_has_wifi
-from esphome.components.rp2040.const import VARIANT_RP2040, VARIANT_RP2350
-import esphome.config_validation as cv
-from esphome.const import CONF_BOARD, CONF_VARIANT
-
-
-def test_board_id_has_wifi_for_known_wifi_board() -> None:
-    """``rpipicow`` is the canonical Pico W → True."""
-    assert board_id_has_wifi("rpipicow") is True
-
-
-def test_board_id_has_wifi_for_known_non_wifi_board() -> None:
-    """Plain ``rpipico`` has no CYW43 → False."""
-    assert board_id_has_wifi("rpipico") is False
-
-
-def test_board_id_has_wifi_for_rp2350_w_variant() -> None:
-    """``rpipico2w`` is the RP2350 Pico 2 W → True."""
-    assert board_id_has_wifi("rpipico2w") is True
-
-
-def test_board_id_has_wifi_for_unknown_board_returns_true() -> None:
-    """Unknown ids fail open so a custom board is not rejected.
-
-    The validator falls back to ESPHome's compile-time check; the
-    helper returning True here means the wizard emits a ``wifi:``
-    block and any genuinely-unsupported config trips the existing
-    "no CYW43" guard at compile time.
-    """
-    assert board_id_has_wifi("not-a-real-board-id") is True
-
-
-def test_detect_variant_derives_variant_from_board() -> None:
-    """Board alone resolves to the matching variant."""
-    result = _detect_variant({CONF_BOARD: "rpipicow"})
-    assert result[CONF_BOARD] == "rpipicow"
-    assert result[CONF_VARIANT] == VARIANT_RP2040
-
-
-def test_detect_variant_derives_variant_from_rp2350_board() -> None:
-    """An RP2350 board resolves to ``RP2350``."""
-    result = _detect_variant({CONF_BOARD: "rpipico2"})
-    assert result[CONF_BOARD] == "rpipico2"
-    assert result[CONF_VARIANT] == VARIANT_RP2350
-
-
-def test_detect_variant_only_picks_default_board_rp2040() -> None:
-    """Variant alone picks Pico W as the canonical RP2040 board."""
-    result = _detect_variant({CONF_VARIANT: VARIANT_RP2040})
-    assert result[CONF_BOARD] == "rpipicow"
-    assert result[CONF_VARIANT] == VARIANT_RP2040
-
-
-def test_detect_variant_only_picks_default_board_rp2350() -> None:
-    """Variant alone picks Pico 2 W as the canonical RP2350 board."""
-    result = _detect_variant({CONF_VARIANT: VARIANT_RP2350})
-    assert result[CONF_BOARD] == "rpipico2w"
-    assert result[CONF_VARIANT] == VARIANT_RP2350
-
-
-def test_detect_variant_matching_explicit_variant_passes() -> None:
-    """Specifying both a board and the matching variant is allowed."""
-    result = _detect_variant({CONF_BOARD: "rpipico2", CONF_VARIANT: VARIANT_RP2350})
-    assert result[CONF_BOARD] == "rpipico2"
-    assert result[CONF_VARIANT] == VARIANT_RP2350
-
-
-def test_detect_variant_mismatched_variant_raises() -> None:
-    """Board/variant mismatch must be rejected and name the offending board."""
-    with pytest.raises(
-        cv.Invalid, match=r"does not match the selected board 'rpipicow'"
-    ):
-        _detect_variant({CONF_BOARD: "rpipicow", CONF_VARIANT: VARIANT_RP2350})
-
-
-def test_detect_variant_unknown_board_without_variant_raises() -> None:
-    """Unknown board with no variant tells the user how to recover."""
-    with pytest.raises(cv.Invalid, match="please specify the chip variant"):
-        _detect_variant({CONF_BOARD: "not-a-real-board"})
-
-
-def test_detect_variant_unknown_board_with_variant_passes() -> None:
-    """Unknown board + explicit variant is accepted (with a warning)."""
-    result = _detect_variant(
-        {CONF_BOARD: "not-a-real-board", CONF_VARIANT: VARIANT_RP2040}
-    )
-    assert result[CONF_BOARD] == "not-a-real-board"
-    assert result[CONF_VARIANT] == VARIANT_RP2040

tests/unit_tests/components/test_rp2_generate_boards.py

@@ -1,4 +1,4 @@
-"""Tests for rp2040 generate_boards.py."""
+"""Tests for rp2 generate_boards.py."""
 
 from __future__ import annotations
 
@@ -8,7 +8,7 @@ import textwrap
 
 import pytest
 
-from esphome.components.rp2040.generate_boards import load_boards, parse_variant_pins
+from esphome.components.rp2.generate_boards import load_boards, parse_variant_pins
 
 PICO_PINS_HEADER = textwrap.dedent("""\
     #pragma once

tests/unit_tests/components/test_wifi.py

@@ -87,8 +87,8 @@ def test_has_native_wifi_esp32_variant_case_insensitive() -> None:
 
 def test_has_native_wifi_dispatches_rp2040_to_board_check() -> None:
     """RP2040 platform routes through ``rp2040.board_id_has_wifi``."""
-    assert has_native_wifi(platform=Platform.RP2040, board="rpipicow") is True
-    assert has_native_wifi(platform=Platform.RP2040, board="rpipico") is False
+    assert has_native_wifi(platform=Platform.RP2, board="rpipicow") is True
+    assert has_native_wifi(platform=Platform.RP2, board="rpipico") is False
 
 
 def test_has_native_wifi_returns_false_for_nrf52() -> None:
@@ -134,7 +134,7 @@ def test_has_native_wifi_esp32_without_variant_assumes_wifi() -> None:
 
 def test_has_native_wifi_rp2040_without_board_assumes_wifi() -> None:
     """RP2040 without a board id falls open to True (custom-board default)."""
-    assert has_native_wifi(platform=Platform.RP2040) is True
+    assert has_native_wifi(platform=Platform.RP2) is True
 
 
 def _wifi_config(