diff options
author | Andrey Oleynik (GitHub) <aoleynik@luxoft.com> | 2017-10-27 16:19:31 +0300 |
---|---|---|
committer | Andriy Byzhynar <AByzhynar@luxoft.com> | 2018-01-18 12:03:51 +0200 |
commit | f02cbd971c5a5f839aecf4ec894aeea61543e42b (patch) | |
tree | 0dbd1e6184b0049c39277f3a4e12fd669179e4f2 | |
parent | 02fd128d2790f68b1c8acb6e2115e6984ccc0c8b (diff) | |
download | sdl_core-f02cbd971c5a5f839aecf4ec894aeea61543e42b.tar.gz |
Renames interfaces for consistency
13 files changed, 21 insertions, 21 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index 3402bb7c5c..a1adc6de5a 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -875,12 +875,12 @@ class ApplicationManagerImpl void OnDeviceSwitchingStart(const std::string& device_uid) FINAL; /** - * @brief OnDeviceSwitchFinish is invoked on device trasport switching end + * @brief OnDeviceSwitchingFinish is invoked on device trasport switching end * i.e. timeout for switching is expired, unregisters applications from * waiting list which haven't been re-registered and clears the waiting list * @param device_uid UID of device being switched */ - void OnDeviceSwitchFinish(const std::string& device_uid) FINAL; + void OnDeviceSwitchingFinish(const std::string& device_uid) FINAL; DEPRECATED bool OnServiceStartedCallback( const connection_handler::DeviceHandle& device_handle, diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index aea66aa27c..4afaefb781 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1091,7 +1091,7 @@ void ApplicationManagerImpl::OnDeviceSwitchingStart( } } -void ApplicationManagerImpl::OnDeviceSwitchFinish( +void ApplicationManagerImpl::OnDeviceSwitchingFinish( const std::string& device_uid) { LOG4CXX_AUTO_TRACE(logger_); UNUSED(device_uid); diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc index 16ca54b903..b964c1c0a2 100644 --- a/src/components/application_manager/test/application_manager_impl_test.cc +++ b/src/components/application_manager/test/application_manager_impl_test.cc @@ -756,7 +756,7 @@ TEST_F(ApplicationManagerImplTest, ON_CALL(*mock_message_helper_, CreateNegativeResponse(_, _, _, _)) .WillByDefault(Return(sptr)); - app_manager_impl_->OnDeviceSwitchFinish(switching_mac_address); + app_manager_impl_->OnDeviceSwitchingFinish(switching_mac_address); EXPECT_FALSE( app_manager_impl_->application_by_policy_id(policy_app_id_switch)); EXPECT_TRUE( diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h index d073d06aa1..4c0c7b2985 100644 --- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h +++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h @@ -145,11 +145,11 @@ class ConnectionHandlerImpl void OnDeviceSwitchingStart(const std::string& device_uid) FINAL; /** - * @brief OnDeviceSwitchFinish notifies listeners on device transport + * @brief OnDeviceSwitchingFinish notifies listeners on device transport * switching completion * @param device_uid the id for the device which is fails to reconnect. */ - void OnDeviceSwitchFinish( + void OnDeviceSwitchingFinish( const transport_manager::DeviceUID& device_uid) FINAL; void OnScanDevicesFinished() OVERRIDE; diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index f1051931a6..67a54678cc 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -189,11 +189,11 @@ void ConnectionHandlerImpl::OnDeviceRemoved( device_list_.erase(device_info.device_handle()); } -void ConnectionHandlerImpl::OnDeviceSwitchFinish( +void ConnectionHandlerImpl::OnDeviceSwitchingFinish( const transport_manager::DeviceUID& device_uid) { sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_); if (connection_handler_observer_) { - connection_handler_observer_->OnDeviceSwitchFinish( + connection_handler_observer_->OnDeviceSwitchingFinish( encryption::MakeHash(device_uid)); } } 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 a49d1b4be8..15d1e645ab 100644 --- a/src/components/connection_handler/test/connection_handler_impl_test.cc +++ b/src/components/connection_handler/test/connection_handler_impl_test.cc @@ -1906,7 +1906,7 @@ TEST_F(ConnectionHandlerTest, OnDeviceConnectionSwitching) { connection_handler_->OnDeviceSwitchingStart(fake_device_id); } -TEST_F(ConnectionHandlerTest, OnDeviceSwitchFinish) { +TEST_F(ConnectionHandlerTest, OnDeviceSwitchingFinish) { connection_handler_test::MockConnectionHandlerObserver mock_connection_handler_observer; connection_handler_->set_connection_handler_observer( @@ -1914,9 +1914,9 @@ TEST_F(ConnectionHandlerTest, OnDeviceSwitchFinish) { const std::string fake_device_id = "fake_device_id"; EXPECT_CALL(mock_connection_handler_observer, - OnDeviceSwitchFinish(encryption::MakeHash(fake_device_id))); + OnDeviceSwitchingFinish(encryption::MakeHash(fake_device_id))); - connection_handler_->OnDeviceSwitchFinish(fake_device_id); + connection_handler_->OnDeviceSwitchingFinish(fake_device_id); } } // namespace connection_handler_test diff --git a/src/components/include/connection_handler/connection_handler_observer.h b/src/components/include/connection_handler/connection_handler_observer.h index ac57b93589..7ba2233210 100644 --- a/src/components/include/connection_handler/connection_handler_observer.h +++ b/src/components/include/connection_handler/connection_handler_observer.h @@ -132,11 +132,11 @@ class ConnectionHandlerObserver { virtual void OnDeviceSwitchingStart(const std::string& device_uid) = 0; /** - * @brief OnDeviceSwitchFinish is invoked on device trasport switching end + * @brief OnDeviceSwitchingFinish is invoked on device trasport switching end * i.e. timeout for switching is expired * @param device_uid UID of device being switched */ - virtual void OnDeviceSwitchFinish(const std::string& device_uid) = 0; + virtual void OnDeviceSwitchingFinish(const std::string& device_uid) = 0; #ifdef ENABLE_SECURITY virtual security_manager::SSLContext::HandshakeContext GetHandshakeContext( 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 f17c73e2cc..3bcd8d5214 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 @@ -68,7 +68,7 @@ class MockConnectionHandlerObserver security_manager::SSLContext::HandshakeContext(uint32_t key)); MOCK_METHOD1(OnDeviceSwitchingStart, void(const std::string& device_uid)); - MOCK_METHOD1(OnDeviceSwitchFinish, void(const std::string& device_uid)); + MOCK_METHOD1(OnDeviceSwitchingFinish, void(const std::string& device_uid)); }; } // namespace connection_handler_test 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 6a8182409d..a57ae69bbb 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 @@ -82,7 +82,7 @@ class MockTransportManagerListener : public TransportManagerListener { void(const DataSendError& error, const ::protocol_handler::RawMessagePtr message)); MOCK_METHOD1(OnDeviceSwitchingStart, void(const DeviceUID& device_uid)); - MOCK_METHOD1(OnDeviceSwitchFinish, void(const DeviceUID& device_uid)); + MOCK_METHOD1(OnDeviceSwitchingFinish, void(const DeviceUID& device_uid)); }; } // namespace transport_manager_test diff --git a/src/components/include/transport_manager/transport_manager_listener.h b/src/components/include/transport_manager/transport_manager_listener.h index 1f1503bbe0..80994e700e 100644 --- a/src/components/include/transport_manager/transport_manager_listener.h +++ b/src/components/include/transport_manager/transport_manager_listener.h @@ -77,11 +77,11 @@ class TransportManagerListener { virtual void OnDeviceSwitchingStart(const DeviceUID& device_uid) = 0; /** - * @brief OnDeviceSwitchFinish notifies listener that device reconnection + * @brief OnDeviceSwitchingFinish notifies listener that device reconnection * fails due to some reason. * @param device_uid the id for the device which is fails to reconnect. */ - virtual void OnDeviceSwitchFinish(const DeviceUID& device_uid) = 0; + virtual void OnDeviceSwitchingFinish(const DeviceUID& device_uid) = 0; /** * @brief Reaction to the event, when scanning of devices is finished. diff --git a/src/components/include/transport_manager/transport_manager_listener_empty.h b/src/components/include/transport_manager/transport_manager_listener_empty.h index a87c5cb690..f7843c9a68 100644 --- a/src/components/include/transport_manager/transport_manager_listener_empty.h +++ b/src/components/include/transport_manager/transport_manager_listener_empty.h @@ -76,11 +76,11 @@ class TransportManagerListenerEmpty : public TransportManagerListener { void OnDeviceSwitchingStart(const DeviceUID& device_uid) OVERRIDE {} /** - * @brief OnDeviceSwitchFinish notifies listener that device reconnection + * @brief OnDeviceSwitchingFinish notifies listener that device reconnection * fails due to some reason. This default implementation does nothing. * @param device_uid the id for the device which is fails to reconnect. */ - void OnDeviceSwitchFinish(const DeviceUID& device_uid) OVERRIDE {} + void OnDeviceSwitchingFinish(const DeviceUID& device_uid) OVERRIDE {} /** * @brief Reaction to the event, when scanning of devices is finished. diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index 3896c5961b..0619b739a9 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -114,7 +114,7 @@ TransportManagerImpl::~TransportManagerImpl() { void TransportManagerImpl::ReconnectionTimeout() { LOG4CXX_AUTO_TRACE(logger_); - RaiseEvent(&TransportManagerListener::OnDeviceSwitchFinish, + RaiseEvent(&TransportManagerListener::OnDeviceSwitchingFinish, device_to_reconnect_); } 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 80b4ba5316..2e0e66a7a9 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -1167,7 +1167,7 @@ TEST_F(TransportManagerImplTest, app_transport_change_timer_addition()).WillOnce(Return(0)); EXPECT_CALL(*tm_listener_, OnDeviceSwitchingStart(mac_address_)); - EXPECT_CALL(*tm_listener_, OnDeviceSwitchFinish(mac_address_)); + EXPECT_CALL(*tm_listener_, OnDeviceSwitchingFinish(mac_address_)); tm_.TestHandle(TransportAdapterEvent(EventTypeEnum::ON_DEVICE_LIST_UPDATED, second_mock_adapter.get(), |