diff options
author | JackLivio <jack@livio.io> | 2018-06-27 10:50:28 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2018-06-27 10:50:28 -0400 |
commit | de1f0e371bc514464cd3ed343c4cc45e355c16f9 (patch) | |
tree | 69fb4bcdadab46c99876a1c13366165bff37813c /src/components/application_manager/test/state_controller | |
parent | 22d3d2e92cb084d4987e52f148b1328e7a843952 (diff) | |
download | sdl_core-de1f0e371bc514464cd3ed343c4cc45e355c16f9.tar.gz |
Merge Develop
Diffstat (limited to 'src/components/application_manager/test/state_controller')
-rw-r--r-- | src/components/application_manager/test/state_controller/state_controller_test.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc index 4000326849..bbd7220bc9 100644 --- a/src/components/application_manager/test/state_controller/state_controller_test.cc +++ b/src/components/application_manager/test/state_controller/state_controller_test.cc @@ -77,7 +77,7 @@ namespace state_controller_test { namespace constants { const uint32_t kCorrID = 314u; const uint32_t kHMIAppID = 2718u; -} +} // namespace constants struct HmiStatesComparator { mobile_apis::HMILevel::eType hmi_level_; @@ -140,7 +140,8 @@ class StateControllerImplTest : public ::testing::Test { , usage_stat("0", utils::SharedPtr<usage_statistics::StatisticsManager>( new usage_statistics_test::MockStatisticsManager)) - , applications_(application_set_, applications_lock_) + , applications_lock_ptr_(std::make_shared<sync_primitives::Lock>()) + , applications_(application_set_, applications_lock_ptr_) , message_helper_mock_( *application_manager::MockMessageHelper::message_helper_mock()) { Mock::VerifyAndClearExpectations(&message_helper_mock_); @@ -161,7 +162,7 @@ class StateControllerImplTest : public ::testing::Test { NiceMock<event_engine_test::MockEventDispatcher> mock_event_dispatcher_; am::ApplicationSet application_set_; - mutable sync_primitives::Lock applications_lock_; + mutable std::shared_ptr<sync_primitives::Lock> applications_lock_ptr_; DataAccessor<am::ApplicationSet> applications_; utils::SharedPtr<am::StateControllerImpl> state_ctrl_; @@ -1080,8 +1081,8 @@ class StateControllerImplTest : public ::testing::Test { am::ApplicationSharedPtr app, NiceMock<application_manager_test::MockApplication>& app_mock, std::vector<am::HmiState::StateID>& state_ids) { - using smart_objects::SmartObject; using am::event_engine::Event; + using smart_objects::SmartObject; namespace FunctionID = hmi_apis::FunctionID; EXPECT_CALL(app_mock, CurrentHmiState()) @@ -1139,8 +1140,8 @@ class StateControllerImplTest : public ::testing::Test { am::ApplicationSharedPtr app, NiceMock<application_manager_test::MockApplication>& app_mock, std::vector<am::HmiState::StateID>& state_ids) { - using smart_objects::SmartObject; using am::event_engine::Event; + using smart_objects::SmartObject; namespace FunctionID = hmi_apis::FunctionID; EXPECT_CALL(app_mock, CurrentHmiState()) |