diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-08-21 09:47:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 09:47:49 -0400 |
commit | 9b34f547fa8d1cc9da8ad1d64ad6996496dc35b5 (patch) | |
tree | a6fe573ef32a5669cf6f1cf1b4ca756f61dbea52 /src/components/include/test/application_manager/mock_application_manager.h | |
parent | 5224964d04b61cefef075ab9edd34c3dfac7886f (diff) | |
parent | 01332dd085a0dcb7ca3acca6f192c534414ea770 (diff) | |
download | sdl_core-9b34f547fa8d1cc9da8ad1d64ad6996496dc35b5.tar.gz |
Merge branch 'develop' into feature/low_voltage
Diffstat (limited to 'src/components/include/test/application_manager/mock_application_manager.h')
-rw-r--r-- | src/components/include/test/application_manager/mock_application_manager.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index 25340d7c2a..4b824d4ac8 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -161,9 +161,7 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD0(GetNextHMICorrelationID, uint32_t()); MOCK_METHOD0(GenerateNewHMIAppID, uint32_t()); MOCK_METHOD1(EndNaviServices, void(uint32_t app_id)); - DEPRECATED MOCK_METHOD0(BeginAudioPassThrough, bool()); MOCK_METHOD1(BeginAudioPassThru, bool(uint32_t app_id)); - DEPRECATED MOCK_METHOD0(EndAudioPassThrough, bool()); MOCK_METHOD1(EndAudioPassThru, bool(uint32_t app_id)); MOCK_METHOD1(ConnectToDevice, void(const std::string& device_mac)); MOCK_METHOD0(OnHMIStartedCooperation, void()); @@ -256,13 +254,6 @@ class MockApplicationManager : public application_manager::ApplicationManager { mobile_apis::AudioStreamingState::eType audio_state, mobile_apis::VideoStreamingState::eType video_state, mobile_apis::SystemContext::eType system_context)); - DEPRECATED MOCK_CONST_METHOD4( - CreateRegularState, - application_manager::HmiStatePtr( - uint32_t app_id, - mobile_apis::HMILevel::eType hmi_level, - mobile_apis::AudioStreamingState::eType audio_state, - mobile_apis::SystemContext::eType system_context)); MOCK_METHOD2(SendAudioPassThroughNotification, void(uint32_t session_key, std::vector<uint8_t>& binary_data)); @@ -278,11 +269,6 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD2(IsSOStructValid, bool(const hmi_apis::StructIdentifiers::eType struct_id, const smart_objects::SmartObject& display_capabilities)); - - DEPRECATED MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints, - bool(const uint32_t)); - DEPRECATED MOCK_METHOD1(SubscribeAppForWayPoints, void(const uint32_t)); - DEPRECATED MOCK_METHOD1(UnsubscribeAppFromWayPoints, void(const uint32_t)); MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints, bool(application_manager::ApplicationSharedPtr)); MOCK_METHOD1(SubscribeAppForWayPoints, |