Merge remote-tracking branch 'origin/rp2040-upload-improvements' into integration

tests/components/README.md

@@ -7,10 +7,23 @@
 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`.
 
+### Platform components
+
+For components that expose to a platform component, create a folder under your component test folder with the platform component name, e.g. `binary_sensor` and
+include the relevant `.cpp` and `.h` test files there.
+
+### Override component code generation for testing
+
+When generating code for testing, ESPHome won't invoke the component's `to_code` function, since most components do not
+need to generate configuration code for testing.
+
+If you do need to generate code to for example configure compilation flags or add libraries,
+add the component name to the `CPP_TESTING_CODEGEN_COMPONENTS` allowlist in `script/cpp_unit_test.py`.
 
 ## Running component unit tests
 
 (from the repository root)
+
 ```bash
 ./script/cpp_unit_test.py component1 component2 ...
 ```

tests/components/packet_transport/binary_sensor/binary_sensor_test.cpp

@@ -0,0 +1,77 @@
+#include "../common.h"
+
+namespace esphome::packet_transport::testing {
+
+TEST(PacketTransportBinarySensorTest, AddBinarySensor) {
+  TestablePacketTransport transport;
+  binary_sensor::BinarySensor bs;
+  transport.add_binary_sensor("motion", &bs);
+  ASSERT_EQ(transport.binary_sensors_.size(), 1u);
+  EXPECT_STREQ(transport.binary_sensors_[0].id, "motion");
+  EXPECT_EQ(transport.binary_sensors_[0].sensor, &bs);
+}
+
+TEST(PacketTransportBinarySensorTest, AddRemoteBinarySensor) {
+  TestablePacketTransport transport;
+  binary_sensor::BinarySensor bs;
+  transport.add_remote_binary_sensor("host1", "remote_motion", &bs);
+  EXPECT_TRUE(transport.providers_.contains("host1"));
+  EXPECT_EQ(transport.remote_binary_sensors_["host1"]["remote_motion"], &bs);
+}
+
+TEST(PacketTransportBinarySensorTest, UnencryptedBinarySensorRoundTrip) {
+  TestablePacketTransport encoder;
+  encoder.init_for_test("sender");
+  binary_sensor::BinarySensor local_bs;
+  local_bs.state = true;
+  encoder.add_binary_sensor("motion", &local_bs);
+
+  encoder.send_data_(true);
+  ASSERT_EQ(encoder.sent_packets.size(), 1u);
+
+  TestablePacketTransport decoder;
+  decoder.init_for_test("receiver");
+  binary_sensor::BinarySensor remote_bs;
+  decoder.add_remote_binary_sensor("sender", "motion", &remote_bs);
+
+  auto &packet = encoder.sent_packets[0];
+  decoder.process_({packet.data(), packet.size()});
+  EXPECT_TRUE(remote_bs.state);
+}
+
+TEST(PacketTransportBinarySensorTest, MultipleSensorsRoundTrip) {
+  TestablePacketTransport encoder;
+  encoder.init_for_test("sender");
+
+  sensor::Sensor s1, s2;
+  s1.state = 10.0f;
+  s2.state = 20.0f;
+  encoder.add_sensor("s1", &s1);
+  encoder.add_sensor("s2", &s2);
+
+  binary_sensor::BinarySensor bs1;
+  bs1.state = true;
+  encoder.add_binary_sensor("bs1", &bs1);
+
+  encoder.send_data_(true);
+  ASSERT_EQ(encoder.sent_packets.size(), 1u);
+
+  TestablePacketTransport decoder;
+  decoder.init_for_test("receiver");
+  sensor::Sensor rs1, rs2;
+  binary_sensor::BinarySensor rbs1;
+  rs1.state = -999.0f;
+  rs2.state = -999.0f;
+  decoder.add_remote_sensor("sender", "s1", &rs1);
+  decoder.add_remote_sensor("sender", "s2", &rs2);
+  decoder.add_remote_binary_sensor("sender", "bs1", &rbs1);
+
+  auto &packet = encoder.sent_packets[0];
+  decoder.process_({packet.data(), packet.size()});
+
+  EXPECT_FLOAT_EQ(rs1.state, 10.0f);
+  EXPECT_FLOAT_EQ(rs2.state, 20.0f);
+  EXPECT_TRUE(rbs1.state);
+}
+
+}  // namespace esphome::packet_transport::testing

tests/components/packet_transport/cpp_test.yaml

@@ -1,11 +0,0 @@
-# Extra component configuration required by C++ unit tests.
-# Loaded by cpp_unit_test.py and merged into the test build config
-# before validation, so that platform defines (USE_SENSOR, etc.) are generated.
-
-sensor:
-  - platform: template
-    id: test_cpp_sensor
-
-binary_sensor:
-  - platform: template
-    id: test_cpp_binary_sensor

tests/components/packet_transport/packet_transport_test.cpp

@@ -65,198 +65,6 @@ TEST(PacketTransportTest, SetProviderEncryption) {
   EXPECT_EQ(transport.providers_["host1"].encryption_key, key);
 }
 
-// --- Sensor management (requires USE_SENSOR / USE_BINARY_SENSOR) ---
-
-#ifdef USE_SENSOR
-TEST(PacketTransportTest, AddSensor) {
-  TestablePacketTransport transport;
-  sensor::Sensor s;
-  transport.add_sensor("temp", &s);
-  ASSERT_EQ(transport.sensors_.size(), 1u);
-  EXPECT_STREQ(transport.sensors_[0].id, "temp");
-  EXPECT_EQ(transport.sensors_[0].sensor, &s);
-  EXPECT_TRUE(transport.sensors_[0].updated);
-}
-
-TEST(PacketTransportTest, AddRemoteSensor) {
-  TestablePacketTransport transport;
-  sensor::Sensor s;
-  transport.add_remote_sensor("host1", "remote_temp", &s);
-  EXPECT_TRUE(transport.providers_.contains("host1"));
-  EXPECT_EQ(transport.remote_sensors_["host1"]["remote_temp"], &s);
-}
-#endif
-
-#ifdef USE_BINARY_SENSOR
-TEST(PacketTransportTest, AddBinarySensor) {
-  TestablePacketTransport transport;
-  binary_sensor::BinarySensor bs;
-  transport.add_binary_sensor("motion", &bs);
-  ASSERT_EQ(transport.binary_sensors_.size(), 1u);
-  EXPECT_STREQ(transport.binary_sensors_[0].id, "motion");
-  EXPECT_EQ(transport.binary_sensors_[0].sensor, &bs);
-}
-
-TEST(PacketTransportTest, AddRemoteBinarySensor) {
-  TestablePacketTransport transport;
-  binary_sensor::BinarySensor bs;
-  transport.add_remote_binary_sensor("host1", "remote_motion", &bs);
-  EXPECT_TRUE(transport.providers_.contains("host1"));
-  EXPECT_EQ(transport.remote_binary_sensors_["host1"]["remote_motion"], &bs);
-}
-#endif
-
-// --- Unencrypted round-trip tests (require USE_SENSOR / USE_BINARY_SENSOR) ---
-
-#ifdef USE_SENSOR
-TEST(PacketTransportTest, UnencryptedSensorRoundTrip) {
-  // Encoder
-  TestablePacketTransport encoder;
-  encoder.init_for_test("sender");
-  sensor::Sensor local_sensor;
-  local_sensor.state = 42.5f;
-  encoder.add_sensor("temp", &local_sensor);
-
-  encoder.send_data_(true);
-  ASSERT_EQ(encoder.sent_packets.size(), 1u);
-
-  // Decoder
-  TestablePacketTransport decoder;
-  decoder.init_for_test("receiver");
-  sensor::Sensor remote_sensor;
-  remote_sensor.state = -999.0f;  // sentinel
-  decoder.add_remote_sensor("sender", "temp", &remote_sensor);
-
-  auto &packet = encoder.sent_packets[0];
-  decoder.process_({packet.data(), packet.size()});
-  EXPECT_FLOAT_EQ(remote_sensor.state, 42.5f);
-}
-#endif
-
-#ifdef USE_BINARY_SENSOR
-TEST(PacketTransportTest, UnencryptedBinarySensorRoundTrip) {
-  TestablePacketTransport encoder;
-  encoder.init_for_test("sender");
-  binary_sensor::BinarySensor local_bs;
-  local_bs.state = true;
-  encoder.add_binary_sensor("motion", &local_bs);
-
-  encoder.send_data_(true);
-  ASSERT_EQ(encoder.sent_packets.size(), 1u);
-
-  TestablePacketTransport decoder;
-  decoder.init_for_test("receiver");
-  binary_sensor::BinarySensor remote_bs;
-  decoder.add_remote_binary_sensor("sender", "motion", &remote_bs);
-
-  auto &packet = encoder.sent_packets[0];
-  decoder.process_({packet.data(), packet.size()});
-  EXPECT_TRUE(remote_bs.state);
-}
-#endif
-
-#if defined(USE_SENSOR) && defined(USE_BINARY_SENSOR)
-TEST(PacketTransportTest, MultipleSensorsRoundTrip) {
-  TestablePacketTransport encoder;
-  encoder.init_for_test("sender");
-
-  sensor::Sensor s1, s2;
-  s1.state = 10.0f;
-  s2.state = 20.0f;
-  encoder.add_sensor("s1", &s1);
-  encoder.add_sensor("s2", &s2);
-
-  binary_sensor::BinarySensor bs1;
-  bs1.state = true;
-  encoder.add_binary_sensor("bs1", &bs1);
-
-  encoder.send_data_(true);
-  ASSERT_EQ(encoder.sent_packets.size(), 1u);
-
-  TestablePacketTransport decoder;
-  decoder.init_for_test("receiver");
-  sensor::Sensor rs1, rs2;
-  binary_sensor::BinarySensor rbs1;
-  rs1.state = -999.0f;
-  rs2.state = -999.0f;
-  decoder.add_remote_sensor("sender", "s1", &rs1);
-  decoder.add_remote_sensor("sender", "s2", &rs2);
-  decoder.add_remote_binary_sensor("sender", "bs1", &rbs1);
-
-  auto &packet = encoder.sent_packets[0];
-  decoder.process_({packet.data(), packet.size()});
-
-  EXPECT_FLOAT_EQ(rs1.state, 10.0f);
-  EXPECT_FLOAT_EQ(rs2.state, 20.0f);
-  EXPECT_TRUE(rbs1.state);
-}
-#endif
-
-// --- Encrypted round-trip ---
-
-#ifdef USE_SENSOR
-TEST(PacketTransportTest, EncryptedSensorRoundTrip) {
-  std::vector<uint8_t> key(32);
-  for (int i = 0; i < 32; i++)
-    key[i] = i;
-
-  TestablePacketTransport encoder;
-  encoder.init_for_test("sender");
-  encoder.set_encryption_key(key);
-  sensor::Sensor local_sensor;
-  local_sensor.state = 99.9f;
-  encoder.add_sensor("temp", &local_sensor);
-
-  encoder.send_data_(true);
-  ASSERT_EQ(encoder.sent_packets.size(), 1u);
-
-  TestablePacketTransport decoder;
-  decoder.init_for_test("receiver");
-  sensor::Sensor remote_sensor;
-  remote_sensor.state = -999.0f;
-  decoder.add_remote_sensor("sender", "temp", &remote_sensor);
-  decoder.set_provider_encryption("sender", key);
-
-  auto &packet = encoder.sent_packets[0];
-  decoder.process_({packet.data(), packet.size()});
-  EXPECT_FLOAT_EQ(remote_sensor.state, 99.9f);
-}
-
-// --- Selective send ---
-
-TEST(PacketTransportTest, SendDataOnlyUpdated) {
-  TestablePacketTransport encoder;
-  encoder.init_for_test("sender");
-
-  sensor::Sensor s1, s2;
-  s1.state = 1.0f;
-  s2.state = 2.0f;
-  encoder.add_sensor("s1", &s1);
-  encoder.add_sensor("s2", &s2);
-
-  // Mark s1 as not updated, only s2 as updated
-  encoder.sensors_[0].updated = false;
-  encoder.sensors_[1].updated = true;
-
-  encoder.send_data_(false);
-  ASSERT_EQ(encoder.sent_packets.size(), 1u);
-
-  TestablePacketTransport decoder;
-  decoder.init_for_test("receiver");
-  sensor::Sensor rs1, rs2;
-  rs1.state = -999.0f;
-  rs2.state = -999.0f;
-  decoder.add_remote_sensor("sender", "s1", &rs1);
-  decoder.add_remote_sensor("sender", "s2", &rs2);
-
-  auto &packet = encoder.sent_packets[0];
-  decoder.process_({packet.data(), packet.size()});
-
-  EXPECT_FLOAT_EQ(rs1.state, -999.0f);  // not updated, not sent
-  EXPECT_FLOAT_EQ(rs2.state, 2.0f);     // updated, sent
-}
-#endif
-
 // --- Ping key tests ---
 
 TEST(PacketTransportTest, PingKeyStoredWhenEncrypted) {
@@ -319,73 +127,6 @@ TEST(PacketTransportTest, PingKeyMaxLimit) {
   EXPECT_FALSE(transport.ping_keys_.contains("host4"));
 }
 
-#ifdef USE_SENSOR
-TEST(PacketTransportTest, PingKeyIncludedInTransmittedPacket) {
-  std::vector<uint8_t> key(32, 0xBB);
-
-  // Responder: encrypted, owns a sensor
-  TestablePacketTransport responder;
-  responder.init_for_test("responder");
-  responder.set_encryption_key(key);
-  sensor::Sensor local_sensor;
-  local_sensor.state = 77.7f;
-  responder.add_sensor("temp", &local_sensor);
-
-  // Requester sends a MAGIC_PING that the responder processes
-  auto ping = build_ping_packet("requester", 0xDEADBEEF);
-  responder.process_({ping.data(), ping.size()});
-  ASSERT_EQ(responder.ping_keys_.size(), 1u);
-
-  // Responder sends sensor data — ping key should be embedded
-  responder.send_data_(true);
-  ASSERT_EQ(responder.sent_packets.size(), 1u);
-
-  // Requester: encrypted provider, ping-pong enabled, expects key 0xDEADBEEF
-  TestablePacketTransport requester;
-  requester.init_for_test("requester");
-  requester.set_ping_pong_enable(true);
-  requester.ping_key_ = 0xDEADBEEF;
-  sensor::Sensor remote_sensor;
-  remote_sensor.state = -999.0f;
-  requester.add_remote_sensor("responder", "temp", &remote_sensor);
-  requester.set_provider_encryption("responder", key);
-
-  // The requester decrypts the packet and finds its ping key echoed back,
-  // which gates the sensor data — if the key is missing, data is blocked.
-  auto &packet = responder.sent_packets[0];
-  requester.process_({packet.data(), packet.size()});
-  EXPECT_FLOAT_EQ(remote_sensor.state, 77.7f);
-}
-
-TEST(PacketTransportTest, MissingPingKeyBlocksSensorData) {
-  std::vector<uint8_t> key(32, 0xBB);
-
-  // Responder sends data WITHOUT receiving any MAGIC_PING first — no ping keys
-  TestablePacketTransport responder;
-  responder.init_for_test("responder");
-  responder.set_encryption_key(key);
-  sensor::Sensor local_sensor;
-  local_sensor.state = 77.7f;
-  responder.add_sensor("temp", &local_sensor);
-  responder.send_data_(true);
-  ASSERT_EQ(responder.sent_packets.size(), 1u);
-
-  // Requester with ping-pong enabled expects a key that isn't in the packet
-  TestablePacketTransport requester;
-  requester.init_for_test("requester");
-  requester.set_ping_pong_enable(true);
-  requester.ping_key_ = 0xDEADBEEF;
-  sensor::Sensor remote_sensor;
-  remote_sensor.state = -999.0f;
-  requester.add_remote_sensor("responder", "temp", &remote_sensor);
-  requester.set_provider_encryption("responder", key);
-
-  auto &packet = responder.sent_packets[0];
-  requester.process_({packet.data(), packet.size()});
-  EXPECT_FLOAT_EQ(remote_sensor.state, -999.0f);  // blocked — ping key not found
-}
-#endif
-
 // --- Process error handling ---
 
 TEST(PacketTransportTest, ProcessShortBuffer) {

tests/components/packet_transport/sensor/sensor_test.cpp

@@ -0,0 +1,170 @@
+#include "../common.h"
+
+namespace esphome::packet_transport::testing {
+
+TEST(PacketTransportSensorTest, AddSensor) {
+  TestablePacketTransport transport;
+  sensor::Sensor s;
+  transport.add_sensor("temp", &s);
+  ASSERT_EQ(transport.sensors_.size(), 1u);
+  EXPECT_STREQ(transport.sensors_[0].id, "temp");
+  EXPECT_EQ(transport.sensors_[0].sensor, &s);
+  EXPECT_TRUE(transport.sensors_[0].updated);
+}
+
+TEST(PacketTransportSensorTest, AddRemoteSensor) {
+  TestablePacketTransport transport;
+  sensor::Sensor s;
+  transport.add_remote_sensor("host1", "remote_temp", &s);
+  EXPECT_TRUE(transport.providers_.contains("host1"));
+  EXPECT_EQ(transport.remote_sensors_["host1"]["remote_temp"], &s);
+}
+
+TEST(PacketTransportSensorTest, UnencryptedSensorRoundTrip) {
+  // Encoder
+  TestablePacketTransport encoder;
+  encoder.init_for_test("sender");
+  sensor::Sensor local_sensor;
+  local_sensor.state = 42.5f;
+  encoder.add_sensor("temp", &local_sensor);
+
+  encoder.send_data_(true);
+  ASSERT_EQ(encoder.sent_packets.size(), 1u);
+
+  // Decoder
+  TestablePacketTransport decoder;
+  decoder.init_for_test("receiver");
+  sensor::Sensor remote_sensor;
+  remote_sensor.state = -999.0f;  // sentinel
+  decoder.add_remote_sensor("sender", "temp", &remote_sensor);
+
+  auto &packet = encoder.sent_packets[0];
+  decoder.process_({packet.data(), packet.size()});
+  EXPECT_FLOAT_EQ(remote_sensor.state, 42.5f);
+}
+
+TEST(PacketTransportSensorTest, EncryptedSensorRoundTrip) {
+  std::vector<uint8_t> key(32);
+  for (int i = 0; i < 32; i++)
+    key[i] = i;
+
+  TestablePacketTransport encoder;
+  encoder.init_for_test("sender");
+  encoder.set_encryption_key(key);
+  sensor::Sensor local_sensor;
+  local_sensor.state = 99.9f;
+  encoder.add_sensor("temp", &local_sensor);
+
+  encoder.send_data_(true);
+  ASSERT_EQ(encoder.sent_packets.size(), 1u);
+
+  TestablePacketTransport decoder;
+  decoder.init_for_test("receiver");
+  sensor::Sensor remote_sensor;
+  remote_sensor.state = -999.0f;
+  decoder.add_remote_sensor("sender", "temp", &remote_sensor);
+  decoder.set_provider_encryption("sender", key);
+
+  auto &packet = encoder.sent_packets[0];
+  decoder.process_({packet.data(), packet.size()});
+  EXPECT_FLOAT_EQ(remote_sensor.state, 99.9f);
+}
+
+TEST(PacketTransportSensorTest, SendDataOnlyUpdated) {
+  TestablePacketTransport encoder;
+  encoder.init_for_test("sender");
+
+  sensor::Sensor s1, s2;
+  s1.state = 1.0f;
+  s2.state = 2.0f;
+  encoder.add_sensor("s1", &s1);
+  encoder.add_sensor("s2", &s2);
+
+  // Mark s1 as not updated, only s2 as updated
+  encoder.sensors_[0].updated = false;
+  encoder.sensors_[1].updated = true;
+
+  encoder.send_data_(false);
+  ASSERT_EQ(encoder.sent_packets.size(), 1u);
+
+  TestablePacketTransport decoder;
+  decoder.init_for_test("receiver");
+  sensor::Sensor rs1, rs2;
+  rs1.state = -999.0f;
+  rs2.state = -999.0f;
+  decoder.add_remote_sensor("sender", "s1", &rs1);
+  decoder.add_remote_sensor("sender", "s2", &rs2);
+
+  auto &packet = encoder.sent_packets[0];
+  decoder.process_({packet.data(), packet.size()});
+
+  EXPECT_FLOAT_EQ(rs1.state, -999.0f);  // not updated, not sent
+  EXPECT_FLOAT_EQ(rs2.state, 2.0f);     // updated, sent
+}
+
+TEST(PacketTransportSensorTest, PingKeyIncludedInTransmittedPacket) {
+  std::vector<uint8_t> key(32, 0xBB);
+
+  // Responder: encrypted, owns a sensor
+  TestablePacketTransport responder;
+  responder.init_for_test("responder");
+  responder.set_encryption_key(key);
+  sensor::Sensor local_sensor;
+  local_sensor.state = 77.7f;
+  responder.add_sensor("temp", &local_sensor);
+
+  // Requester sends a MAGIC_PING that the responder processes
+  auto ping = build_ping_packet("requester", 0xDEADBEEF);
+  responder.process_({ping.data(), ping.size()});
+  ASSERT_EQ(responder.ping_keys_.size(), 1u);
+
+  // Responder sends sensor data — ping key should be embedded
+  responder.send_data_(true);
+  ASSERT_EQ(responder.sent_packets.size(), 1u);
+
+  // Requester: encrypted provider, ping-pong enabled, expects key 0xDEADBEEF
+  TestablePacketTransport requester;
+  requester.init_for_test("requester");
+  requester.set_ping_pong_enable(true);
+  requester.ping_key_ = 0xDEADBEEF;
+  sensor::Sensor remote_sensor;
+  remote_sensor.state = -999.0f;
+  requester.add_remote_sensor("responder", "temp", &remote_sensor);
+  requester.set_provider_encryption("responder", key);
+
+  // The requester decrypts the packet and finds its ping key echoed back,
+  // which gates the sensor data — if the key is missing, data is blocked.
+  auto &packet = responder.sent_packets[0];
+  requester.process_({packet.data(), packet.size()});
+  EXPECT_FLOAT_EQ(remote_sensor.state, 77.7f);
+}
+
+TEST(PacketTransportSensorTest, MissingPingKeyBlocksSensorData) {
+  std::vector<uint8_t> key(32, 0xBB);
+
+  // Responder sends data WITHOUT receiving any MAGIC_PING first — no ping keys
+  TestablePacketTransport responder;
+  responder.init_for_test("responder");
+  responder.set_encryption_key(key);
+  sensor::Sensor local_sensor;
+  local_sensor.state = 77.7f;
+  responder.add_sensor("temp", &local_sensor);
+  responder.send_data_(true);
+  ASSERT_EQ(responder.sent_packets.size(), 1u);
+
+  // Requester with ping-pong enabled expects a key that isn't in the packet
+  TestablePacketTransport requester;
+  requester.init_for_test("requester");
+  requester.set_ping_pong_enable(true);
+  requester.ping_key_ = 0xDEADBEEF;
+  sensor::Sensor remote_sensor;
+  remote_sensor.state = -999.0f;
+  requester.add_remote_sensor("responder", "temp", &remote_sensor);
+  requester.set_provider_encryption("responder", key);
+
+  auto &packet = responder.sent_packets[0];
+  requester.process_({packet.data(), packet.size()});
+  EXPECT_FLOAT_EQ(remote_sensor.state, -999.0f);  // blocked — ping key not found
+}
+
+}  // namespace esphome::packet_transport::testing