diff options
author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-18 13:08:03 +0200 |
---|---|---|
committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-25 16:50:55 +0200 |
commit | 882e17d8357b98ece4a312c75ba5a9887d68a3e9 (patch) | |
tree | 9188782936ead2bc940108caefa98a2f1ce16f8e /src/components/media_manager | |
parent | 6abc3942b501690cdd23245c5255765950bcd76b (diff) | |
download | sdl_core-882e17d8357b98ece4a312c75ba5a9887d68a3e9.tar.gz |
Rename mock files to correct naming
Files renamed.
Duplicates deleted.
Related tasks APPLINK-30588 APPLINK-30974
Diffstat (limited to 'src/components/media_manager')
-rw-r--r-- | src/components/media_manager/test/include/media_manager/mock_media_adapter.h (renamed from src/components/media_manager/test/include/media_manager/media_adapter_mock.h) | 0 | ||||
-rw-r--r-- | src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h (renamed from src/components/media_manager/test/include/media_manager/media_adapter_impl_mock.h) | 20 | ||||
-rw-r--r-- | src/components/media_manager/test/include/media_manager/mock_media_adapter_listener.h (renamed from src/components/media_manager/test/include/media_manager/media_adapter_listener_mock.h) | 0 | ||||
-rw-r--r-- | src/components/media_manager/test/media_manager_impl_test.cc | 6 |
4 files changed, 9 insertions, 17 deletions
diff --git a/src/components/media_manager/test/include/media_manager/media_adapter_mock.h b/src/components/media_manager/test/include/media_manager/mock_media_adapter.h index e898a982dd..e898a982dd 100644 --- a/src/components/media_manager/test/include/media_manager/media_adapter_mock.h +++ b/src/components/media_manager/test/include/media_manager/mock_media_adapter.h diff --git a/src/components/media_manager/test/include/media_manager/media_adapter_impl_mock.h b/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h index dac01aaa86..80b2ee3377 100644 --- a/src/components/media_manager/test/include/media_manager/media_adapter_impl_mock.h +++ b/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h @@ -1,5 +1,5 @@ /* - * 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 @@ -30,26 +30,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_IMPL_MOCK_H_ -#define SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_IMPL_MOCK_H_ +#ifndef SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MOCK_MEDIA_ADAPTER_IMPL_H_ +#define SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MOCK_MEDIA_ADAPTER_IMPL_H_ -#include <gmock/gmock.h> +#include "gmock/gmock.h" #include "media_manager/media_adapter_impl.h" -#include "media_adapter_listener_mock.h" -#include "media_manager/media_adapter_listener.h" -#include "media_adapter_mock.h" -#include "utils/macro.h" -#include "protocol_handler/protocol_handler.h" namespace test { namespace components { namespace media_manager_test { -/* - * MOCK implementation of ::media_manager::MediaAdapterImpl - */ using namespace media_manager; -typedef utils::SharedPtr<MediaAdapterListener> MediaListenerPtr; + class MockMediaAdapterImpl : public ::media_manager::MediaAdapterImpl { public: MOCK_METHOD1(AddListener, @@ -68,4 +60,4 @@ class MockMediaAdapterImpl : public ::media_manager::MediaAdapterImpl { } // namespace components } // namespace test -#endif // SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_IMPL_MOCK_H_ +#endif // SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MOCK_MEDIA_ADAPTER_IMPL_H_ diff --git a/src/components/media_manager/test/include/media_manager/media_adapter_listener_mock.h b/src/components/media_manager/test/include/media_manager/mock_media_adapter_listener.h index ee60346b69..ee60346b69 100644 --- a/src/components/media_manager/test/include/media_manager/media_adapter_listener_mock.h +++ b/src/components/media_manager/test/include/media_manager/mock_media_adapter_listener.h 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 8db510580c..f9618c7fb8 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -32,9 +32,9 @@ #include "gmock/gmock.h" #include "media_manager/media_manager_impl.h" -#include "media_manager/media_adapter_mock.h" -#include "media_manager/media_adapter_listener_mock.h" -#include "media_manager/media_adapter_impl_mock.h" +#include "media_manager/mock_media_adapter.h" +#include "media_manager/mock_media_adapter_listener.h" +#include "media_manager/mock_media_adapter_impl.h" #include "protocol_handler/mock_protocol_handler.h" #include "media_manager/mock_media_manager_settings.h" #include "application_manager/mock_application_manager.h" |