From 5a9c0a2a21bfb819875d1bbffad66a89aa71d14a Mon Sep 17 00:00:00 2001
From: Michael Lynch <git@mtlynch.io>
Date: Fri, 1 May 2026 07:56:28 -0400
Subject: [PATCH] Split test helpers to mocks.h

---
 test/test_helpers/mocks.h              | 178 +++++++++++++++++++++++++
 test/test_helpers/test_advert_data.cpp | 173 +-----------------------
 2 files changed, 179 insertions(+), 172 deletions(-)
 create mode 100644 test/test_helpers/mocks.h

diff --git a/test/test_helpers/mocks.h b/test/test_helpers/mocks.h
new file mode 100644
index 000000000..655a44cea
--- /dev/null
+++ b/test/test_helpers/mocks.h
@@ -0,0 +1,178 @@
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <optional>
+
+#include "helpers/BaseChatMesh.h"
+#include "helpers/SimpleMeshTables.h"
+
+class FakeMillis final : public mesh::MillisecondClock {
+public:
+  unsigned long getMillis() override {
+    return 0;
+  }
+};
+
+class FakeRtc final : public mesh::RTCClock {
+public:
+  explicit FakeRtc(uint32_t initial_time) : _time(initial_time) {}
+
+  uint32_t getCurrentTime() override {
+    return _time;
+  }
+
+  void setCurrentTime(uint32_t time) override {
+    _time = time;
+  }
+
+private:
+  uint32_t _time;
+};
+
+class FakeRng final : public mesh::RNG {
+public:
+  void random(uint8_t* dest, size_t sz) override {
+    memset(dest, 0x5A, sz);
+  }
+};
+
+class FakeRadio final : public mesh::Radio {
+public:
+  int recvRaw(uint8_t*, int) override {
+    return 0;
+  }
+
+  uint32_t getEstAirtimeFor(int) override {
+    return 1;
+  }
+
+  float packetScore(float, int) override {
+    return 1.0f;
+  }
+
+  bool startSendRaw(const uint8_t*, int) override {
+    return true;
+  }
+
+  bool isSendComplete() override {
+    return true;
+  }
+
+  void onSendFinished() override {}
+
+  bool isInRecvMode() const override {
+    return true;
+  }
+};
+
+class NoopPacketManager final : public mesh::PacketManager {
+public:
+  mesh::Packet* allocNew() override {
+    return nullptr;
+  }
+
+  void free(mesh::Packet*) override {}
+
+  void queueOutbound(mesh::Packet*, uint8_t, uint32_t) override {}
+
+  mesh::Packet* getNextOutbound(uint32_t) override {
+    return nullptr;
+  }
+
+  int getOutboundCount(uint32_t) const override {
+    return 0;
+  }
+
+  int getOutboundTotal() const override {
+    return 0;
+  }
+
+  int getFreeCount() const override {
+    return 0;
+  }
+
+  mesh::Packet* getOutboundByIdx(int) override {
+    return nullptr;
+  }
+
+  mesh::Packet* removeOutboundByIdx(int) override {
+    return nullptr;
+  }
+
+  void queueInbound(mesh::Packet*, uint32_t) override {}
+
+  mesh::Packet* getNextInbound(uint32_t) override {
+    return nullptr;
+  }
+};
+
+class TestChatMesh final : public BaseChatMesh {
+public:
+  TestChatMesh(mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc,
+               mesh::PacketManager& mgr, mesh::MeshTables& tables)
+      : BaseChatMesh(radio, ms, rng, rtc, mgr, tables) {}
+
+  mesh::DispatcherAction recv(mesh::Packet* pkt) {
+    return onRecvPacket(pkt);
+  }
+
+  std::optional<ContactInfo> discovered_contact;
+
+protected:
+  void onDiscoveredContact(ContactInfo& contact, bool, uint8_t, const uint8_t*) override {
+    discovered_contact = contact;
+  }
+
+  ContactInfo* processAck(const uint8_t*) override {
+    return nullptr;
+  }
+
+  void onContactPathUpdated(const ContactInfo&) override {}
+
+  void onMessageRecv(const ContactInfo&, mesh::Packet*, uint32_t, const char*) override {}
+
+  void onCommandDataRecv(const ContactInfo&, mesh::Packet*, uint32_t, const char*) override {}
+
+  void onSignedMessageRecv(const ContactInfo&, mesh::Packet*, uint32_t, const uint8_t*, const char*) override {}
+
+  uint32_t calcFloodTimeoutMillisFor(uint32_t) const override {
+    return 0;
+  }
+
+  uint32_t calcDirectTimeoutMillisFor(uint32_t, uint8_t) const override {
+    return 0;
+  }
+
+  void onSendTimeout() override {}
+
+  void onChannelMessageRecv(const mesh::GroupChannel&, mesh::Packet*, uint32_t, const char*) override {}
+
+  uint8_t onContactRequest(const ContactInfo&, uint32_t, const uint8_t*, uint8_t, uint8_t*) override {
+    return 0;
+  }
+
+  void onContactResponse(const ContactInfo&, const uint8_t*, uint8_t) override {}
+};
+
+struct TestMeshContext {
+  explicit TestMeshContext(uint32_t current_timestamp)
+      : rtc(current_timestamp), mesh(radio, ms, rng, rtc, packet_manager, tables) {}
+
+  TestChatMesh* operator->() {
+    return &mesh;
+  }
+
+  const TestChatMesh* operator->() const {
+    return &mesh;
+  }
+
+  FakeRadio radio;
+  FakeMillis ms;
+  FakeRng rng;
+  FakeRtc rtc;
+  NoopPacketManager packet_manager;
+  SimpleMeshTables tables;
+  TestChatMesh mesh;
+};
diff --git a/test/test_helpers/test_advert_data.cpp b/test/test_helpers/test_advert_data.cpp
index 83daa4288..9d9f77095 100644
--- a/test/test_helpers/test_advert_data.cpp
+++ b/test/test_helpers/test_advert_data.cpp
@@ -1,12 +1,10 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
-#include <optional>
 
 #include <gtest/gtest.h>
 
