From bbfcac9bdc53e3b4472da5a1431d42b5314df13c Mon Sep 17 00:00:00 2001
From: Andreas Rauschert <andreas.rb.rauschert@bmw.de>
Date: Thu, 3 Apr 2025 08:43:39 +0200
Subject: [PATCH] Fix after rebase to latest main
---
.../ConvertScenarioLaneOffsetTargetTest.cpp | 14 +++++++-------
.../MotionControlAction/LaneOffsetActionTest.cpp | 8 ++++----
engine/third_party/mantle_api/mantle_api.bzl | 2 +-
utils/ci/conan/recipe/mantleapi/all/conandata.yml | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/engine/tests/Conversion/OscToMantle/ConvertScenarioLaneOffsetTargetTest.cpp b/engine/tests/Conversion/OscToMantle/ConvertScenarioLaneOffsetTargetTest.cpp
index 539d0ae3..ba078330 100644
--- a/engine/tests/Conversion/OscToMantle/ConvertScenarioLaneOffsetTargetTest.cpp
+++ b/engine/tests/Conversion/OscToMantle/ConvertScenarioLaneOffsetTargetTest.cpp
@@ -8,7 +8,6 @@
********************************************************************************/
#include <MantleAPI/Common/orientation.h>
#include <MantleAPI/Common/vector.h>
-#include <MantleAPI/Test/test_utils.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <openScenarioLib/generated/v1_3/api/ApiClassInterfacesV1_3.h>
@@ -17,6 +16,7 @@
#include <stdexcept>
#include "Conversion/OscToMantle/ConvertScenarioLaneOffsetTarget.h"
+#include "TestUtils.h"
#include "gmock/gmock.h"
using OpenScenarioEngine::v1_3::ConvertScenarioLaneOffsetTarget;
@@ -61,17 +61,17 @@ class LaneOffsetTargetTest : public ::testing::Test
{
protected:
std::shared_ptr<NiceMock<MockLaneOffsetTarget>> mock_lane_offset_target_{nullptr};
- std::shared_ptr<NiceMock<mantle_api::MockEnvironment>> mock_environment_{nullptr};
+ std::shared_ptr<NiceMock<testing::OpenScenarioEngine::v1_3::FakeEnvironment>> fake_environment_{nullptr};
void SetUp() override
{
mock_lane_offset_target_ = std::make_shared<NiceMock<MockLaneOffsetTarget>>();
- mock_environment_ = std::make_shared<NiceMock<mantle_api::MockEnvironment>>();
+ fake_environment_ = std::make_shared<NiceMock<testing::OpenScenarioEngine::v1_3::FakeEnvironment>>();
}
};
TEST_F(LaneOffsetTargetTest, GivenOscNoTargetOffsets_WhenConvert_ThenThrowError)
{
- EXPECT_THROW(ConvertScenarioLaneOffsetTarget(mock_environment_, mock_lane_offset_target_, "vehicle1"), std::runtime_error);
+ EXPECT_THROW(ConvertScenarioLaneOffsetTarget(fake_environment_, mock_lane_offset_target_, "vehicle1"), std::runtime_error);
}
TEST_F(LaneOffsetTargetTest, GivenOscAbsoluteLaneOffsetTarget_WhenConvert_ThenConvertedToAbsoluteLaneOffset)
@@ -83,7 +83,7 @@ TEST_F(LaneOffsetTargetTest, GivenOscAbsoluteLaneOffsetTarget_WhenConvert_ThenCo
ON_CALL(*absolute_target_offset, IsSetValue()).WillByDefault(Return(true));
ON_CALL(*absolute_target_offset, GetValue()).WillByDefault(Return(expected_offset.value()));
- EXPECT_THAT(ConvertScenarioLaneOffsetTarget(mock_environment_, mock_lane_offset_target_, "vehicle1"), Eq(expected_offset));
+ EXPECT_THAT(ConvertScenarioLaneOffsetTarget(fake_environment_, mock_lane_offset_target_, "vehicle1"), Eq(expected_offset));
}
TEST_F(LaneOffsetTargetTest, GivenOscAbsoluteLaneOffsetTargetButNoValue_WhenConvert_ThenThrowError)
@@ -91,7 +91,7 @@ TEST_F(LaneOffsetTargetTest, GivenOscAbsoluteLaneOffsetTargetButNoValue_WhenConv
auto absolute_target_offset_with_no_value = std::make_shared<NiceMock<MockAbsoluteTargetLaneOffset>>();
ON_CALL(*mock_lane_offset_target_, IsSetAbsoluteTargetLaneOffset()).WillByDefault(Return(true));
ON_CALL(*mock_lane_offset_target_, GetAbsoluteTargetLaneOffset()).WillByDefault(Return(absolute_target_offset_with_no_value));
- EXPECT_THROW(ConvertScenarioLaneOffsetTarget(mock_environment_, mock_lane_offset_target_, "vehicle1"), std::runtime_error);
+ EXPECT_THROW(ConvertScenarioLaneOffsetTarget(fake_environment_, mock_lane_offset_target_, "vehicle1"), std::runtime_error);
}
TEST_F(LaneOffsetTargetTest, GivenOscRelativeLaneOffsetTarget_WhenConvert_ThenThrowError)
@@ -101,5 +101,5 @@ TEST_F(LaneOffsetTargetTest, GivenOscRelativeLaneOffsetTarget_WhenConvert_ThenTh
ON_CALL(*mock_lane_offset_target_, IsSetRelativeTargetLaneOffset()).WillByDefault(Return(true));
ON_CALL(*mock_lane_offset_target_, GetRelativeTargetLaneOffset()).WillByDefault(Return(relative_target_offset));
- EXPECT_THAT(ConvertScenarioLaneOffsetTarget(mock_environment_, mock_lane_offset_target_, "vehicle1"), Eq(0.0_m));
+ EXPECT_THAT(ConvertScenarioLaneOffsetTarget(fake_environment_, mock_lane_offset_target_, "vehicle1"), Eq(0.0_m));
}
diff --git a/engine/tests/Storyboard/MotionControlAction/LaneOffsetActionTest.cpp b/engine/tests/Storyboard/MotionControlAction/LaneOffsetActionTest.cpp
index d9d96b68..685b8657 100644
--- a/engine/tests/Storyboard/MotionControlAction/LaneOffsetActionTest.cpp
+++ b/engine/tests/Storyboard/MotionControlAction/LaneOffsetActionTest.cpp
@@ -10,15 +10,15 @@
#include <gtest/gtest.h>
-#include "builders/ActionBuilder.h"
-#include "gmock/gmock.h"
+#include "Storyboard/MotionControlAction/LaneOffsetAction.h"
#include "Storyboard/MotionControlAction/LaneOffsetAction_impl.h"
#include "TestUtils.h"
+#include "builders/ActionBuilder.h"
+#include "gmock/gmock.h"
using namespace mantle_api;
using namespace units::literals;
-
using namespace mantle_api;
using testing::_;
using testing::Eq;
@@ -79,7 +79,7 @@ TEST_F(LaneOffsetActionTestFixture, GivenLaneOffsetActionControlStrategyElements
EXPECT_THAT(control_strategy->continuous, Eq(continuous));
EXPECT_THAT(laneOffsetAction.GetMovementDomain(), Eq(mantle_api::MovementDomain::kLateral));
- EXPECT_CALL(*mockEnvironment,
+ EXPECT_CALL(*fake_environment,
HasControlStrategyGoalBeenReached(testing::_, testing::_))
.WillOnce(Return(false));
EXPECT_FALSE(laneOffsetAction.HasControlStrategyGoalBeenReached("Ego"));
diff --git a/engine/third_party/mantle_api/mantle_api.bzl b/engine/third_party/mantle_api/mantle_api.bzl
index c24fab67..d7bb1b4d 100644
--- a/engine/third_party/mantle_api/mantle_api.bzl
+++ b/engine/third_party/mantle_api/mantle_api.bzl
@@ -8,7 +8,7 @@ def mantle_api():
http_archive,
name = "mantle_api",
url = "https://gitlab.eclipse.org/eclipse/openpass/mantle-api/-/archive/{tag}/mantle-api-{tag}.tar.gz".format(tag = _TAG),
- sha256 = "a41a7ac96e78d3f4065e7c0a70196a6ebbb7d5777a818bef63ac5a8a36743faf",
+ sha256 = "5005694180588408f37c7d4ffe6e7900d70370635fc7cc322680dbd34c9333c0",
strip_prefix = "mantle-api-{tag}".format(tag = _TAG),
type = "tar.gz",
)
diff --git a/utils/ci/conan/recipe/mantleapi/all/conandata.yml b/utils/ci/conan/recipe/mantleapi/all/conandata.yml
index d9e28c2b..9dc40e90 100644
--- a/utils/ci/conan/recipe/mantleapi/all/conandata.yml
+++ b/utils/ci/conan/recipe/mantleapi/all/conandata.yml
@@ -59,7 +59,7 @@ sources:
"integration_preview_v9":
url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git
- sha256: "734d2fc7e1db4b44b873fd79a8f976150393aa7f"
+ sha256: "09d9fb46bc1fb27fdb2530410a41785c38a82dca"
"default":
url: https://gitlab.eclipse.org/eclipse/openpass/mantle-api.git
--
GitLab