diff options
| author | Alexander Kutsan <AKutsan@luxoft.com> | 2015-03-03 18:51:10 +0200 |
|---|---|---|
| committer | Aleksandr Galiuzov <AGaliuzov@luxoft.com> | 2015-04-15 14:12:50 +0300 |
| commit | 7d947f4424d5470a8a4c8bdc9717859e6aea140f (patch) | |
| tree | 5f14c3bc7ed01eeeb92e6ed91f6577ae80256e9a /src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h | |
| parent | 037abef1e1aae30661d94af4173a28acae4f0ea8 (diff) | |
| download | sdl_core-7d947f4424d5470a8a4c8bdc9717859e6aea140f.tar.gz | |
APPLINK-11447 Remove set_audio_streaming_state from AM
Move ActivateAppLogic to State Ctrl
Conflicts:
src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc
src/components/application_manager/src/policies/policy_handler.cc
Diffstat (limited to 'src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h')
| -rw-r--r-- | src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h index 5ab5e8c6ba..949dc58534 100644 --- a/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/test/mock/include/application_manager/application_manager_impl.h @@ -255,8 +255,19 @@ class ApplicationManagerImpl : public ApplicationManager, MOCK_METHOD0(StartDevicesDiscovery, void()); MOCK_METHOD2(SendAudioPassThroughNotification, void(uint32_t, std::vector<uint8_t>&)); MOCK_METHOD1(set_all_apps_allowed, void(const bool)); + template<bool SendActivateApp> + MOCK_METHOD2(SetState, void(uint32_t, HmiState)); + template<bool SendActivateApp> + MOCK_METHOD2(SetState, void(uint32_t, mobile_api::HMILevel::eType)); + template<bool SendActivateApp> MOCK_METHOD3(SetState, void(uint32_t, mobile_api::HMILevel::eType, mobile_apis::AudioStreamingState::eType)); + template<bool SendActivateApp> + MOCK_METHOD4(SetState, void(uint32_t, mobile_api::HMILevel::eType, + mobile_apis::AudioStreamingState::eType, + mobile_apis::SystemContext::eType)); + MOCK_METHOD2(SetState, void(uint32_t, + mobile_apis::AudioStreamingState::eType)); MOCK_CONST_METHOD0(all_apps_allowed, bool()); MOCK_METHOD1(set_vr_session_started, void(const bool)); @@ -271,8 +282,6 @@ class ApplicationManagerImpl : public ApplicationManager, MOCK_METHOD0(CreatePhoneCallAppList, void()); MOCK_METHOD0(ResetPhoneCallAppList, void()); MOCK_METHOD2(ChangeAppsHMILevel, void(uint32_t, mobile_apis::HMILevel::eType)); - MOCK_METHOD1(MakeAppNotAudible, void(uint32_t app_id)); - MOCK_METHOD1(MakeAppFullScreen, bool(uint32_t app_id)); MOCK_METHOD1(AddAppToTTSGlobalPropertiesList, void(const uint32_t)); MOCK_METHOD1(RemoveAppFromTTSGlobalPropertiesList, void(const uint32_t)); MOCK_METHOD1(application_by_hmi_app, ApplicationSharedPtr(uint32_t)); |