diff options
| author | JackLivio <jack@livio.io> | 2017-10-04 10:10:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 10:10:39 -0400 |
| commit | 0ae7df52480d16e6ea93f42d41fc99e3fe330cf9 (patch) | |
| tree | 0b2104fa1d583b3d5f93a9a0e2ab52e1f4e1d661 | |
| parent | 3eb15fc00df9e548bb272f7dc8e70c4ac9c15f02 (diff) | |
| parent | 2b076477a8a9adaceef398f304d1ecae1d938cf4 (diff) | |
| download | sdl_core-0ae7df52480d16e6ea93f42d41fc99e3fe330cf9.tar.gz | |
Merge pull request #1803 from shoamano83/fix/media_manager_test_with_extended_media_mode
fix: media_managet_test fails if EXTENDED_MEDIA_MODE is enabled
| -rw-r--r-- | src/components/media_manager/test/media_manager_impl_test.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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 7d0226fa67..a9dc27d7a3 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -123,10 +123,12 @@ class MediaManagerImplTest : public ::testing::Test { .WillOnce(Return(mock_app_)); EXPECT_CALL(mock_media_manager_settings_, app_storage_folder()) .WillOnce(ReturnRef(kStorageFolder)); +#ifndef EXTENDED_MEDIA_MODE EXPECT_CALL(mock_media_manager_settings_, app_resource_folder()) .WillOnce(ReturnRef(kResourceFolder)); EXPECT_CALL(mock_media_manager_settings_, recording_file_source()) .WillOnce(ReturnRef(kRecordingFileSource)); +#endif } void InitMediaManagerPrecondition(const std::string& server_type) { |