From ef37ae27aba9d817a9210f391ca9f0be9d3764c8 Mon Sep 17 00:00:00 2001
From: Josiah VanderZee <jvanderzee@apache.org>
Date: Mon, 22 Jun 2026 13:00:34 -0500
Subject: [PATCH] Use fixture listener in test_EventSystem

This removes the Catch2 listener from test_EventSystem.cc, using
the identical listener from inkevent_test_fixtures.h instead.

There is a similar listener in the IOBuffer test, but it is not an
exact duplicate (it calls `LibRecordsConfigInit`).
---
 .../unit_tests/test_EventSystem.cc            | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/iocore/eventsystem/unit_tests/test_EventSystem.cc b/src/iocore/eventsystem/unit_tests/test_EventSystem.cc
index b9c24764c7d..22a9d21cb9e 100644
--- a/src/iocore/eventsystem/unit_tests/test_EventSystem.cc
+++ b/src/iocore/eventsystem/unit_tests/test_EventSystem.cc
@@ -21,6 +21,8 @@
   limitations under the License.
  */
 
+#include "inkevent_test_fixtures.h"
+
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/reporters/catch_reporter_event_listener.hpp>
 #include <catch2/reporters/catch_reporter_registrars.hpp>
@@ -28,10 +30,9 @@
 
 #include "iocore/eventsystem/EventSystem.h"
 #include "tscore/ink_atomic.h"
-#include "tscore/Layout.h"
 #include "tscore/TSSystemState.h"
 
-#include "iocore/utils/diags.i"
+using inkevent_test::EventProcessorListener;
 
 #define TEST_TIME_SECOND 60
 #define TEST_THREADS     2
@@ -83,24 +84,6 @@ TEST_CASE("EventSystem", "[iocore]")
   }
 }
 
-struct EventProcessorListener : Catch::EventListenerBase {
-  using EventListenerBase::EventListenerBase;
-
-  void
-  testRunStarting(Catch::TestRunInfo const & /* testRunInfo ATS_UNUSED */) override
-  {
-    Layout::create();
-    init_diags("", nullptr);
-    RecProcessInit();
-
-    ink_event_system_init(EVENT_SYSTEM_MODULE_PUBLIC_VERSION);
-    eventProcessor.start(TEST_THREADS, 1048576); // Hardcoded stacksize at 1MB
-
-    EThread *main_thread = new EThread;
-    main_thread->set_specific();
-  }
-};
-
 CATCH_REGISTER_LISTENER(EventProcessorListener);
 
 TEST_CASE("EventSystemUnixSocket", "[iocore][sock]")