From 4137dbdc7af750cae627ab2d7fcb6e2641e2a40e Mon Sep 17 00:00:00 2001 From: Cameron Craig Date: Wed, 12 Aug 2026 10:36:14 +0100 Subject: [PATCH 1/2] BREAKING CHANGE: Consistent naming of mocks feat: Switch to a prefix --- .../src/daemon/src/process_group_manager/BUILD | 2 +- .../details/process_group_manager_UT.cpp | 6 +++--- ...ad_mock.hpp => mock_alive_monitor_thread.hpp} | 0 .../src/daemon/src/recovery_client/BUILD | 2 +- ...ery_client_mock.h => mock_irecovery_client.h} | 0 ...mock.hpp => mock_iprocess_state_notifier.hpp} | 0 .../launch_manager/src/daemon/src/watchdog/BUILD | 2 +- ...{IWatchdogIfMock.hpp => mock_IWatchdogIf.hpp} | 0 score/launch_manager/src/lifecycle_client/BUILD | 16 ++++++++-------- .../lifecycle_client/src/lifecycle_mocks_UT.cpp | 6 +++--- ...ntextmock.cpp => mock_applicationcontext.cpp} | 2 +- ...oncontextmock.h => mock_applicationcontext.h} | 0 ...managermock.cpp => mock_lifecyclemanager.cpp} | 2 +- ...yclemanagermock.h => mock_lifecyclemanager.h} | 2 +- ...nagermock.cpp => mock_mwlifecyclemanager.cpp} | 2 +- ...lemanagermock.h => mock_mwlifecyclemanager.h} | 0 ..._running_mock.cpp => mock_report_running.cpp} | 2 +- ...port_running_mock.h => mock_report_running.h} | 0 .../lifecycle_client/src/runapplication_UT.cpp | 4 ++-- tests/integration/complex_monitoring/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 tests/integration/crash_on_startup/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 .../fallback_to_same_target_restarts/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 .../process_complex_rep_failure/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 tests/integration/process_crash_monitoring/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 .../integration/process_simple_rep_failure/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 .../process_wrong_binary_failure/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 tests/integration/shutdown_signal/BUILD | 2 +- ...l_daemon_mock.cpp => mock_control_daemon.cpp} | 0 .../shutdown_signal/shutdown_signal.py | 2 +- tests/integration/smoke/BUILD | 2 +- ...l_daemon_mock.cpp => mock_control_daemon.cpp} | 0 tests/integration/smoke/smoke.py | 2 +- tests/integration/switch_run_target/BUILD | 2 +- ...l_client_mock.cpp => mock_control_client.cpp} | 0 41 files changed, 36 insertions(+), 36 deletions(-) rename score/launch_manager/src/daemon/src/process_group_manager/{alive_monitor_thread_mock.hpp => mock_alive_monitor_thread.hpp} (100%) rename score/launch_manager/src/daemon/src/recovery_client/{irecovery_client_mock.h => mock_irecovery_client.h} (100%) rename score/launch_manager/src/daemon/src/supervision_control_client/{iprocess_state_notifier_mock.hpp => mock_iprocess_state_notifier.hpp} (100%) rename score/launch_manager/src/daemon/src/watchdog/{IWatchdogIfMock.hpp => mock_IWatchdogIf.hpp} (100%) rename score/launch_manager/src/lifecycle_client/src/{applicationcontextmock.cpp => mock_applicationcontext.cpp} (98%) rename score/launch_manager/src/lifecycle_client/src/{applicationcontextmock.h => mock_applicationcontext.h} (100%) rename score/launch_manager/src/lifecycle_client/src/{lifecyclemanagermock.cpp => mock_lifecyclemanager.cpp} (98%) rename score/launch_manager/src/lifecycle_client/src/{lifecyclemanagermock.h => mock_lifecyclemanager.h} (96%) rename score/launch_manager/src/lifecycle_client/src/{mwlifecyclemanagermock.cpp => mock_mwlifecyclemanager.cpp} (96%) rename score/launch_manager/src/lifecycle_client/src/{mwlifecyclemanagermock.h => mock_mwlifecyclemanager.h} (100%) rename score/launch_manager/src/lifecycle_client/src/{report_running_mock.cpp => mock_report_running.cpp} (96%) rename score/launch_manager/src/lifecycle_client/src/{report_running_mock.h => mock_report_running.h} (100%) rename tests/integration/complex_monitoring/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/crash_on_startup/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/fallback_to_same_target_restarts/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/process_complex_rep_failure/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/process_crash_monitoring/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/process_simple_rep_failure/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/process_wrong_binary_failure/{control_client_mock.cpp => mock_control_client.cpp} (100%) rename tests/integration/shutdown_signal/{control_daemon_mock.cpp => mock_control_daemon.cpp} (100%) rename tests/integration/smoke/{control_daemon_mock.cpp => mock_control_daemon.cpp} (100%) rename tests/integration/switch_run_target/{control_client_mock.cpp => mock_control_client.cpp} (100%) diff --git a/score/launch_manager/src/daemon/src/process_group_manager/BUILD b/score/launch_manager/src/daemon/src/process_group_manager/BUILD index 407278ed0..a82cd061a 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/BUILD +++ b/score/launch_manager/src/daemon/src/process_group_manager/BUILD @@ -48,7 +48,7 @@ cc_library( cc_library( name = "ialive_monitor_thread_mock", testonly = True, - hdrs = ["alive_monitor_thread_mock.hpp"], + hdrs = ["mock_alive_monitor_thread.hpp"], include_prefix = "score/mw/launch_manager/process_group_manager", strip_include_prefix = "/score/launch_manager/src/daemon/src/process_group_manager", visibility = ["//score:__subpackages__"], diff --git a/score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager_UT.cpp b/score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager_UT.cpp index 2f3278a6e..ebdc472d4 100644 --- a/score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager_UT.cpp +++ b/score/launch_manager/src/daemon/src/process_group_manager/details/process_group_manager_UT.cpp @@ -13,10 +13,10 @@ #include "score/mw/launch_manager/process_group_manager/process_group_manager.hpp" -#include "score/mw/launch_manager/process_group_manager/alive_monitor_thread_mock.hpp" -#include "score/mw/launch_manager/recovery_client/irecovery_client_mock.h" +#include "score/mw/launch_manager/process_group_manager/mock_alive_monitor_thread.hpp" +#include "score/mw/launch_manager/recovery_client/mock_irecovery_client.h" #include "score/mw/launch_manager/supervision_control_client/mock_supervision_control_notifier.hpp" -#include "score/mw/launch_manager/watchdog/IWatchdogIfMock.hpp" +#include "score/mw/launch_manager/watchdog/mock_IWatchdogIf.hpp" #include #include diff --git a/score/launch_manager/src/daemon/src/process_group_manager/alive_monitor_thread_mock.hpp b/score/launch_manager/src/daemon/src/process_group_manager/mock_alive_monitor_thread.hpp similarity index 100% rename from score/launch_manager/src/daemon/src/process_group_manager/alive_monitor_thread_mock.hpp rename to score/launch_manager/src/daemon/src/process_group_manager/mock_alive_monitor_thread.hpp diff --git a/score/launch_manager/src/daemon/src/recovery_client/BUILD b/score/launch_manager/src/daemon/src/recovery_client/BUILD index 2066a6103..48a69de9b 100644 --- a/score/launch_manager/src/daemon/src/recovery_client/BUILD +++ b/score/launch_manager/src/daemon/src/recovery_client/BUILD @@ -35,7 +35,7 @@ cc_library( cc_library( name = "recovery_client_mock", testonly = True, - hdrs = ["irecovery_client_mock.h"], + hdrs = ["mock_irecovery_client.h"], include_prefix = "score/mw/launch_manager/recovery_client", strip_include_prefix = "/score/launch_manager/src/daemon/src/recovery_client", visibility = ["//score:__subpackages__"], diff --git a/score/launch_manager/src/daemon/src/recovery_client/irecovery_client_mock.h b/score/launch_manager/src/daemon/src/recovery_client/mock_irecovery_client.h similarity index 100% rename from score/launch_manager/src/daemon/src/recovery_client/irecovery_client_mock.h rename to score/launch_manager/src/daemon/src/recovery_client/mock_irecovery_client.h diff --git a/score/launch_manager/src/daemon/src/supervision_control_client/iprocess_state_notifier_mock.hpp b/score/launch_manager/src/daemon/src/supervision_control_client/mock_iprocess_state_notifier.hpp similarity index 100% rename from score/launch_manager/src/daemon/src/supervision_control_client/iprocess_state_notifier_mock.hpp rename to score/launch_manager/src/daemon/src/supervision_control_client/mock_iprocess_state_notifier.hpp diff --git a/score/launch_manager/src/daemon/src/watchdog/BUILD b/score/launch_manager/src/daemon/src/watchdog/BUILD index 5fdf87cf9..c958c60d6 100644 --- a/score/launch_manager/src/daemon/src/watchdog/BUILD +++ b/score/launch_manager/src/daemon/src/watchdog/BUILD @@ -50,7 +50,7 @@ lm_cc_test( cc_library( name = "i_watchdog_if_mock", testonly = True, - hdrs = ["IWatchdogIfMock.hpp"], + hdrs = ["mock_IWatchdogIf.hpp"], include_prefix = "score/mw/launch_manager/watchdog", strip_include_prefix = "/score/launch_manager/src/daemon/src/watchdog", visibility = ["//score:__subpackages__"], diff --git a/score/launch_manager/src/daemon/src/watchdog/IWatchdogIfMock.hpp b/score/launch_manager/src/daemon/src/watchdog/mock_IWatchdogIf.hpp similarity index 100% rename from score/launch_manager/src/daemon/src/watchdog/IWatchdogIfMock.hpp rename to score/launch_manager/src/daemon/src/watchdog/mock_IWatchdogIf.hpp diff --git a/score/launch_manager/src/lifecycle_client/BUILD b/score/launch_manager/src/lifecycle_client/BUILD index 734792332..334a7ff4a 100644 --- a/score/launch_manager/src/lifecycle_client/BUILD +++ b/score/launch_manager/src/lifecycle_client/BUILD @@ -153,11 +153,11 @@ cc_library( name = "applicationcontext_mock", testonly = True, srcs = [ - "src/applicationcontextmock.cpp", + "src/mock_applicationcontext.cpp", ], hdrs = [ "src/applicationcontext.h", - "src/applicationcontextmock.h", + "src/mock_applicationcontext.h", ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", @@ -173,11 +173,11 @@ cc_library( name = "mw_lifecycle_manager_mock", testonly = True, srcs = [ - "src/mwlifecyclemanagermock.cpp", + "src/mock_mwlifecyclemanager.cpp", ], hdrs = [ "src/lifecyclemanager.h", - "src/mwlifecyclemanagermock.h", + "src/mock_mwlifecyclemanager.h", ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", @@ -193,12 +193,12 @@ cc_library( name = "lifecycle_mock", testonly = True, srcs = [ - "src/lifecyclemanagermock.cpp", + "src/mock_lifecyclemanager.cpp", ], hdrs = [ "src/application.h", "src/lifecyclemanager.h", - "src/lifecyclemanagermock.h", + "src/mock_lifecyclemanager.h", ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", @@ -217,10 +217,10 @@ cc_library( cc_library( name = "report_running_mock", testonly = True, - srcs = ["src/report_running_mock.cpp"], + srcs = ["src/mock_report_running.cpp"], hdrs = [ + "src/mock_report_running.h", "src/report_running.h", - "src/report_running_mock.h", ], features = COMPILER_WARNING_FEATURES, include_prefix = "score/mw/lifecycle", diff --git a/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp b/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp index add0638fc..fd992ae8f 100644 --- a/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp +++ b/score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp @@ -19,9 +19,9 @@ /// a reference for other components (e.g. config_management) that depend on the /// lifecycle mocks in their own test suites. -#include "score/mw/lifecycle/applicationcontextmock.h" -#include "score/mw/lifecycle/lifecyclemanagermock.h" -#include "score/mw/lifecycle/mwlifecyclemanagermock.h" +#include "score/mw/lifecycle/mock_applicationcontext.h" +#include "score/mw/lifecycle/mock_lifecyclemanager.h" +#include "score/mw/lifecycle/mock_mwlifecyclemanager.h" #include "score/mw/lifecycle/runapplication.h" #include diff --git a/score/launch_manager/src/lifecycle_client/src/applicationcontextmock.cpp b/score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.cpp similarity index 98% rename from score/launch_manager/src/lifecycle_client/src/applicationcontextmock.cpp rename to score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.cpp index c6e378535..9581d2469 100644 --- a/score/launch_manager/src/lifecycle_client/src/applicationcontextmock.cpp +++ b/score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.cpp @@ -11,7 +11,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/mw/lifecycle/applicationcontextmock.h" +#include "score/mw/lifecycle/mock_applicationcontext.h" #include "score/mw/lifecycle/applicationcontext.h" #include diff --git a/score/launch_manager/src/lifecycle_client/src/applicationcontextmock.h b/score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.h similarity index 100% rename from score/launch_manager/src/lifecycle_client/src/applicationcontextmock.h rename to score/launch_manager/src/lifecycle_client/src/mock_applicationcontext.h diff --git a/score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.cpp b/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.cpp similarity index 98% rename from score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.cpp rename to score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.cpp index dd9895464..5a3786a68 100644 --- a/score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.cpp +++ b/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.cpp @@ -11,7 +11,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/mw/lifecycle/lifecyclemanagermock.h" +#include "score/mw/lifecycle/mock_lifecyclemanager.h" #include "score/mw/lifecycle/lifecyclemanager.h" #include diff --git a/score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.h b/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.h similarity index 96% rename from score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.h rename to score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.h index ea990da9b..b18b5f4bb 100644 --- a/score/launch_manager/src/lifecycle_client/src/lifecyclemanagermock.h +++ b/score/launch_manager/src/lifecycle_client/src/mock_lifecyclemanager.h @@ -15,7 +15,7 @@ #define SCORE_MW_LIFECYCLE_MOCKS_LIFECYCLEMANAGERMOCK_H_ #include "score/mw/lifecycle/application.h" -#include "score/mw/lifecycle/applicationcontextmock.h" +#include "score/mw/lifecycle/mock_applicationcontext.h" #include "score/os/utils/mocklib/signalmock.h" #include "score/os/utils/signal.h" diff --git a/score/launch_manager/src/lifecycle_client/src/mwlifecyclemanagermock.cpp b/score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.cpp similarity index 96% rename from score/launch_manager/src/lifecycle_client/src/mwlifecyclemanagermock.cpp rename to score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.cpp index 189ee8322..d653b2bc3 100644 --- a/score/launch_manager/src/lifecycle_client/src/mwlifecyclemanagermock.cpp +++ b/score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.cpp @@ -11,7 +11,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/mw/lifecycle/mwlifecyclemanagermock.h" +#include "score/mw/lifecycle/mock_mwlifecyclemanager.h" #include "score/mw/lifecycle/lifecyclemanager.h" #include diff --git a/score/launch_manager/src/lifecycle_client/src/mwlifecyclemanagermock.h b/score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.h similarity index 100% rename from score/launch_manager/src/lifecycle_client/src/mwlifecyclemanagermock.h rename to score/launch_manager/src/lifecycle_client/src/mock_mwlifecyclemanager.h diff --git a/score/launch_manager/src/lifecycle_client/src/report_running_mock.cpp b/score/launch_manager/src/lifecycle_client/src/mock_report_running.cpp similarity index 96% rename from score/launch_manager/src/lifecycle_client/src/report_running_mock.cpp rename to score/launch_manager/src/lifecycle_client/src/mock_report_running.cpp index d11ec5acf..f91c827fb 100644 --- a/score/launch_manager/src/lifecycle_client/src/report_running_mock.cpp +++ b/score/launch_manager/src/lifecycle_client/src/mock_report_running.cpp @@ -11,7 +11,7 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/mw/lifecycle/report_running_mock.h" +#include "score/mw/lifecycle/mock_report_running.h" #include "score/mw/lifecycle/report_running.h" #include diff --git a/score/launch_manager/src/lifecycle_client/src/report_running_mock.h b/score/launch_manager/src/lifecycle_client/src/mock_report_running.h similarity index 100% rename from score/launch_manager/src/lifecycle_client/src/report_running_mock.h rename to score/launch_manager/src/lifecycle_client/src/mock_report_running.h diff --git a/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp b/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp index ad2c77324..ac81a289d 100644 --- a/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp +++ b/score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp @@ -11,8 +11,8 @@ * SPDX-License-Identifier: Apache-2.0 ********************************************************************************/ -#include "score/mw/lifecycle/applicationcontextmock.h" -#include "score/mw/lifecycle/lifecyclemanagermock.h" +#include "score/mw/lifecycle/mock_applicationcontext.h" +#include "score/mw/lifecycle/mock_lifecyclemanager.h" #include "score/mw/lifecycle/runapplication.h" #include diff --git a/tests/integration/complex_monitoring/BUILD b/tests/integration/complex_monitoring/BUILD index 0ce8d5bf1..330964c56 100644 --- a/tests/integration/complex_monitoring/BUILD +++ b/tests/integration/complex_monitoring/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/complex_monitoring/control_client_mock.cpp b/tests/integration/complex_monitoring/mock_control_client.cpp similarity index 100% rename from tests/integration/complex_monitoring/control_client_mock.cpp rename to tests/integration/complex_monitoring/mock_control_client.cpp diff --git a/tests/integration/crash_on_startup/BUILD b/tests/integration/crash_on_startup/BUILD index c416fc6b2..7d47df045 100644 --- a/tests/integration/crash_on_startup/BUILD +++ b/tests/integration/crash_on_startup/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/crash_on_startup/control_client_mock.cpp b/tests/integration/crash_on_startup/mock_control_client.cpp similarity index 100% rename from tests/integration/crash_on_startup/control_client_mock.cpp rename to tests/integration/crash_on_startup/mock_control_client.cpp diff --git a/tests/integration/fallback_to_same_target_restarts/BUILD b/tests/integration/fallback_to_same_target_restarts/BUILD index e2faa6825..8a3873c1f 100644 --- a/tests/integration/fallback_to_same_target_restarts/BUILD +++ b/tests/integration/fallback_to_same_target_restarts/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/fallback_to_same_target_restarts/control_client_mock.cpp b/tests/integration/fallback_to_same_target_restarts/mock_control_client.cpp similarity index 100% rename from tests/integration/fallback_to_same_target_restarts/control_client_mock.cpp rename to tests/integration/fallback_to_same_target_restarts/mock_control_client.cpp diff --git a/tests/integration/process_complex_rep_failure/BUILD b/tests/integration/process_complex_rep_failure/BUILD index 478e2370e..18b57cdcf 100644 --- a/tests/integration/process_complex_rep_failure/BUILD +++ b/tests/integration/process_complex_rep_failure/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/process_complex_rep_failure/control_client_mock.cpp b/tests/integration/process_complex_rep_failure/mock_control_client.cpp similarity index 100% rename from tests/integration/process_complex_rep_failure/control_client_mock.cpp rename to tests/integration/process_complex_rep_failure/mock_control_client.cpp diff --git a/tests/integration/process_crash_monitoring/BUILD b/tests/integration/process_crash_monitoring/BUILD index 0c8749bde..38c194cb1 100644 --- a/tests/integration/process_crash_monitoring/BUILD +++ b/tests/integration/process_crash_monitoring/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/process_crash_monitoring/control_client_mock.cpp b/tests/integration/process_crash_monitoring/mock_control_client.cpp similarity index 100% rename from tests/integration/process_crash_monitoring/control_client_mock.cpp rename to tests/integration/process_crash_monitoring/mock_control_client.cpp diff --git a/tests/integration/process_simple_rep_failure/BUILD b/tests/integration/process_simple_rep_failure/BUILD index 113a28f4d..715abda92 100644 --- a/tests/integration/process_simple_rep_failure/BUILD +++ b/tests/integration/process_simple_rep_failure/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/process_simple_rep_failure/control_client_mock.cpp b/tests/integration/process_simple_rep_failure/mock_control_client.cpp similarity index 100% rename from tests/integration/process_simple_rep_failure/control_client_mock.cpp rename to tests/integration/process_simple_rep_failure/mock_control_client.cpp diff --git a/tests/integration/process_wrong_binary_failure/BUILD b/tests/integration/process_wrong_binary_failure/BUILD index d5b5aee22..48bb3c741 100644 --- a/tests/integration/process_wrong_binary_failure/BUILD +++ b/tests/integration/process_wrong_binary_failure/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ "//score/launch_manager:control_cc", "//score/launch_manager:lifecycle_cc", diff --git a/tests/integration/process_wrong_binary_failure/control_client_mock.cpp b/tests/integration/process_wrong_binary_failure/mock_control_client.cpp similarity index 100% rename from tests/integration/process_wrong_binary_failure/control_client_mock.cpp rename to tests/integration/process_wrong_binary_failure/mock_control_client.cpp diff --git a/tests/integration/shutdown_signal/BUILD b/tests/integration/shutdown_signal/BUILD index bc47bd49d..620f6f116 100644 --- a/tests/integration/shutdown_signal/BUILD +++ b/tests/integration/shutdown_signal/BUILD @@ -20,7 +20,7 @@ cc_library( cc_binary( name = "control_daemon_mock", - srcs = ["control_daemon_mock.cpp"], + srcs = ["mock_control_daemon.cpp"], deps = [ ":shutdown_signal_common", "//score/launch_manager:control_cc", diff --git a/tests/integration/shutdown_signal/control_daemon_mock.cpp b/tests/integration/shutdown_signal/mock_control_daemon.cpp similarity index 100% rename from tests/integration/shutdown_signal/control_daemon_mock.cpp rename to tests/integration/shutdown_signal/mock_control_daemon.cpp diff --git a/tests/integration/shutdown_signal/shutdown_signal.py b/tests/integration/shutdown_signal/shutdown_signal.py index 3ae87407b..5430d6c8c 100644 --- a/tests/integration/shutdown_signal/shutdown_signal.py +++ b/tests/integration/shutdown_signal/shutdown_signal.py @@ -53,4 +53,4 @@ def test_shutdown_signal(target, setup_test, assert_test_results, remote_test_di timeout_s=10.0, ) - assert_test_results({"control_daemon_mock.xml", "shutdown_signal_process.xml"}) + assert_test_results({"mock_control_daemon.xml", "shutdown_signal_process.xml"}) diff --git a/tests/integration/smoke/BUILD b/tests/integration/smoke/BUILD index 127c143a4..127005fe5 100644 --- a/tests/integration/smoke/BUILD +++ b/tests/integration/smoke/BUILD @@ -15,7 +15,7 @@ load("//tests/utils/bazel:integration.bzl", "integration_test") cc_binary( name = "control_daemon_mock", - srcs = ["control_daemon_mock.cpp"], + srcs = ["mock_control_daemon.cpp"], data = [], deps = [ "//score/launch_manager:control_cc", diff --git a/tests/integration/smoke/control_daemon_mock.cpp b/tests/integration/smoke/mock_control_daemon.cpp similarity index 100% rename from tests/integration/smoke/control_daemon_mock.cpp rename to tests/integration/smoke/mock_control_daemon.cpp diff --git a/tests/integration/smoke/smoke.py b/tests/integration/smoke/smoke.py index b4a8eb1e4..d82212e50 100644 --- a/tests/integration/smoke/smoke.py +++ b/tests/integration/smoke/smoke.py @@ -41,4 +41,4 @@ def test_smoke(target, setup_test, assert_test_results, remote_test_dir): timeout_s=3.0, ) - assert_test_results({"control_daemon_mock.xml", "gtest_process.xml"}) + assert_test_results({"mock_control_daemon.xml", "gtest_process.xml"}) diff --git a/tests/integration/switch_run_target/BUILD b/tests/integration/switch_run_target/BUILD index 58c489b5b..d86ebb3e1 100644 --- a/tests/integration/switch_run_target/BUILD +++ b/tests/integration/switch_run_target/BUILD @@ -21,7 +21,7 @@ cc_library( cc_binary( name = "control_client_mock", - srcs = ["control_client_mock.cpp"], + srcs = ["mock_control_client.cpp"], deps = [ ":switch_run_target_common", "//score/launch_manager:control_cc", diff --git a/tests/integration/switch_run_target/control_client_mock.cpp b/tests/integration/switch_run_target/mock_control_client.cpp similarity index 100% rename from tests/integration/switch_run_target/control_client_mock.cpp rename to tests/integration/switch_run_target/mock_control_client.cpp From 2bb384f643dba95ded1b7914772aa8dd3573b333 Mon Sep 17 00:00:00 2001 From: Cameron Craig Date: Wed, 12 Aug 2026 11:51:30 +0100 Subject: [PATCH 2/2] fix: Update references to renamed xml files --- tests/integration/complex_monitoring/complex_monitoring.py | 2 +- tests/integration/crash_on_startup/crash_on_startup.py | 2 +- .../fallback_to_same_target_restarts.py | 2 +- .../process_complex_rep_failure/process_complex_rep_failure.py | 2 +- .../process_crash_monitoring/process_crash_monitoring.py | 2 +- .../process_simple_rep_failure/process_simple_rep_failure.py | 2 +- .../process_wrong_binary_failure.py | 2 +- tests/integration/switch_run_target/switch_run_target.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/integration/complex_monitoring/complex_monitoring.py b/tests/integration/complex_monitoring/complex_monitoring.py index 1e3964919..498ab6828 100644 --- a/tests/integration/complex_monitoring/complex_monitoring.py +++ b/tests/integration/complex_monitoring/complex_monitoring.py @@ -43,4 +43,4 @@ def test_complex_monitoring(target, setup_test, assert_test_results, remote_test timeout_s=4.0, ) - assert_test_results({"component_complex_monitoring.xml", "control_client_mock.xml"}) + assert_test_results({"component_complex_monitoring.xml", "mock_control_client.xml"}) diff --git a/tests/integration/crash_on_startup/crash_on_startup.py b/tests/integration/crash_on_startup/crash_on_startup.py index 2a074bed7..0e4e2f7ee 100644 --- a/tests/integration/crash_on_startup/crash_on_startup.py +++ b/tests/integration/crash_on_startup/crash_on_startup.py @@ -61,7 +61,7 @@ def test_crash_on_startup( crash_report_names = { n: f"process_crashing_on_startup_n_times_n_equals_{n}.xml" for n in (1, 2, 3) } - assert_test_results({"control_client_mock.xml", *crash_report_names.values()}) + assert_test_results({"mock_control_client.xml", *crash_report_names.values()}) # The number of crashes is recorded in each report and must match the configured crash count. for n, report_name in crash_report_names.items(): diff --git a/tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.py b/tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.py index c2716cd01..8a02e3ffa 100644 --- a/tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.py +++ b/tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.py @@ -42,4 +42,4 @@ def test_fallback_to_same_target_restarts( timeout_s=4.0, ) - assert_test_results({"control_client_mock.xml", "process_crashing_once.xml"}) + assert_test_results({"mock_control_client.xml", "process_crashing_once.xml"}) diff --git a/tests/integration/process_complex_rep_failure/process_complex_rep_failure.py b/tests/integration/process_complex_rep_failure/process_complex_rep_failure.py index 4e1a16276..ea46cd968 100644 --- a/tests/integration/process_complex_rep_failure/process_complex_rep_failure.py +++ b/tests/integration/process_complex_rep_failure/process_complex_rep_failure.py @@ -52,4 +52,4 @@ def test_recovery_action_complex_rep_failure( timeout_s=10.0, ) - assert_test_results({"control_client_mock.xml", "complex_reporting_process.xml"}) + assert_test_results({"mock_control_client.xml", "complex_reporting_process.xml"}) diff --git a/tests/integration/process_crash_monitoring/process_crash_monitoring.py b/tests/integration/process_crash_monitoring/process_crash_monitoring.py index da9ca1224..2b2441c79 100644 --- a/tests/integration/process_crash_monitoring/process_crash_monitoring.py +++ b/tests/integration/process_crash_monitoring/process_crash_monitoring.py @@ -42,4 +42,4 @@ def test_process_crash_monitoring( timeout_s=10.0, ) - assert_test_results({"control_client_mock.xml", "process_crashing_on_runtime.xml"}) + assert_test_results({"mock_control_client.xml", "process_crashing_on_runtime.xml"}) diff --git a/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py b/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py index e6133c415..7093c02af 100644 --- a/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py +++ b/tests/integration/process_simple_rep_failure/process_simple_rep_failure.py @@ -52,4 +52,4 @@ def test_recovery_action_simple_rep_failure( timeout_s=10.0, ) - assert_test_results({"control_client_mock.xml", "process_simple_reporting.xml"}) + assert_test_results({"mock_control_client.xml", "process_simple_reporting.xml"}) diff --git a/tests/integration/process_wrong_binary_failure/process_wrong_binary_failure.py b/tests/integration/process_wrong_binary_failure/process_wrong_binary_failure.py index 09f238777..b8a8f1147 100644 --- a/tests/integration/process_wrong_binary_failure/process_wrong_binary_failure.py +++ b/tests/integration/process_wrong_binary_failure/process_wrong_binary_failure.py @@ -40,4 +40,4 @@ def test_process_wrong_binary_failure( timeout_s=6, ) - assert_test_results({"control_client_mock.xml"}) + assert_test_results({"mock_control_client.xml"}) diff --git a/tests/integration/switch_run_target/switch_run_target.py b/tests/integration/switch_run_target/switch_run_target.py index 7a458a125..b13a250be 100644 --- a/tests/integration/switch_run_target/switch_run_target.py +++ b/tests/integration/switch_run_target/switch_run_target.py @@ -51,7 +51,7 @@ def test_switch_run_target(target, setup_test, assert_test_results, remote_test_ # Process E never starts assert_test_results( { - "control_client_mock.xml", + "mock_control_client.xml", "component_a.xml", "component_b.xml", "component_d.xml",