diff options
| author | Sho Amano <samano@xevo.com> | 2018-03-27 03:35:24 +0900 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-03-26 14:35:24 -0400 |
| commit | ff693daafdd709693c86ff3c433eacb11c60b74a (patch) | |
| tree | 5f559bbbb0d1bd9fcfdc0f43551771a7dc277e6a /src/components/include/test/application_manager/mock_application_manager.h | |
| parent | 73f3298cf7f0a586475cdd6ab8a5dcca5f1da586 (diff) | |
| download | sdl_core-ff693daafdd709693c86ff3c433eacb11c60b74a.tar.gz | |
Fix/unregister while audio pass thru (#1757)
* fix build error in MockMediaManager
* Add SetMockMediaManager
* add AudioPassThru start/stop tests
* Add new BeginAudioPassThru() and EndAudioPassThru() methods
* fix: don't terminate AudioPassThru when another app is unregistered
* Append DEPRECATED macro only in interface header file and mock file.
* Use @deprecated comments
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 | 6 |
1 files changed, 4 insertions, 2 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 58edcb637a..452a1e6c39 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -161,8 +161,10 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD0(GetNextHMICorrelationID, uint32_t()); MOCK_METHOD0(GenerateNewHMIAppID, uint32_t()); MOCK_METHOD1(EndNaviServices, void(uint32_t app_id)); - MOCK_METHOD0(BeginAudioPassThrough, bool()); - MOCK_METHOD0(EndAudioPassThrough, bool()); + 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()); MOCK_CONST_METHOD0(IsHMICooperating, bool()); |