Skip to content
Snippets Groups Projects
Commit bbfcac9b authored by Andreas Rauschert's avatar Andreas Rauschert
Browse files

Fix after rebase to latest main

parent ddbfde86
No related branches found
No related tags found
No related merge requests found
Pipeline #69690 failed
......@@ -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));
}
......@@ -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"));
......
......@@ -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",
)
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment