MediaManager tests correctives

5 files changed, 95 insertions, 54 deletions

diff --git a/src/components/media_manager/test/CMakeLists.txt b/src/components/media_manager/test/CMakeLists.txt
index 837fd4a361..0794b0f9ef 100644
--- a/src/components/media_manager/test/CMakeLists.txt
+++ b/src/components/media_manager/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Ford Motor Company
+# Copyright (c) 2016, Ford Motor Company
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,10 @@ if(BUILD_TESTS)
 include_directories(
     ${GMOCK_INCLUDE_DIRECTORY}
     ${COMPONENTS_DIR}/media_manager/include
-    ${COMPONENTS_DIR}/include/
+    ${COMPONENTS_DIR}/protocol_handler/include
+    ${COMPONENTS_DIR}/application_manager/test/include
+    ${COMPONENTS_DIR}/resumption/include
+
 )
 
 if(EXTENDED_MEDIA_MODE)
@@ -48,8 +51,9 @@ set(SOURCES
 )
 
 set(LIBRARIES
+    SmartObjects
     MediaManager
-    ApplicationManager
+    ApplicationManagerTest
     MessageHelper
     ProtocolHandler
     gmock
diff --git a/src/components/media_manager/test/include/media_adapter_impl_mock.h b/src/components/media_manager/test/include/media_adapter_impl_mock.h
index 02907c1217..7a820cf566 100644
--- a/src/components/media_manager/test/include/media_adapter_impl_mock.h
+++ b/src/components/media_manager/test/include/media_adapter_impl_mock.h
@@ -50,7 +50,7 @@ namespace media_manager_test {
  */
 using namespace media_manager;
 typedef utils::SharedPtr<MediaAdapterListener> MediaListenerPtr;
-class MediaAdapterImplMock : public ::media_manager::MediaAdapterImpl {
+class MockMediaAdapterImpl : public ::media_manager::MediaAdapterImpl {
  public:
   MOCK_METHOD1(AddListener,
         void(const utils::SharedPtr<MediaAdapterListener>&));
diff --git a/src/components/media_manager/test/include/media_adapter_listener_mock.h b/src/components/media_manager/test/include/media_adapter_listener_mock.h
index 0aae8fc068..8a29b3b3e7 100644
--- a/src/components/media_manager/test/include/media_adapter_listener_mock.h
+++ b/src/components/media_manager/test/include/media_adapter_listener_mock.h
@@ -43,7 +43,7 @@ namespace media_manager_test {
 /*
  * MOCK implementation of ::media_manager::MediaAdapterListener
  */
-class MediaAdapterListenerMock : public ::media_manager::MediaAdapterListener {
+class MockMediaAdapterListener : public ::media_manager::MediaAdapterListener {
  public:
   MOCK_METHOD2(OnDataReceived,
       void(int32_t application_key,
diff --git a/src/components/media_manager/test/include/media_adapter_mock.h b/src/components/media_manager/test/include/media_adapter_mock.h
index a7c2ef7c51..14782cdb1a 100644
--- a/src/components/media_manager/test/include/media_adapter_mock.h
+++ b/src/components/media_manager/test/include/media_adapter_mock.h
@@ -35,6 +35,7 @@
 
 #include <gmock/gmock.h>
 #include "media_manager/media_manager.h"
+#include "media_manager/media_adapter.h"
 
 namespace test {
 namespace components {
@@ -43,7 +44,7 @@ namespace media_manager_test {
 /*
  * MOCK implementation of ::media_manager::MediaAdapter
  */
-class MediaAdapterMock : public ::media_manager::MediaAdapter {
+class MockMediaAdapter : public ::media_manager::MediaAdapter {
  public:
   MOCK_METHOD2(SendData,
       void(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 4c63640fee..ebc1c0659b 100644
--- a/src/components/media_manager/test/media_manager_impl_test.cc
+++ b/src/components/media_manager/test/media_manager_impl_test.cc
@@ -36,88 +36,124 @@
 #include "include/media_adapter_listener_mock.h"
 #include "include/media_adapter_impl_mock.h"
 #include "protocol_handler/mock_protocol_handler.h"
+#include "media_manager/mock_media_manager_settings.h"
+#include "application_manager/mock_application_manager.h"
+#include "utils/shared_ptr.h"
+#include "utils/make_shared.h"
 
 namespace test {
 namespace components {
 namespace media_manager_test {
 
 using ::testing::_;
+using ::testing::ReturnRef;
 using protocol_handler::ServiceType;
 
-TEST(MediaManagerImplTest, PlayA2DPSource) {
-  MediaManagerImpl* mediaManagerImpl = MediaManagerImpl::instance();
-  EXPECT_TRUE(mediaManagerImpl->exists());
+class MediaManagerImplTest : public ::testing::Test {
+ protected:
+  const ::testing::NiceMock<MockMediaManagerSettings>
+      mock_media_manager_settings_;
+  const std::string kDefaultValue_ = "";
+};
+
+TEST_F(MediaManagerImplTest, PlayA2DPSource) {
+     MockMediaAdapter* media_mock_ = new MockMediaAdapter();
+
+  application_manager_test::MockApplicationManager mock_application_manager;
+
+  ON_CALL(mock_media_manager_settings_,video_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+  ON_CALL(mock_media_manager_settings_,audio_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+  MediaManagerImpl mediaManagerImpl(mock_application_manager, mock_media_manager_settings_);
   int32_t application_key = 1;
 
-  MediaAdapterMock media_mock;
-  mediaManagerImpl->set_mock_a2dp_player(&media_mock);
-  EXPECT_CALL(media_mock, StartActivity(application_key));
-  mediaManagerImpl->PlayA2DPSource(application_key);
+
+  mediaManagerImpl.set_mock_a2dp_player(media_mock_);
+  EXPECT_CALL(*media_mock_, StartActivity(application_key));
+  mediaManagerImpl.PlayA2DPSource(application_key);
 }
 
-TEST(MediaManagerImplTest, StopA2DPSource) {
-  MediaManagerImpl* mediaManagerImpl = MediaManagerImpl::instance();
-  EXPECT_TRUE(mediaManagerImpl->exists());
+TEST_F(MediaManagerImplTest, StopA2DPSource) {
+    MockMediaAdapter* media_mock_ = new MockMediaAdapter();
+  application_manager_test::MockApplicationManager mock_application_manager;
+
+  ON_CALL(mock_media_manager_settings_, video_server_type())
+      .WillByDefault(ReturnRef(kDefaultValue_));
+  ON_CALL(mock_media_manager_settings_, audio_server_type())
+      .WillByDefault(ReturnRef(kDefaultValue_));
+  MediaManagerImpl mediaManagerImpl(mock_application_manager,
+                                    mock_media_manager_settings_);
   int32_t application_key = 1;
 
-  MediaAdapterMock media_mock;
-  mediaManagerImpl->set_mock_a2dp_player(&media_mock);
-  EXPECT_CALL(media_mock, StopActivity(application_key));
-  mediaManagerImpl->StopA2DPSource(application_key);
+
+  mediaManagerImpl.set_mock_a2dp_player(media_mock_);
+  EXPECT_CALL(*media_mock_, StopActivity(application_key));
+  mediaManagerImpl.StopA2DPSource(application_key);
 }
 
-TEST(MediaManagerImplTest, StopMicrophoneRecording) {
-  MediaManagerImpl* mediaManagerImpl = MediaManagerImpl::instance();
+TEST_F(MediaManagerImplTest, StopMicrophoneRecording) {
+
+MockMediaAdapterListener* media_adapter_listener_mock_ = new MockMediaAdapterListener();
+    application_manager_test::MockApplicationManager mock_application_manager;
+
+    ON_CALL(mock_media_manager_settings_,video_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+    ON_CALL(mock_media_manager_settings_,audio_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+    MediaManagerImpl mediaManagerImpl(mock_application_manager, mock_media_manager_settings_);
   int32_t application_key = 1;
-  MediaAdapterListenerMock media_adapter_listener_mock;
 
-  mediaManagerImpl->set_mock_mic_listener(&media_adapter_listener_mock);
+  mediaManagerImpl.set_mock_mic_listener(media_adapter_listener_mock_);
 #ifdef EXTENDED_MEDIA_MODE
-  MediaAdapterImplMock media_adapter_recorder_mock;
-  mediaManagerImpl->set_mock_mic_recorder(&media_adapter_recorder_mock);
-  EXPECT_CALL(media_adapter_recorder_mock, StopActivity(application_key));
-#endif  // EXTENDED_MEDIA_MODE
-  EXPECT_CALL(media_adapter_listener_mock, OnActivityEnded(application_key));
+  MockMediaAdapterImpl* media_adapter_recorder_mock = new MockMediaAdapterImpl();
+  mediaManagerImpl.set_mock_mic_recorder(media_adapter_recorder_mock);
+  EXPECT_CALL(*media_adapter_recorder_mock,StopActivity(application_key));
+#endif // EXTENDED_MEDIA_MODE
+  EXPECT_CALL(*media_adapter_listener_mock_, OnActivityEnded(application_key));
 #ifdef EXTENDED_MEDIA_MODE
-  EXPECT_CALL(media_adapter_recorder_mock, RemoveListener(_));
-#endif  // EXTENDED_MEDIA_MODE
-  mediaManagerImpl->StopMicrophoneRecording(application_key);
+  EXPECT_CALL(*media_adapter_recorder_mock,RemoveListener(_));
+#endif // EXTENDED_MEDIA_MODE
+  mediaManagerImpl.StopMicrophoneRecording(application_key);
 }
 
-TEST(MediaManagerImplTest, StartStopStreaming) {
-  MediaManagerImpl* mediaManagerImpl = MediaManagerImpl::instance();
+TEST_F(MediaManagerImplTest, StartStopStreaming) {
+
+
+    application_manager_test::MockApplicationManager mock_application_manager;
+
+    ON_CALL(mock_media_manager_settings_,video_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+    ON_CALL(mock_media_manager_settings_,audio_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+    MediaManagerImpl mediaManagerImpl(mock_application_manager, mock_media_manager_settings_);
 
   int32_t application_key = 1;
-  MediaAdapterImplMock mock_audio_media_streamer;
-  mediaManagerImpl->set_mock_streamer(ServiceType::kAudio,
-                                      &mock_audio_media_streamer);
-  MediaAdapterImplMock mock_nav_media_streamer;
-  mediaManagerImpl->set_mock_streamer(ServiceType::kMobileNav,
-                                      &mock_nav_media_streamer);
+  MockMediaAdapterImpl* mock_audio_media_streamer = new MockMediaAdapterImpl();
+  mediaManagerImpl.set_mock_streamer(protocol_handler::ServiceType::kAudio, mock_audio_media_streamer);
+  MockMediaAdapterImpl* mock_nav_media_streamer = new MockMediaAdapterImpl();
+  mediaManagerImpl.set_mock_streamer(protocol_handler::ServiceType::kMobileNav, mock_nav_media_streamer);
 
-  EXPECT_CALL(mock_audio_media_streamer, StartActivity(application_key));
-  mediaManagerImpl->StartStreaming(application_key, ServiceType::kAudio);
+  EXPECT_CALL(*mock_audio_media_streamer, StartActivity(application_key));
+  mediaManagerImpl.StartStreaming(application_key, protocol_handler::ServiceType::kAudio);
 
-  EXPECT_CALL(mock_nav_media_streamer, StartActivity(application_key));
-  mediaManagerImpl->StartStreaming(application_key, ServiceType::kMobileNav);
+  EXPECT_CALL(*mock_nav_media_streamer, StartActivity(application_key));
+  mediaManagerImpl.StartStreaming(application_key, protocol_handler::ServiceType::kMobileNav);
 
-  EXPECT_CALL(mock_audio_media_streamer, StopActivity(application_key));
-  mediaManagerImpl->StopStreaming(application_key, ServiceType::kAudio);
+  EXPECT_CALL(*mock_audio_media_streamer, StopActivity(application_key));
+  mediaManagerImpl.StopStreaming(application_key, protocol_handler::ServiceType::kAudio);
 
-  EXPECT_CALL(mock_nav_media_streamer, StopActivity(application_key));
-  mediaManagerImpl->StopStreaming(application_key, ServiceType::kMobileNav);
+  EXPECT_CALL(*mock_nav_media_streamer, StopActivity(application_key));
+  mediaManagerImpl.StopStreaming(application_key, protocol_handler::ServiceType::kMobileNav);
 }
 
-TEST(MediaManagerImplTest, CheckFramesProcessed) {
-  MediaManagerImpl* mediaManagerImpl = MediaManagerImpl::instance();
+TEST_F(MediaManagerImplTest, CheckFramesProcessed) {
+  application_manager_test::MockApplicationManager mock_application_manager;
+
+  ON_CALL(mock_media_manager_settings_,video_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+  ON_CALL(mock_media_manager_settings_,audio_server_type()).WillByDefault(ReturnRef(kDefaultValue_));
+  MediaManagerImpl mediaManagerImpl(mock_application_manager, mock_media_manager_settings_);
   protocol_handler_test::MockProtocolHandler mock_protocol_handler;
-  mediaManagerImpl->SetProtocolHandler(&mock_protocol_handler);
+  mediaManagerImpl.SetProtocolHandler(&mock_protocol_handler);
   int32_t application_key = 1;
   int32_t frame_number = 10;
 
-  EXPECT_CALL(mock_protocol_handler,
-              SendFramesNumber(application_key, frame_number));
-  mediaManagerImpl->FramesProcessed(application_key, frame_number);
+  EXPECT_CALL(mock_protocol_handler, SendFramesNumber(application_key, frame_number));
+  mediaManagerImpl.FramesProcessed(application_key, frame_number);
 }
 
 }  // namespace media_manager_test