From 8607dec3e35a616ae19f46372e2fcce0bb87735c Mon Sep 17 00:00:00 2001
From: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
Date: Mon, 18 Oct 2021 12:24:58 +0200
Subject: [PATCH] Reintroduced const refs for CreateMap and Create static
object
Signed-off-by: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
---
.../include/MantleAPI/Execution/i_environment.h | 2 +-
MantleAPI/include/MantleAPI/Traffic/i_entity.h | 1 -
.../MantleAPI/Traffic/i_entity_repository.h | 4 ++--
MantleAPI/test/MantleAPI/Test/test_utils.h | 15 +++++----------
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/MantleAPI/include/MantleAPI/Execution/i_environment.h b/MantleAPI/include/MantleAPI/Execution/i_environment.h
index 7c031c84..4c114364 100644
--- a/MantleAPI/include/MantleAPI/Execution/i_environment.h
+++ b/MantleAPI/include/MantleAPI/Execution/i_environment.h
@@ -36,7 +36,7 @@ public:
///
/// @param file_path map file path from the scenario file. If this path is not resolved by the engine, the
/// environment must do so.
- virtual void CreateMap(const std::string& map_file_path, const mantle_api::MapDetails* map_details) = 0;
+ virtual void CreateMap(const std::string& map_file_path, const mantle_api::MapDetails& map_details) = 0;
/// Creates a controller from the given config. A created controller can be assigned to multiple entities
///
diff --git a/MantleAPI/include/MantleAPI/Traffic/i_entity.h b/MantleAPI/include/MantleAPI/Traffic/i_entity.h
index fa864109..864225c1 100644
--- a/MantleAPI/include/MantleAPI/Traffic/i_entity.h
+++ b/MantleAPI/include/MantleAPI/Traffic/i_entity.h
@@ -26,7 +26,6 @@
namespace mantle_api
{
-
struct EntityVisibilityConfig
{
/// The "graphics" flag determines, if the entity shall be shown in visualizations of the simulated environment
diff --git a/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h b/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
index 86df0f58..e80ba01b 100644
--- a/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
+++ b/MantleAPI/include/MantleAPI/Traffic/i_entity_repository.h
@@ -33,8 +33,8 @@ public:
virtual IVehicle& Create(UniqueId id, const std::string& name, const VehicleProperties& properties) = 0;
virtual IPedestrian& Create(const std::string& name, const PedestrianProperties& properties) = 0;
virtual IPedestrian& Create(UniqueId id, const std::string& name, const PedestrianProperties& properties) = 0;
- virtual IStaticObject& Create(const std::string& name, std::unique_ptr<mantle_api::StaticObjectProperties> properties) = 0;
- virtual IStaticObject& Create(UniqueId id, const std::string& name, std::unique_ptr<StaticObjectProperties> properties) = 0;
+ virtual IStaticObject& Create(const std::string& name, const mantle_api::StaticObjectProperties& properties) = 0;
+ virtual IStaticObject& Create(UniqueId id, const std::string& name, const StaticObjectProperties& properties) = 0;
virtual IVehicle& GetHost() = 0;
virtual std::optional<std::reference_wrapper<IEntity>> Get(const std::string& name) = 0;
diff --git a/MantleAPI/test/MantleAPI/Test/test_utils.h b/MantleAPI/test/MantleAPI/Test/test_utils.h
index c11fe9d4..ac245466 100644
--- a/MantleAPI/test/MantleAPI/Test/test_utils.h
+++ b/MantleAPI/test/MantleAPI/Test/test_utils.h
@@ -252,7 +252,7 @@ public:
mantle_api::IStaticObject& Create(mantle_api::UniqueId id,
const std::string& name,
- std::unique_ptr<mantle_api::StaticObjectProperties> properties) override
+ const mantle_api::StaticObjectProperties& properties) override
{
std::ignore = id;
std::ignore = name;
@@ -260,15 +260,10 @@ public:
return test_static_object_;
}
- mantle_api::IStaticObject& Create(const std::string& name,
- std::unique_ptr<mantle_api::StaticObjectProperties> properties) override
- {
- return CreateStaticObjectProxy(name, *properties);
- }
-
MOCK_METHOD(mantle_api::IStaticObject&,
- CreateStaticObjectProxy,
- (const std::string& name, const mantle_api::StaticObjectProperties& properties), ());
+ Create,
+ (const std::string& name, const mantle_api::StaticObjectProperties& properties),
+ ());
std::optional<std::reference_wrapper<IEntity>> Get(const std::string& name) override
{
@@ -310,7 +305,7 @@ class MockEnvironment : public mantle_api::IEnvironment
public:
MOCK_METHOD(void,
CreateMap,
- (const std::string& file_path, const mantle_api::MapDetails* map_details),
+ (const std::string& file_path, const mantle_api::MapDetails& map_details),
(override)
);
--
GitLab