diff options
| author | Stanislav Kobziev (GitHub) <43001407+SKobziev@users.noreply.github.com> | 2021-05-11 16:43:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 09:43:55 -0400 |
| commit | 353357f5d5c58fa2805bd44f598eb825275740d9 (patch) | |
| tree | 46f8fdaa7d2e9f5a1d96dfa486f76fe2230dc125 | |
| parent | 0cb74bf5a867a71ac760a8bd5c9c2b2af7faccf2 (diff) | |
| download | sdl_core-353357f5d5c58fa2805bd44f598eb825275740d9.tar.gz | |
Remove some unused methods from MediaManager (#2774)
* Deprecated redundant code
* Remove unit tests for deprecated methods
Co-authored-by: Andrii Kalinich <AKalinich@luxoft.com>
3 files changed, 4 insertions, 19 deletions
diff --git a/src/components/include/media_manager/media_manager.h b/src/components/include/media_manager/media_manager.h index 2d2201a949..1ecdb12257 100644 --- a/src/components/include/media_manager/media_manager.h +++ b/src/components/include/media_manager/media_manager.h @@ -42,8 +42,8 @@ namespace media_manager { class MediaManager { public: - virtual void PlayA2DPSource(int32_t application_key) = 0; - virtual void StopA2DPSource(int32_t application_key) = 0; + DEPRECATED virtual void PlayA2DPSource(int32_t application_key) = 0; + DEPRECATED virtual void StopA2DPSource(int32_t application_key) = 0; DEPRECATED virtual void StartMicrophoneRecording( int32_t application_key, diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h index 3e24212ed5..f8e94cbbb2 100644 --- a/src/components/media_manager/include/media_manager/media_manager_impl.h +++ b/src/components/media_manager/include/media_manager/media_manager_impl.h @@ -60,8 +60,8 @@ class MediaManagerImpl : public MediaManager, const MediaManagerSettings& settings); virtual ~MediaManagerImpl(); - virtual void PlayA2DPSource(int32_t application_key); - virtual void StopA2DPSource(int32_t application_key); + DEPRECATED virtual void PlayA2DPSource(int32_t application_key); + DEPRECATED virtual void StopA2DPSource(int32_t application_key); DEPRECATED virtual void StartMicrophoneRecording( int32_t application_key, diff --git a/src/components/media_manager/test/media_manager_impl_test.cc b/src/components/media_manager/test/media_manager_impl_test.cc index ab0a9cf494..8cca2ad995 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -279,21 +279,6 @@ TEST_F(MediaManagerImplTest, Init_Settings_ExpectFileValue) { InitMediaManagerFileServerType(); } -TEST_F(MediaManagerImplTest, PlayA2DPSource_WithCorrectA2DP_SUCCESS) { - // media_adapter_mock_ will be deleted in media_manager_impl (dtor) - MockMediaAdapter* media_adapter_mock = new MockMediaAdapter(); - media_manager_impl_->set_mock_a2dp_player(media_adapter_mock); - EXPECT_CALL(*media_adapter_mock, StartActivity(kApplicationKey)); - media_manager_impl_->PlayA2DPSource(kApplicationKey); -} - -TEST_F(MediaManagerImplTest, StopA2DPSource_WithCorrectA2DP_SUCCESS) { - MockMediaAdapter* media_adapter_mock = new MockMediaAdapter(); - media_manager_impl_->set_mock_a2dp_player(media_adapter_mock); - EXPECT_CALL(*media_adapter_mock, StopActivity(kApplicationKey)); - media_manager_impl_->StopA2DPSource(kApplicationKey); -} - TEST_F(MediaManagerImplTest, StartMicrophoneRecording_SourceFileIsWritable_ExpectTrue) { StartMicrophoneCheckHelper(); |