diff options
author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-18 15:31:09 +0200 |
---|---|---|
committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-25 16:50:55 +0200 |
commit | efe5b559dc990f7df3ac6feec4c3e7fd75b0082a (patch) | |
tree | 0a556c2d18e04563dc5bf3dc62ba8fa1c6da13ce | |
parent | e9f71861ef6ed20da31f620359dc0b7fe8a1db2b (diff) | |
download | sdl_core-efe5b559dc990f7df3ac6feec4c3e7fd75b0082a.tar.gz |
Buildability correctives after mock renaming
Corrected headers.
Corrected mock names.
Related tasks APPLINK-30588 APPLINK-30974
11 files changed, 39 insertions, 38 deletions
diff --git a/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h b/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h index 98759f83db..6a8979b4c0 100644 --- a/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h +++ b/src/components/application_manager/test/include/application_manager/mock_statistics_manager.h @@ -42,7 +42,10 @@ namespace test { namespace components { namespace application_manager_test { -using namespace ::usage_statistics; +namespace { + using namespace ::usage_statistics; +} + class MockStatisticsManager : public StatisticsManager { public: MOCK_METHOD1(Increment, void(GlobalCounterId type)); diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc index fce79291d3..8d50008226 100644 --- a/src/components/application_manager/test/state_controller/state_controller_test.cc +++ b/src/components/application_manager/test/state_controller/state_controller_test.cc @@ -130,7 +130,6 @@ class StateControllerImplTest : public ::testing::Test { : ::testing::Test() , usage_stat("0", utils::SharedPtr<usage_statistics::StatisticsManager>( - new usage_statistics_test::MockStatisticsManager)) , applications_(application_set_, applications_lock_) {} NiceMock<application_manager_test::MockApplicationManager> app_manager_mock_; diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc index a5ca9fcef5..f1a67f9ba8 100644 --- a/src/components/connection_handler/test/connection_handler_impl_test.cc +++ b/src/components/connection_handler/test/connection_handler_impl_test.cc @@ -448,7 +448,7 @@ TEST_F(ConnectionHandlerTest, SendEndService) { TEST_F(ConnectionHandlerTest, OnFindNewApplicationsRequest) { AddTestDeviceConnection(); AddTestSession(); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -458,7 +458,7 @@ TEST_F(ConnectionHandlerTest, OnFindNewApplicationsRequest) { } TEST_F(ConnectionHandlerTest, OnFindNewApplicationsRequestWithoutObserver) { - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; EXPECT_CALL(mock_connection_handler_observer, OnFindNewApplicationsRequest()) .Times(0); @@ -466,7 +466,7 @@ TEST_F(ConnectionHandlerTest, OnFindNewApplicationsRequestWithoutObserver) { } TEST_F(ConnectionHandlerTest, OnFindNewApplicationsRequestWithoutSession) { - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -480,7 +480,7 @@ TEST_F(ConnectionHandlerTest, OnMalformedMessageCallback) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -506,7 +506,7 @@ TEST_F(ConnectionHandlerTest, OnApplicationFloodCallBack) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -534,7 +534,7 @@ TEST_F(ConnectionHandlerTest, OnApplicationFloodCallBack_SessionFound) { AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -558,7 +558,7 @@ TEST_F(ConnectionHandlerTest, StartDevicesDiscovery) { AddTestDeviceConnection(); AddTestSession(); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -599,7 +599,7 @@ TEST_F(ConnectionHandlerTest, UpdateDeviceList) { // Precondition AddTestDeviceConnection(); AddTestSession(); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -678,7 +678,7 @@ TEST_F(ConnectionHandlerTest, OnDeviceRemoved_ServiceNotStarted) { connection_handler_->OnDeviceAdded(device1); connection_handler_->OnDeviceAdded(device2); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -697,7 +697,7 @@ TEST_F(ConnectionHandlerTest, OnDeviceRemoved_ServiceStarted) { const transport_manager::DeviceInfo device1( device_handle_, mac_address_, device_name_, connection_type_); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -715,7 +715,7 @@ TEST_F(ConnectionHandlerTest, OnConnectionClosed) { AddTestDeviceConnection(); AddTestSession(); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -732,7 +732,7 @@ TEST_F(ConnectionHandlerTest, OnUnexpectedDisconnect) { AddTestDeviceConnection(); AddTestSession(); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -805,7 +805,7 @@ TEST_F(ConnectionHandlerTest, CloseSessionWithCommonReason) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -833,7 +833,7 @@ TEST_F(ConnectionHandlerTest, CloseSessionWithFloodReason) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -861,7 +861,7 @@ TEST_F(ConnectionHandlerTest, CloseSessionWithMalformedMessage) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -892,7 +892,7 @@ TEST_F(ConnectionHandlerTest, CloseConnectionSessionsWithMalformedMessage) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -923,7 +923,7 @@ TEST_F(ConnectionHandlerTest, CloseConnectionSessionsWithCommonReason) { AddTestSession(); AddTestService(kAudio); AddTestService(kMobileNav); - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); @@ -1051,7 +1051,7 @@ TEST_F(ConnectionHandlerTest, SessionStarted_WithRpc) { // Add virtual device and connection AddTestDeviceConnection(); // Expect that rpc service has started - connection_handler_test::ConnectionHandlerObserverMock + connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( &mock_connection_handler_observer); diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h index 790032139a..6ca4557b35 100644 --- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h +++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h @@ -40,7 +40,7 @@ namespace test { namespace components { namespace connection_handler_test { -class ConnectionHandlerObserverMock +class MockConnectionHandlerObserver : public ::connection_handler::ConnectionHandlerObserver { public: MOCK_METHOD1(OnDeviceListUpdated, diff --git a/src/components/include/test/transport_manager/mock_transport_manager_listener.h b/src/components/include/test/transport_manager/mock_transport_manager_listener.h index ebf4ea20c1..dfa2cbc31d 100644 --- a/src/components/include/test/transport_manager/mock_transport_manager_listener.h +++ b/src/components/include/test/transport_manager/mock_transport_manager_listener.h @@ -30,13 +30,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_ -#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_ +#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_ +#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_ + +#include "gmock/gmock.h" -#include <vector> -#include <gmock/gmock.h> #include "transport_manager/transport_manager_listener.h" -#include "protocol/raw_message.h" namespace test { namespace components { @@ -46,7 +45,7 @@ using namespace transport_manager; using ::protocol_handler::RawMessage; using ::protocol_handler::RawMessagePtr; -class TransportManagerListenerMock : public TransportManagerListener { +class MockTransportManagerListener : public TransportManagerListener { public: MOCK_METHOD1(OnDeviceListUpdated, void(const std::vector<DeviceInfo>& device_info)); @@ -88,4 +87,4 @@ class TransportManagerListenerMock : public TransportManagerListener { } // namespace components } // namespace test -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_ +#endif // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_ diff --git a/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h b/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h index 80b2ee3377..d074f90ee5 100644 --- a/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h +++ b/src/components/media_manager/test/include/media_manager/mock_media_adapter_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Ford Motor Company + * Copyright (c) 2015, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#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_ +#ifndef TEST_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_IMPL_MOCK_H_ +#define TEST_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_IMPL_MOCK_H_ #include "gmock/gmock.h" #include "media_manager/media_adapter_impl.h" @@ -60,4 +60,4 @@ class MockMediaAdapterImpl : public ::media_manager::MediaAdapterImpl { } // namespace components } // namespace test -#endif // SRC_COMPONENTS_MEDIA_MANAGER_TEST_INCLUDE_MEDIA_MANAGER_MOCK_MEDIA_ADAPTER_IMPL_H_ +#endif // TEST_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_IMPL_MOCK_H_ diff --git a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h index ebf4ea20c1..df46f5072d 100644 --- a/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h +++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h @@ -46,7 +46,7 @@ using namespace transport_manager; using ::protocol_handler::RawMessage; using ::protocol_handler::RawMessagePtr; -class TransportManagerListenerMock : public TransportManagerListener { +class MockTransportManagerListener : public TransportManagerListener { public: MOCK_METHOD1(OnDeviceListUpdated, void(const std::vector<DeviceInfo>& device_info)); diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h index b63b9e23bc..5dc140928e 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h @@ -42,7 +42,7 @@ namespace transport_manager { using namespace ::transport_manager::transport_adapter; -class TransportAdapterControllerMock : public TransportAdapterController { +class MockTransportAdapterController : public TransportAdapterController { public: MOCK_METHOD1(AddDevice, DeviceSptr(DeviceSptr device)); MOCK_METHOD1(SearchDeviceDone, void(DeviceVector device)); diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc index 5d11cb0df1..dd587569d3 100644 --- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc +++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Ford Motor Company + * Copyright (c) 2015, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index 6711fc70ba..0c59e912ba 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Ford Motor Company + * Copyright (c) 2015, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc index ca5c40a54c..fbafcfad0d 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -79,7 +79,7 @@ class TransportManagerImplTest : public ::testing::Test { "app_info_storage"); tm_.Init(last_state_); mock_adapter_ = new MockTransportAdapter(); - tm_listener_ = MakeShared<TransportManagerListenerMock>(); + tm_listener_ = MakeShared<MockTransportManagerListener>(); #ifdef TELEMETRY_MONITOR tm_.SetTelemetryObserver(&mock_metric_observer_); @@ -319,7 +319,7 @@ class TransportManagerImplTest : public ::testing::Test { #endif // TELEMETRY_MONITOR MockTransportAdapter* mock_adapter_; - utils::SharedPtr<TransportManagerListenerMock> tm_listener_; + utils::SharedPtr<MockTransportManagerListener> tm_listener_; const ApplicationHandle application_id_ = 1; ConnectionUID connection_key_; RawMessagePtr test_message_; |