-#include "helpers/BaseChatMesh.h"
-#include "helpers/SimpleMeshTables.h"
+#include "mocks.h"
 
 namespace {
 
@@ -40,175 +38,6 @@ void WriteStringLiteral(uint8_t* dest, size_t* offset, const char (&value)[N]) {
   WriteBytes(dest, offset, reinterpret_cast<const uint8_t*>(value), N - 1);
 }
 
-class FakeMillis final : public mesh::MillisecondClock {
-public:
-  unsigned long getMillis() override {
-    return 0;
-  }
-};
-
-class FakeRtc final : public mesh::RTCClock {
-public:
-  explicit FakeRtc(uint32_t initial_time) : _time(initial_time) {}
-
-  uint32_t getCurrentTime() override {
-    return _time;
-  }
-
-  void setCurrentTime(uint32_t time) override {
-    _time = time;
-  }
-
-private:
-  uint32_t _time;
-};
-
-class FakeRng final : public mesh::RNG {
-public:
-  void random(uint8_t* dest, size_t sz) override {
-    memset(dest, 0x5A, sz);
-  }
-};
-
-class FakeRadio final : public mesh::Radio {
-public:
-  int recvRaw(uint8_t*, int) override {
-    return 0;
-  }
-
-  uint32_t getEstAirtimeFor(int) override {
-    return 1;
-  }
-
-  float packetScore(float, int) override {
-    return 1.0f;
-  }
-
-  bool startSendRaw(const uint8_t*, int) override {
-    return true;
-  }
-
-  bool isSendComplete() override {
-    return true;
-  }
-
-  void onSendFinished() override {}
-
-  bool isInRecvMode() const override {
-    return true;
-  }
-};
-
-class NoopPacketManager final : public mesh::PacketManager {
-public:
-  mesh::Packet* allocNew() override {
-    return nullptr;
-  }
-
-  void free(mesh::Packet*) override {}
-
-  void queueOutbound(mesh::Packet*, uint8_t, uint32_t) override {}
-
-  mesh::Packet* getNextOutbound(uint32_t) override {
-    return nullptr;
-  }
-
-  int getOutboundCount(uint32_t) const override {
-    return 0;
-  }
-
-  int getOutboundTotal() const override {
-    return 0;
-  }
-
-  int getFreeCount() const override {
-    return 0;
-  }
-
-  mesh::Packet* getOutboundByIdx(int) override {
-    return nullptr;
-  }
-
-  mesh::Packet* removeOutboundByIdx(int) override {
-    return nullptr;
-  }
-
-  void queueInbound(mesh::Packet*, uint32_t) override {}
-
-  mesh::Packet* getNextInbound(uint32_t) override {
-    return nullptr;
-  }
-};
-
-class TestChatMesh final : public BaseChatMesh {
-public:
-  TestChatMesh(mesh::Radio& radio, mesh::MillisecondClock& ms, mesh::RNG& rng, mesh::RTCClock& rtc,
-               mesh::PacketManager& mgr, mesh::MeshTables& tables)
-      : BaseChatMesh(radio, ms, rng, rtc, mgr, tables) {}
-
-  mesh::DispatcherAction recv(mesh::Packet* pkt) {
-    return onRecvPacket(pkt);
-  }
-
-  std::optional<ContactInfo> discovered_contact;
-
-protected:
-  void onDiscoveredContact(ContactInfo& contact, bool, uint8_t, const uint8_t*) override {
-    discovered_contact = contact;
-  }
-
-  ContactInfo* processAck(const uint8_t*) override {
-    return nullptr;
-  }
-
-  void onContactPathUpdated(const ContactInfo&) override {}
-
-  void onMessageRecv(const ContactInfo&, mesh::Packet*, uint32_t, const char*) override {}
-
-  void onCommandDataRecv(const ContactInfo&, mesh::Packet*, uint32_t, const char*) override {}
-
-  void onSignedMessageRecv(const ContactInfo&, mesh::Packet*, uint32_t, const uint8_t*, const char*) override {}
-
-  uint32_t calcFloodTimeoutMillisFor(uint32_t) const override {
-    return 0;
-  }
-
-  uint32_t calcDirectTimeoutMillisFor(uint32_t, uint8_t) const override {
-    return 0;
-  }
-
-  void onSendTimeout() override {}
-
-  void onChannelMessageRecv(const mesh::GroupChannel&, mesh::Packet*, uint32_t, const char*) override {}
-
-  uint8_t onContactRequest(const ContactInfo&, uint32_t, const uint8_t*, uint8_t, uint8_t*) override {
-    return 0;
-  }
-
-  void onContactResponse(const ContactInfo&, const uint8_t*, uint8_t) override {}
-};
-
-struct TestMeshContext {
-  explicit TestMeshContext(uint32_t current_timestamp)
-      : rtc(current_timestamp), mesh(radio, ms, rng, rtc, packet_manager, tables) {}
-
-  TestChatMesh* operator->() {
-    return &mesh;
-  }
-
-  const TestChatMesh* operator->() const {
-    return &mesh;
-  }
-
-  FakeRadio radio;
-  FakeMillis ms;
-  FakeRng rng;
-  FakeRtc rtc;
-  NoopPacketManager packet_manager;
-  SimpleMeshTables tables;
-  TestChatMesh mesh;
-};
-
 TestMeshContext MakeTestMesh(uint32_t current_timestamp) {
   return TestMeshContext(current_timestamp);
 }