Skip to content

Update mock names (again), adding missing underscores #491

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 20, 2026
Merged

Update mock names (again), adding missing underscores #491

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
99c8092
fix: Improve readability by adding underscores
cameron-craig-etas Aug 19, 2026
a1b0afb
Merge branch 'main' into fix/underscores-in-mock-names
NicolasFussberger Aug 20, 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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ See the [demo scenario](examples/demo_verification) for an example.
**Mocks**

```
//score/launch_manager:mock_applicationcontext_cc
//score/launch_manager:mock_application_context_cc
//score/launch_manager:mock_lifecycle_cc
//score/launch_manager:mock_report_running_cc
```
Expand Down
11 changes: 5 additions & 6 deletions docs/release/release_note_v_0_4_0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,13 @@ Known Vulnerabilities
Upgrade Instructions
~~~~~~~~~~~~~~~~~~~~

- Update include paths and BUILD labels for public mocks.
- Rename all usage of `//score/launch_manager:applicationcontext_mock_c` to `//score/launch_manager:mock_applicationcontext_cc`.
- Update include paths and BUILD labels for public mocks. These changes introduce a consistent naming convention for the test doubles in the lifecycle repository. More information in `#422 <https://github.com/eclipse-score/lifecycle/issues/422>`_
- Rename all usage of `//score/launch_manager:applicationcontext_mock_c` to `//score/launch_manager:mock_application_context_cc`.
- Rename all usage of `//score/launch_manager:lifecycle_mock_cc` to `//score/launch_manager:mock_lifecycle_cc`.
- Rename all usage of `//score/launch_manager:report_running_mock_cc` to `//score/launch_manager:mock_lifecycle_cc`.
- Rename all usage of `applicationcontextmock.h` to `mock_applicationcontext.h`.
- Rename all usage of `lifecyclemanagermock.h` to `mock_lifecyclemanager.h`.
- Rename all usage of `//score/launch_manager:report_running_mock_cc` to `//score/launch_manager:mock_report_running_cc`.
- Rename all usage of `applicationcontextmock.h` to `mock_application_context.h`.
- Rename all usage of `lifecyclemanagermock.h` to `mock_lifecycle_manager.h`.
- Rename all usage of `report_running_mock.h` to `mock_report_running.h`.
- These changes introduce a consistent naming convention for the test doubles in the lifecycle repository. More information in `#422 <https://github.com/eclipse-score/lifecycle/issues/422>`_

- Backward compatibility with the previous release is not guaranteed.

Expand Down
4 changes: 2 additions & 2 deletions score/launch_manager/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ lm_cc_test(
)

alias(
name = "mock_applicationcontext_cc",
actual = "//score/launch_manager/src/lifecycle_client:mock_applicationcontext",
name = "mock_application_context_cc",
actual = "//score/launch_manager/src/lifecycle_client:mock_application_context",
)

cc_library(
Expand Down
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 @@ -150,14 +150,14 @@ cc_library(
)

cc_library(
name = "mock_applicationcontext",
name = "mock_application_context",
testonly = True,
srcs = [
"src/mock_applicationcontext.cpp",
"src/mock_application_context.cpp",
],
hdrs = [
"src/applicationcontext.h",
"src/mock_applicationcontext.h",
"src/mock_application_context.h",
],
features = COMPILER_WARNING_FEATURES,
include_prefix = "score/mw/lifecycle",
Expand All @@ -173,11 +173,11 @@ cc_library(
name = "mock_mw_lifecycle_manager",
testonly = True,
srcs = [
"src/mock_mwlifecyclemanager.cpp",
"src/mock_mw_lifecycle_manager.cpp",
],
hdrs = [
"src/lifecyclemanager.h",
"src/mock_mwlifecyclemanager.h",
"src/mock_mw_lifecycle_manager.h",
],
features = COMPILER_WARNING_FEATURES,
include_prefix = "score/mw/lifecycle",
Expand All @@ -193,20 +193,20 @@ cc_library(
name = "mock_lifecycle",
testonly = True,
srcs = [
"src/mock_lifecyclemanager.cpp",
"src/mock_lifecycle_manager.cpp",
],
hdrs = [
"src/application.h",
"src/lifecyclemanager.h",
"src/mock_lifecyclemanager.h",
"src/mock_lifecycle_manager.h",
],
features = COMPILER_WARNING_FEATURES,
include_prefix = "score/mw/lifecycle",
strip_include_prefix = "/score/launch_manager/src/lifecycle_client/src",
visibility = ["//score/launch_manager:__subpackages__"],
deps = [
":lifecyclemanager",
":mock_applicationcontext",
":mock_application_context",
":mock_mw_lifecycle_manager",
"@googletest//:gtest",
"@score_baselibs//score/os/utils:signal",
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/mock_applicationcontext.h"
#include "score/mw/lifecycle/mock_lifecyclemanager.h"
#include "score/mw/lifecycle/mock_mwlifecyclemanager.h"
#include "score/mw/lifecycle/mock_application_context.h"
#include "score/mw/lifecycle/mock_lifecycle_manager.h"
#include "score/mw/lifecycle/mock_mw_lifecycle_manager.h"
#include "score/mw/lifecycle/runapplication.h"

#include <gmock/gmock.h>
Expand Down
2 changes: 1 addition & 1 deletion ...le_client/src/mock_applicationcontext.cpp → ...e_client/src/mock_application_context.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/mock_applicationcontext.h"
#include "score/mw/lifecycle/mock_application_context.h"
#include "score/mw/lifecycle/applicationcontext.h"

#include <functional>
Expand Down
0 ...ycle_client/src/mock_applicationcontext.h → ...cle_client/src/mock_application_context.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ycle_client/src/mock_lifecyclemanager.cpp → ...cle_client/src/mock_lifecycle_manager.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/mock_lifecyclemanager.h"
#include "score/mw/lifecycle/mock_lifecycle_manager.h"
#include "score/mw/lifecycle/lifecyclemanager.h"

#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion ...ecycle_client/src/mock_lifecyclemanager.h → ...cycle_client/src/mock_lifecycle_manager.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/mock_applicationcontext.h"
#include "score/mw/lifecycle/mock_application_context.h"
#include "score/os/utils/mocklib/signalmock.h"
#include "score/os/utils/signal.h"

Expand Down
2 changes: 1 addition & 1 deletion ...le_client/src/mock_mwlifecyclemanager.cpp → ..._client/src/mock_mw_lifecycle_manager.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/mock_mwlifecyclemanager.h"
#include "score/mw/lifecycle/mock_mw_lifecycle_manager.h"
#include "score/mw/lifecycle/lifecyclemanager.h"

#include <functional>
Expand Down
0 ...ycle_client/src/mock_mwlifecyclemanager.h → ...le_client/src/mock_mw_lifecycle_manager.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/mock_applicationcontext.h"
#include "score/mw/lifecycle/mock_lifecyclemanager.h"
#include "score/mw/lifecycle/mock_application_context.h"
#include "score/mw/lifecycle/mock_lifecycle_manager.h"
#include "score/mw/lifecycle/runapplication.h"

#include <gmock/gmock.h>
Expand Down
Loading