diff options
Diffstat (limited to 'src/components/application_manager/test/application_state_test.cc')
| -rw-r--r-- | src/components/application_manager/test/application_state_test.cc | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/src/components/application_manager/test/application_state_test.cc b/src/components/application_manager/test/application_state_test.cc index 33f23022f0..a0bfa2890f 100644 --- a/src/components/application_manager/test/application_state_test.cc +++ b/src/components/application_manager/test/application_state_test.cc @@ -41,8 +41,6 @@ #include "application_manager/state_controller.h" #include "application_manager/resumption/resume_ctrl.h" -#include "utils/make_shared.h" - namespace test { namespace components { namespace application_manager_test { @@ -58,7 +56,7 @@ std::vector<StateID> GenerateCurrentStates() { states.push_back(StateID::STATE_ID_SAFETY_MODE); states.push_back(StateID::STATE_ID_VR_SESSION); states.push_back(StateID::STATE_ID_TTS_SESSION); - states.push_back(StateID::STATE_ID_NAVI_STREAMING); + states.push_back(StateID::STATE_ID_VIDEO_STREAMING); states.push_back(StateID::STATE_ID_DEACTIVATE_HMI); return states; } @@ -75,7 +73,7 @@ class ApplicationStateTest : public ::testing::Test { ApplicationState app_state; const StateID current_id = StateID::STATE_ID_CURRENT; const StateID postponed_id = StateID::STATE_ID_POSTPONED; - utils::SharedPtr<MockApplication> mock_app_; + std::shared_ptr<MockApplication> mock_app_; MockApplicationManager app_mngr_; }; @@ -85,8 +83,8 @@ std::vector<StateID> ApplicationStateTest::added_states_ = TEST_F(ApplicationStateTest, AddStates_GetCurrentStates) { std::vector<StateID>::iterator new_state = added_states_.begin(); for (; new_state != added_states_.end(); ++new_state) { - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); app_state.AddState(state); @@ -97,8 +95,8 @@ TEST_F(ApplicationStateTest, AddStates_GetCurrentStates) { TEST_F(ApplicationStateTest, AddStates_RemoveStates_GetCurrentState) { std::vector<StateID>::iterator new_state = added_states_.begin(); for (; new_state != added_states_.end(); ++new_state) { - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); app_state.AddState(state); @@ -120,18 +118,18 @@ TEST_F(ApplicationStateTest, AddStatesAddPostponedState_GetPostponedState) { // Added some states std::vector<StateID>::iterator new_state = added_states_.begin(); for (; new_state != added_states_.end(); ++new_state) { - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); app_state.AddState(state); } // Postponed state wasn't added HmiStatePtr get_postponed_id = app_state.GetState(postponed_id); - EXPECT_EQ(NULL, get_postponed_id); + EXPECT_EQ(nullptr, get_postponed_id); // Add posponed state - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, postponed_id); app_state.AddState(state); @@ -143,8 +141,8 @@ TEST_F(ApplicationStateTest, AddStatesAddPostponedState_GetPostponedState) { TEST_F(ApplicationStateTest, AddStates_GetRegularState) { // Add state std::vector<StateID>::iterator new_state = added_states_.begin(); - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); state->set_hmi_level(HMILevel::HMI_FULL); @@ -152,8 +150,8 @@ TEST_F(ApplicationStateTest, AddStates_GetRegularState) { ++new_state; // Add some other for (; new_state != added_states_.end(); ++new_state) { - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); app_state.AddState(state); @@ -169,16 +167,16 @@ TEST_F(ApplicationStateTest, AddStates_GetRegularState) { TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) { std::vector<StateID>::iterator new_state = added_states_.begin(); - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); app_state.AddState(state); ++new_state; // Add postponed state - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, postponed_id); app_state.AddState(state); @@ -188,8 +186,8 @@ TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) { ASSERT_EQ(state, post_state); for (; new_state != added_states_.end(); ++new_state) { - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, *new_state); app_state.AddState(state); @@ -211,30 +209,30 @@ TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) { TEST_F(ApplicationStateTest, AddRegularState_PreviousStatePostponed) { // Add some state StateID first_state = StateID::STATE_ID_PHONE_CALL; - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, first_state); app_state.AddState(state); // Add postponed state - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, postponed_id); app_state.AddState(state); // Add new postponed state - utils::SharedPtr<MockApplication> mock_app_2(new MockApplication); - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + std::shared_ptr<MockApplication> mock_app_2(new MockApplication); + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, postponed_id); app_state.AddState(state); // Add regular state - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, StateID::STATE_ID_REGULAR); app_state.AddState(state); @@ -250,8 +248,8 @@ TEST_F(ApplicationStateTest, AddRegularState_PreviousStatePostponed) { TEST_F(ApplicationStateTest, InitState_GetRegularState) { StateID init_state = StateID::STATE_ID_REGULAR; - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, init_state); @@ -267,8 +265,8 @@ TEST_F(ApplicationStateTest, InitState_GetRegularState) { TEST_F(ApplicationStateTest, AddPosponedState_DeletePosponedState) { // Precondition StateID init_state = StateID::STATE_ID_REGULAR; - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, init_state); state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL); @@ -276,8 +274,8 @@ TEST_F(ApplicationStateTest, AddPosponedState_DeletePosponedState) { app_state.InitState(state); // Add postponed state - state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, postponed_id); app_state.AddState(state); @@ -290,14 +288,14 @@ TEST_F(ApplicationStateTest, AddPosponedState_DeletePosponedState) { app_state.RemoveState(postponed_id); get_postponed_state = app_state.GetState(postponed_id); - EXPECT_EQ(NULL, get_postponed_state); + EXPECT_EQ(nullptr, get_postponed_state); } TEST_F(ApplicationStateTest, AddRegularState_RemoveRegularState_RegularStateNotDeleted) { StateID reg_state = StateID::STATE_ID_REGULAR; - HmiStatePtr state = utils::MakeShared<HmiState>( - static_cast<utils::SharedPtr<Application> >(mock_app_), + HmiStatePtr state = std::make_shared<HmiState>( + static_cast<std::shared_ptr<Application> >(mock_app_), app_mngr_, reg_state); app_state.InitState(state); |