diff options
Diffstat (limited to 'src/components/application_manager/test/resumption/resume_ctrl_test.cc')
| -rw-r--r-- | src/components/application_manager/test/resumption/resume_ctrl_test.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc index 70bbe4bd96..1a5d070941 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -56,14 +56,14 @@ namespace resumption_test { using ::testing::_; using ::testing::A; -using ::testing::Return; -using ::testing::ReturnRef; +using ::testing::AtLeast; using ::testing::DoAll; -using ::testing::SetArgReferee; +using ::testing::Eq; using ::testing::Mock; using ::testing::NiceMock; -using ::testing::AtLeast; -using ::testing::Eq; +using ::testing::Return; +using ::testing::ReturnRef; +using ::testing::SetArgReferee; using namespace application_manager_test; using namespace resumption; @@ -81,7 +81,8 @@ class ResumeCtrlTest : public ::testing::Test { , kTestGrammarId_(10) , kHash_("saved_hash") , kAppResumingTimeout_(30000u) // miliseconds - , kTestTimeStamp_(1452074434u) {} + , kTestTimeStamp_(1452074434u) + , app_set_lock_ptr_(std::make_shared<sync_primitives::Lock>()) {} virtual void SetUp() OVERRIDE { Mock::VerifyAndClearExpectations(&mock_app_mngr_); @@ -141,7 +142,7 @@ class ResumeCtrlTest : public ::testing::Test { const std::string kHash_; const uint32_t kAppResumingTimeout_; const uint32_t kTestTimeStamp_; - sync_primitives::Lock app_set_lock_; + std::shared_ptr<sync_primitives::Lock> app_set_lock_ptr_; }; /** @@ -660,7 +661,7 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) { /** * @brief group of tests which check correct SetAppHMIState -*/ + */ TEST_F(ResumeCtrlTest, SetAppHMIState_HMINone_WithoutCheckPolicy) { GetInfoFromApp(); @@ -742,7 +743,7 @@ TEST_F(ResumeCtrlTest, SaveAllApplications) { app_set.insert(test_app); DataAccessor<application_manager::ApplicationSet> accessor(app_set, - app_set_lock_); + app_set_lock_ptr_); ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(accessor)); EXPECT_CALL(*mock_storage_, SaveApplication(Eq(test_app))); @@ -756,7 +757,7 @@ TEST_F(ResumeCtrlTest, SaveAllApplications_EmptyApplicationlist) { application_manager::ApplicationSet app_set; DataAccessor<application_manager::ApplicationSet> accessor(app_set, - app_set_lock_); + app_set_lock_ptr_); ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(accessor)); EXPECT_CALL(*mock_storage_, SaveApplication(mock_app)).Times(0); @@ -906,7 +907,7 @@ TEST_F(ResumeCtrlTest, OnSuspend_EmptyApplicationlist) { application_manager::ApplicationSet app_set; DataAccessor<application_manager::ApplicationSet> accessor(app_set, - app_set_lock_); + app_set_lock_ptr_); ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(accessor)); EXPECT_CALL(*mock_storage_, SaveApplication(mock_app)).Times(0); |