Skip to content
Snippets Groups Projects
Commit b5def445 authored by Ziqi Zhou's avatar Ziqi Zhou
Browse files

refactor: adapt code

parent 288baad7
No related branches found
No related tags found
1 merge request!247Feat: support road coordinate in time headway condition
Pipeline #74618 passed
...@@ -84,8 +84,8 @@ bool TimeHeadwayCondition::IsSatisfied() const ...@@ -84,8 +84,8 @@ bool TimeHeadwayCondition::IsSatisfied() const
return false; return false;
} }
const auto longitudinal_lane_distance = const auto longitudinal_lane_distance =
mantle.environment->GetQueryService().GetLongitudinalRoadDistanceBetweenPositions(trigger_entity.GetPosition(), mantle.environment->GetQueryService().GetLongitudinalRoadDistanceBetweenPositions(trigger_entity->GetPosition(),
ref_entity.GetPosition()); ref_entity->GetPosition());
if (!longitudinal_lane_distance.has_value()) if (!longitudinal_lane_distance.has_value())
{ {
throw std::runtime_error( throw std::runtime_error(
......
...@@ -104,14 +104,14 @@ TEST_F(TimeHeadwayConditionTestFixture, ...@@ -104,14 +104,14 @@ TEST_F(TimeHeadwayConditionTestFixture,
{ {
condition_values_.coordinateSystem = OpenScenarioEngine::v1_3::CoordinateSystem::kRoad; condition_values_.coordinateSystem = OpenScenarioEngine::v1_3::CoordinateSystem::kRoad;
auto& mocked_query_service = dynamic_cast<const mantle_api::MockQueryService&>(mock_environment_->GetQueryService()); auto& mocked_query_service = dynamic_cast<const mantle_api::MockLaneLocationQueryService&>(fake_environment_->GetQueryService());
EXPECT_CALL(mocked_query_service, GetLongitudinalRoadDistanceBetweenPositions(_, _)) EXPECT_CALL(mocked_query_service, GetLongitudinalRoadDistanceBetweenPositions(_, _))
.Times(1) .Times(1)
.WillRepeatedly(Return(std::nullopt)); .WillRepeatedly(Return(std::nullopt));
auto time_headway_condition = OpenScenarioEngine::v1_3::TimeHeadwayCondition(condition_values_, auto time_headway_condition = OpenScenarioEngine::v1_3::TimeHeadwayCondition(condition_values_,
{mock_environment_}); {fake_environment_});
EXPECT_THROW(time_headway_condition.IsSatisfied(), std::runtime_error); EXPECT_THROW(time_headway_condition.IsSatisfied(), std::runtime_error);
} }
...@@ -312,8 +312,8 @@ TEST_P(TimeHeadwayConditionTestForCoordinateSystemWithFreespaceFalse, ...@@ -312,8 +312,8 @@ TEST_P(TimeHeadwayConditionTestForCoordinateSystemWithFreespaceFalse,
condition_values_.rule = rule; condition_values_.rule = rule;
condition_values_.coordinateSystem = OpenScenarioEngine::v1_3::CoordinateSystem::kRoad; condition_values_.coordinateSystem = OpenScenarioEngine::v1_3::CoordinateSystem::kRoad;
auto& mocked_query_service = dynamic_cast<const mantle_api::MockQueryService&>(mock_environment_->GetQueryService()); auto& mocked_query_service = dynamic_cast<const mantle_api::MockLaneLocationQueryService&>(fake_environment_->GetQueryService());
auto& mocked_entity = dynamic_cast<mantle_api::MockVehicle&>(mock_environment_->GetEntityRepository().Get("").value().get()); auto& mocked_entity = dynamic_cast<mantle_api::MockVehicle&>(*fake_environment_->GetEntityRepository().Get(""));
EXPECT_CALL(mocked_entity, GetVelocity()).WillOnce(Return(triggering_entity_velocity_)); EXPECT_CALL(mocked_entity, GetVelocity()).WillOnce(Return(triggering_entity_velocity_));
...@@ -321,7 +321,7 @@ TEST_P(TimeHeadwayConditionTestForCoordinateSystemWithFreespaceFalse, ...@@ -321,7 +321,7 @@ TEST_P(TimeHeadwayConditionTestForCoordinateSystemWithFreespaceFalse,
.WillOnce(Return(relative_distance_)); .WillOnce(Return(relative_distance_));
auto time_headway_condition = OpenScenarioEngine::v1_3::TimeHeadwayCondition(condition_values_, auto time_headway_condition = OpenScenarioEngine::v1_3::TimeHeadwayCondition(condition_values_,
{mock_environment_}); {fake_environment_});
EXPECT_EQ(time_headway_condition.IsSatisfied(), expected_satisfied_status_); EXPECT_EQ(time_headway_condition.IsSatisfied(), expected_satisfied_status_);
} }
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