Skip to content

Consistent naming of mocks #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MaciejKaszynski merged 2 commits into from
Aug 12, 2026
Merged

Consistent naming of mocks #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4137dbd
BREAKING CHANGE: Consistent naming of mocks
cameron-craig-etas Aug 12, 2026
2bb384f
fix: Update references to renamed xml files
cameron-craig-etas Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion score/launch_manager/src/daemon/src/process_group_manager/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__"],
Expand Down
6 changes: 3 additions & 3 deletions .../launch_manager/src/daemon/src/process_group_manager/details/process_group_manager_UT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gmock/gmock.h>
#include <gtest/gtest.h>
Expand Down
0 ...oup_manager/alive_monitor_thread_mock.hpp → ...oup_manager/mock_alive_monitor_thread.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion score/launch_manager/src/daemon/src/recovery_client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__"],
Expand Down
0 ...c/recovery_client/irecovery_client_mock.h → ...c/recovery_client/mock_irecovery_client.h
View file
Open in desktop
File renamed without changes.
0 ...l_client/iprocess_state_notifier_mock.hpp → ...l_client/mock_iprocess_state_notifier.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion score/launch_manager/src/daemon/src/watchdog/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__"],
Expand Down
0 ...c/daemon/src/watchdog/IWatchdogIfMock.hpp → .../daemon/src/watchdog/mock_IWatchdogIf.hpp
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions score/launch_manager/src/lifecycle_client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions score/launch_manager/src/lifecycle_client/src/lifecycle_mocks_UT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gmock/gmock.h>
Expand Down
2 changes: 1 addition & 1 deletion ...cle_client/src/applicationcontextmock.cpp → ...le_client/src/mock_applicationcontext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <functional>
Expand Down
0 ...cycle_client/src/applicationcontextmock.h → ...ycle_client/src/mock_applicationcontext.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...cycle_client/src/lifecyclemanagermock.cpp → ...ycle_client/src/mock_lifecyclemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <functional>
Expand Down
2 changes: 1 addition & 1 deletion ...fecycle_client/src/lifecyclemanagermock.h → ...ecycle_client/src/mock_lifecyclemanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ...cle_client/src/mwlifecyclemanagermock.cpp → ...le_client/src/mock_mwlifecyclemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <functional>
Expand Down
0 ...cycle_client/src/mwlifecyclemanagermock.h → ...ycle_client/src/mock_mwlifecyclemanager.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ecycle_client/src/report_running_mock.cpp → ...ecycle_client/src/mock_report_running.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <functional>
Expand Down
0 ...ifecycle_client/src/report_running_mock.h → ...ifecycle_client/src/mock_report_running.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions score/launch_manager/src/lifecycle_client/src/runapplication_UT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gmock/gmock.h>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/complex_monitoring/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/complex_monitoring/complex_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
0 ...omplex_monitoring/control_client_mock.cpp → ...omplex_monitoring/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/crash_on_startup/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/crash_on_startup/crash_on_startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
0 .../crash_on_startup/control_client_mock.cpp → .../crash_on_startup/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/fallback_to_same_target_restarts/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/fallback_to_same_target_restarts/fallback_to_same_target_restarts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
0 ...e_target_restarts/control_client_mock.cpp → ...e_target_restarts/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/process_complex_rep_failure/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...mplex_rep_failure/control_client_mock.cpp → ...mplex_rep_failure/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/process_complex_rep_failure/process_complex_rep_failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
2 changes: 1 addition & 1 deletion tests/integration/process_crash_monitoring/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ..._crash_monitoring/control_client_mock.cpp → ..._crash_monitoring/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/process_crash_monitoring/process_crash_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
2 changes: 1 addition & 1 deletion tests/integration/process_simple_rep_failure/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...imple_rep_failure/control_client_mock.cpp → ...imple_rep_failure/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/process_simple_rep_failure/process_simple_rep_failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
2 changes: 1 addition & 1 deletion tests/integration/process_wrong_binary_failure/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...ng_binary_failure/control_client_mock.cpp → ...ng_binary_failure/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/process_wrong_binary_failure/process_wrong_binary_failure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
2 changes: 1 addition & 1 deletion tests/integration/shutdown_signal/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...n/shutdown_signal/control_daemon_mock.cpp → ...n/shutdown_signal/mock_control_daemon.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/shutdown_signal/shutdown_signal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
2 changes: 1 addition & 1 deletion tests/integration/smoke/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...integration/smoke/control_daemon_mock.cpp → ...integration/smoke/mock_control_daemon.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/smoke/smoke.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"})
2 changes: 1 addition & 1 deletion tests/integration/switch_run_target/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...switch_run_target/control_client_mock.cpp → ...switch_run_target/mock_control_client.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/integration/switch_run_target/switch_run_target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading