diff options
| author | BSolonenko <BSolonenko@luxoft.com> | 2018-04-25 18:11:29 +0300 |
|---|---|---|
| committer | Elvis Kuliiev <ekuliiev@luxoft.com> | 2018-05-17 18:00:42 +0300 |
| commit | 07ea6e5aadcc4acaedca57f7004e577f2e6379e3 (patch) | |
| tree | 6c73c49961d87c366578c23ef08cd34c2d0763e4 | |
| parent | 1ce9e8a37b5d33f4d92bd658e42fdb9b8fa1cbae (diff) | |
| download | sdl_core-07ea6e5aadcc4acaedca57f7004e577f2e6379e3.tar.gz | |
Fix UTs according to updated logic of mobile projection 2
| -rw-r--r-- | src/components/application_manager/test/state_controller/state_controller_test.cc | 37 |
1 files changed, 23 insertions, 14 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 16181b10b3..2aafc417da 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 @@ -376,22 +376,22 @@ class StateControllerImplTest : public ::testing::Test { result_hmi_state.push_back( createHmiState(HMILevel::HMI_LIMITED, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); result_hmi_state.push_back( createHmiState(HMILevel::HMI_LIMITED, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); result_hmi_state.push_back( createHmiState(HMILevel::HMI_LIMITED, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); result_hmi_state.push_back( createHmiState(HMILevel::HMI_LIMITED, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); break; } @@ -426,22 +426,22 @@ class StateControllerImplTest : public ::testing::Test { result_hmi_state.push_back( createHmiState(HMILevel::HMI_LIMITED, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); result_hmi_state.push_back( createHmiState(HMILevel::HMI_LIMITED, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); result_hmi_state.push_back( createHmiState(HMILevel::HMI_FULL, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); result_hmi_state.push_back( createHmiState(HMILevel::HMI_FULL, AudioStreamingState::NOT_AUDIBLE, - VideoStreamingState::STREAMABLE, + VideoStreamingState::NOT_STREAMABLE, SystemContext::SYSCTXT_MAIN)); break; } @@ -1026,7 +1026,7 @@ class StateControllerImplTest : public ::testing::Test { am::ApplicationSharedPtr app, NiceMock<application_manager_test::MockApplication>* app_mock, am::HmiStatePtr state) { - EXPECT_CALL(*app_mock, RegularHmiState()).WillOnce(Return(state)); + ON_CALL(*app_mock, RegularHmiState()).WillByDefault(Return(state)); EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(app)).Times(0); EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(app->app_id(), _, _)) .Times(0); @@ -1636,6 +1636,11 @@ TEST_F(StateControllerImplTest, LimitedState()); ExpectAppWontChangeHmiStateDueToConflictResolving( app_in_limited, app_in_limited_mock, LimitedState()); + + EXPECT_CALL(*app_in_limited_mock, CurrentHmiState()) + .Times(2) + .WillRepeatedly(Return(LimitedState())); + state_ctrl_->SetRegularState(app_moved_to_limited, LimitedState(), false); } @@ -1859,8 +1864,10 @@ TEST_F(StateControllerImplTest, media_navi_vc_app_ptr_, BackgroundState(), FullAudibleState()); - ExpectAppChangeHmiStateDueToConflictResolving( - media_app_, media_app_ptr_, LimitedState(), BackgroundState()); + + EXPECT_CALL(*media_app_ptr_, RegularHmiState()) + .WillOnce(Return(LimitedState())); + ExpectAppChangeHmiStateDueToConflictResolving( navi_app_, navi_app_ptr_, LimitedState(), BackgroundState()); ExpectAppChangeHmiStateDueToConflictResolving( @@ -1882,8 +1889,10 @@ TEST_F(StateControllerImplTest, media_navi_vc_app_ptr_, BackgroundState(), FullAudibleState()); - ExpectAppChangeHmiStateDueToConflictResolving( - media_app_, media_app_ptr_, LimitedState(), BackgroundState()); + + EXPECT_CALL(*media_app_ptr_, RegularHmiState()) + .WillOnce(Return(LimitedState())); + ExpectAppChangeHmiStateDueToConflictResolving( navi_app_, navi_app_ptr_, LimitedState(), BackgroundState()); ExpectAppChangeHmiStateDueToConflictResolving( @@ -2489,7 +2498,7 @@ TEST_F(StateControllerImplTest, SetRegularStateWithAudioStateAudible) { HmiStatePtr check_state = createHmiState(HMILevel::HMI_BACKGROUND, AudioStreamingState::AUDIBLE, - VideoStreamingState::NOT_STREAMABLE, + VideoStreamingState::STREAMABLE, SystemContext::SYSCTXT_MAIN); EXPECT_CALL(*simple_app_ptr_, RegularHmiState()) .WillRepeatedly(Return(BackgroundState())); |