diff options
38 files changed, 186 insertions, 1017 deletions
diff --git a/src/components/application_manager/test/event_engine_test.cc b/src/components/application_manager/test/event_engine_test.cc index 8b171d0c75..1b7afc79c8 100644 --- a/src/components/application_manager/test/event_engine_test.cc +++ b/src/components/application_manager/test/event_engine_test.cc @@ -35,7 +35,7 @@ #include "application_manager/event_engine/event_observer.h" #include "application_manager/event_engine/event.h" #include "application_manager/event_engine/event_dispatcher_impl.h" -#include "application_manager/event_observer_mock.h" +#include "application_manager/mock_event_observer.h" #include "application_manager/mock_event_dispatcher.h" #include "smart_objects/smart_object.h" #include "utils/make_shared.h" diff --git a/src/components/application_manager/test/include/application_manager/application_mock.h b/src/components/application_manager/test/include/application_manager/application_mock.h deleted file mode 100644 index 9821dad659..0000000000 --- a/src/components/application_manager/test/include/application_manager/application_mock.h +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright (c) 2015, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_APPLICATION_MOCK_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_APPLICATION_MOCK_H_ - -#include <string> - -#include "gmock/gmock.h" -#include "application_manager/application.h" - -namespace test { -namespace components { -namespace state_controller_test { - -namespace am = application_manager; - -namespace custom_str = utils::custom_string; - -class MockApplication : public application_manager::Application { - public: - // InitialApplicationData - MOCK_CONST_METHOD0(app_types, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(vr_synonyms, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(mac_address, const std::string&()); - MOCK_CONST_METHOD0(mobile_app_id, std::string()); - MOCK_CONST_METHOD0(tts_name, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(ngn_media_screen_name, - const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(language, const mobile_apis::Language::eType&()); - MOCK_CONST_METHOD0(ui_language, const mobile_apis::Language::eType&()); - MOCK_METHOD1(set_app_types, - void(const smart_objects::SmartObject& app_types)); - MOCK_METHOD1(set_vr_synonyms, - void(const smart_objects::SmartObject& vr_synonyms)); - MOCK_METHOD1(set_mobile_app_id, void(const std::string& mobile_app_id)); - MOCK_METHOD1(set_tts_name, void(const smart_objects::SmartObject& tts_name)); - MOCK_METHOD1(set_ngn_media_screen_name, - void(const smart_objects::SmartObject& ngn_name)); - MOCK_METHOD1(set_language, - void(const mobile_apis::Language::eType& language)); - MOCK_METHOD1(set_ui_language, - void(const mobile_apis::Language::eType& ui_language)); - - // DynamicApplicationData - MOCK_CONST_METHOD0(help_prompt, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(timeout_prompt, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(vr_help_title, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(vr_help, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(tbt_state, const mobile_apis::TBTState::eType&()); - MOCK_CONST_METHOD0(show_command, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(tbt_show_command, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(SubscribedButtons, - DataAccessor<application_manager::ButtonSubscriptions>()); - MOCK_CONST_METHOD0( - SubscribedIVI, - DataAccessor<application_manager::VehicleInfoSubscriptions>()); - MOCK_CONST_METHOD0(keyboard_props, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(menu_title, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(menu_icon, const smart_objects::SmartObject*()); - MOCK_METHOD1(load_global_properties, - void(const smart_objects::SmartObject& so)); - MOCK_METHOD1(set_help_prompt, - void(const smart_objects::SmartObject& help_prompt)); - MOCK_METHOD1(set_timeout_prompt, - void(const smart_objects::SmartObject& timeout_prompt)); - MOCK_METHOD1(set_vr_help_title, - void(const smart_objects::SmartObject& vr_help_title)); - MOCK_METHOD0(reset_vr_help_title, void()); - MOCK_METHOD1(set_vr_help, void(const smart_objects::SmartObject& vr_help)); - MOCK_METHOD0(reset_vr_help, void()); - MOCK_METHOD1(set_tbt_state, - void(const mobile_apis::TBTState::eType& tbt_state)); - MOCK_METHOD1(set_show_command, - void(const smart_objects::SmartObject& show_command)); - MOCK_METHOD1(set_tbt_show_command, - void(const smart_objects::SmartObject& tbt_show)); - MOCK_METHOD1(set_keyboard_props, - void(const smart_objects::SmartObject& keyboard_props)); - MOCK_METHOD1(set_menu_title, - void(const smart_objects::SmartObject& menu_title)); - MOCK_METHOD1(set_menu_icon, - void(const smart_objects::SmartObject& menu_icon)); - MOCK_CONST_METHOD0(audio_stream_retry_number, uint32_t()); - MOCK_METHOD1(set_audio_stream_retry_number, - void(const uint32_t& audio_stream_retry_number)); - MOCK_CONST_METHOD0(video_stream_retry_number, uint32_t()); - MOCK_METHOD1(set_video_stream_retry_number, - void(const uint32_t& video_stream_retry_number)); - MOCK_METHOD2(AddCommand, - void(uint32_t cmd_id, - const smart_objects::SmartObject& command)); - MOCK_METHOD1(RemoveCommand, void(uint32_t cmd_id)); - MOCK_METHOD1(FindCommand, smart_objects::SmartObject*(uint32_t cmd_id)); - MOCK_METHOD2(AddSubMenu, - void(uint32_t menu_id, const smart_objects::SmartObject& menu)); - MOCK_METHOD1(RemoveSubMenu, void(uint32_t menu_id)); - MOCK_CONST_METHOD1(FindSubMenu, - smart_objects::SmartObject*(uint32_t menu_id)); - MOCK_METHOD1(IsSubMenuNameAlreadyExist, bool(const std::string& name)); - MOCK_METHOD2(AddChoiceSet, - void(uint32_t choice_set_id, - const smart_objects::SmartObject& choice_set)); - MOCK_METHOD1(RemoveChoiceSet, void(uint32_t choice_set_id)); - MOCK_METHOD1(FindChoiceSet, - smart_objects::SmartObject*(uint32_t choice_set_id)); - MOCK_METHOD3(AddPerformInteractionChoiceSet, - void(uint32_t correlation_id, - uint32_t choice_set_id, - const smart_objects::SmartObject& choice_set)); - MOCK_METHOD1(DeletePerformInteractionChoiceSet, - void(uint32_t correlation_id)); - MOCK_CONST_METHOD0(performinteraction_choice_set_map, - DataAccessor<application_manager::PerformChoiceSetMap>()); - MOCK_CONST_METHOD0(commands_map, - DataAccessor<application_manager::CommandsMap>()); - MOCK_CONST_METHOD0(sub_menu_map, - DataAccessor<application_manager::SubMenuMap>()); - MOCK_CONST_METHOD0(choice_set_map, - DataAccessor<application_manager::ChoiceSetMap>()); - MOCK_METHOD1(set_perform_interaction_active, void(uint32_t active)); - MOCK_CONST_METHOD0(is_perform_interaction_active, uint32_t()); - MOCK_METHOD1(set_perform_interaction_layout, - void(mobile_apis::LayoutMode::eType layout)); - MOCK_CONST_METHOD0(perform_interaction_layout, - mobile_apis::LayoutMode::eType()); - MOCK_METHOD1(set_perform_interaction_mode, void(int32_t mode)); - MOCK_CONST_METHOD0(perform_interaction_mode, int32_t()); - MOCK_METHOD1(set_reset_global_properties_active, void(bool active)); - MOCK_CONST_METHOD0(is_reset_global_properties_active, bool()); - // Application - - MOCK_CONST_METHOD0(active_message, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(curHash, const std::string&()); - MOCK_METHOD0(UpdateHash, void()); - MOCK_CONST_METHOD0(is_application_data_changed, bool()); - MOCK_METHOD1(set_is_application_data_changed, - void(bool state_application_data)); - MOCK_METHOD0(CloseActiveMessage, void()); - MOCK_CONST_METHOD0(IsFullscreen, bool()); - MOCK_METHOD0(ChangeSupportingAppHMIType, void()); - MOCK_CONST_METHOD0(is_navi, bool()); - MOCK_METHOD1(set_is_navi, void(bool allow)); - MOCK_CONST_METHOD0(video_streaming_approved, bool()); - MOCK_METHOD1(set_video_streaming_approved, void(bool state)); - MOCK_CONST_METHOD0(audio_streaming_approved, bool()); - MOCK_METHOD1(set_audio_streaming_approved, void(bool state)); - MOCK_CONST_METHOD0(video_streaming_allowed, bool()); - MOCK_METHOD1(set_video_streaming_allowed, void(bool state)); - MOCK_CONST_METHOD0(audio_streaming_allowed, bool()); - MOCK_METHOD1(set_audio_streaming_allowed, void(bool state)); - MOCK_METHOD1(StartStreaming, - void(protocol_handler::ServiceType service_type)); - MOCK_METHOD1(StopStreamingForce, - void(protocol_handler::ServiceType service_type)); - MOCK_METHOD1(StopStreaming, void(protocol_handler::ServiceType service_type)); - MOCK_METHOD1(SuspendStreaming, - void(protocol_handler::ServiceType service_type)); - MOCK_METHOD1(WakeUpStreaming, - void(protocol_handler::ServiceType service_type)); - MOCK_CONST_METHOD0(is_voice_communication_supported, bool()); - MOCK_METHOD1(set_voice_communication_supported, - void(bool is_voice_communication_supported)); - MOCK_CONST_METHOD0(app_allowed, bool()); - MOCK_CONST_METHOD0(has_been_activated, bool()); - MOCK_METHOD1(set_activated, bool(bool is_active)); - MOCK_CONST_METHOD0(version, const application_manager::Version&()); - MOCK_METHOD1(set_hmi_application_id, void(uint32_t hmi_app_id)); - MOCK_CONST_METHOD0(hmi_app_id, uint32_t()); - MOCK_CONST_METHOD0(app_id, uint32_t()); - MOCK_CONST_METHOD0(name, const custom_str::CustomString&()); - MOCK_METHOD1(set_folder_name, void(const std::string& folder_name)); - MOCK_CONST_METHOD0(folder_name, const std::string()); - MOCK_CONST_METHOD0(is_media_application, bool()); - MOCK_CONST_METHOD0(is_foreground, bool()); - MOCK_METHOD1(set_foreground, void(bool is_foreground)); - MOCK_CONST_METHOD0(hmi_level, const mobile_apis::HMILevel::eType()); - MOCK_CONST_METHOD0(put_file_in_none_count, const uint32_t()); - MOCK_CONST_METHOD0(delete_file_in_none_count, const uint32_t()); - MOCK_CONST_METHOD0(list_files_in_none_count, const uint32_t()); - MOCK_CONST_METHOD0(system_context, const mobile_apis::SystemContext::eType()); - MOCK_CONST_METHOD0(audio_streaming_state, - const mobile_apis::AudioStreamingState::eType()); - MOCK_CONST_METHOD0(app_icon_path, const std::string&()); - MOCK_CONST_METHOD0(device, connection_handler::DeviceHandle()); - MOCK_METHOD1(set_tts_properties_in_none, void(bool active)); - MOCK_METHOD0(tts_properties_in_none, bool()); - MOCK_METHOD1(set_tts_properties_in_full, void(bool active)); - MOCK_METHOD0(tts_properties_in_full, bool()); - MOCK_METHOD1(set_version, void(const application_manager::Version& version)); - MOCK_METHOD1(set_name, void(const custom_str::CustomString& name)); - MOCK_METHOD1(set_is_media_application, void(bool is_media)); - MOCK_METHOD0(increment_put_file_in_none_count, void()); - MOCK_METHOD0(increment_delete_file_in_none_count, void()); - MOCK_METHOD0(increment_list_files_in_none_count, void()); - MOCK_METHOD1(set_app_icon_path, bool(const std::string& file_name)); - MOCK_METHOD1(set_app_allowed, void(const bool allowed)); - MOCK_METHOD1(set_device, void(connection_handler::DeviceHandle device)); - MOCK_CONST_METHOD0(get_grammar_id, uint32_t()); - MOCK_METHOD1(set_grammar_id, void(uint32_t value)); - MOCK_METHOD1( - set_protocol_version, - void(const application_manager::ProtocolVersion& protocol_version)); - MOCK_CONST_METHOD0(protocol_version, application_manager::ProtocolVersion()); - MOCK_METHOD1(set_is_resuming, void(bool is_resuming)); - MOCK_CONST_METHOD0(is_resuming, bool()); - MOCK_METHOD1(AddFile, bool(const application_manager::AppFile& file)); - MOCK_CONST_METHOD0(getAppFiles, const application_manager::AppFilesMap&()); - MOCK_METHOD1(UpdateFile, bool(const application_manager::AppFile& file)); - MOCK_METHOD1(DeleteFile, bool(const std::string& file_name)); - MOCK_METHOD1( - GetFile, - const application_manager::AppFile*(const std::string& file_name)); - MOCK_METHOD1(SubscribeToButton, - bool(mobile_apis::ButtonName::eType btn_name)); - MOCK_METHOD1(IsSubscribedToButton, - bool(mobile_apis::ButtonName::eType btn_name)); - MOCK_METHOD1(UnsubscribeFromButton, - bool(mobile_apis::ButtonName::eType btn_name)); - MOCK_METHOD1(SubscribeToIVI, bool(uint32_t vehicle_info_type)); - MOCK_CONST_METHOD1(IsSubscribedToIVI, bool(uint32_t vehicle_info_type)); - MOCK_METHOD1(UnsubscribeFromIVI, bool(uint32_t vehicle_info_type)); - MOCK_METHOD0(ResetDataInNone, void()); - MOCK_METHOD2(IsCommandLimitsExceeded, - bool(mobile_apis::FunctionID::eType cmd_id, - application_manager::TLimitSource source)); - MOCK_METHOD0(usage_report, application_manager::UsageStatistics&()); - MOCK_METHOD1(SetRegularState, void(application_manager::HmiStatePtr state)); - MOCK_METHOD1(SetPostponedState, void(application_manager::HmiStatePtr state)); - MOCK_METHOD0(RemovePostponedState, void()); - MOCK_METHOD1(AddHMIState, void(application_manager::HmiStatePtr state)); - MOCK_METHOD1(RemoveHMIState, - void(application_manager::HmiState::StateID state_id)); - MOCK_CONST_METHOD0(CurrentHmiState, const application_manager::HmiStatePtr()); - MOCK_CONST_METHOD0(RegularHmiState, const application_manager::HmiStatePtr()); - MOCK_CONST_METHOD0(PostponedHmiState, - const application_manager::HmiStatePtr()); - MOCK_METHOD2(SubscribeToSoftButtons, - void(int32_t cmd_id, - const application_manager::SoftButtonID& softbuttons_id)); - MOCK_METHOD1(IsSubscribedToSoftButton, bool(const uint32_t softbutton_id)); - MOCK_METHOD1(UnsubscribeFromSoftButtons, void(int32_t cmd_id)); - MOCK_CONST_METHOD0(IsAudioApplication, bool()); - MOCK_METHOD0(LoadPersistentFiles, void()); -}; - -} // namespace state_controller_test -} // namespace components -} // namespace test - -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_APPLICATION_MOCK_H_ diff --git a/src/components/application_manager/test/include/application_manager/event_observer_mock.h b/src/components/application_manager/test/include/application_manager/mock_event_observer.h index f7632a58d6..f7632a58d6 100644 --- a/src/components/application_manager/test/include/application_manager/event_observer_mock.h +++ b/src/components/application_manager/test/include/application_manager/mock_event_observer.h diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_mock.h b/src/components/application_manager/test/include/application_manager/resumption_data_mock.h deleted file mode 100644 index d5f4b95740..0000000000 --- a/src/components/application_manager/test/include/application_manager/resumption_data_mock.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -* Copyright (c) 2016, Ford Motor Company -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* -* Redistributions of source code must retain the above copyright notice, this -* list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright notice, -* this list of conditions and the following -* disclaimer in the documentation and/or other materials provided with the -* distribution. -* -* Neither the name of the Ford Motor Company nor the names of its contributors -* may be used to endorse or promote products derived from this software -* without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -* POSSIBILITY OF SUCH DAMAGE. -*/ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_RESUMPTION_DATA_MOCK_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_RESUMPTION_DATA_MOCK_H_ -#include <string> -#include "gmock/gmock.h" -#include "application_manager/resumption/resumption_data.h" -#include "application_manager/application.h" -#include "application_manager/mock_application_manager_settings.h" -#include "application_manager/mock_application_manager.h" -#include "smart_objects/smart_object.h" - -namespace test { -namespace components { -namespace resumption_test { -namespace app_mngr = application_manager; - -class MockResumptionData : public ::resumption::ResumptionData { - public: - MockResumptionData(const application_manager_test::MockApplicationManager& - application_manager) - : ResumptionData(application_manager) {} - MOCK_METHOD1(SaveApplication, - void(app_mngr::ApplicationSharedPtr application)); - MOCK_CONST_METHOD2(GetStoredHMILevel, - int32_t(const std::string& policy_app_id, - const std::string& device_id)); - MOCK_CONST_METHOD1(IsHMIApplicationIdExist, bool(uint32_t hmi_app_id)); - MOCK_CONST_METHOD2(GetHMIApplicationID, - uint32_t(const std::string& policy_app_id, - const std::string& device_id)); - MOCK_METHOD0(OnSuspend, void()); - MOCK_CONST_METHOD3(GetHashId, - bool(const std::string& policy_app_id, - const std::string& device_id, - std::string& hash_id)); - MOCK_METHOD0(OnAwake, void()); - MOCK_CONST_METHOD3(GetSavedApplication, - bool(const std::string& policy_app_id, - const std::string& device_id, - smart_objects::SmartObject& saved_app)); - MOCK_METHOD2(RemoveApplicationFromSaved, - bool(const std::string& policy_app_id, - const std::string& device_id)); - MOCK_CONST_METHOD0(GetIgnOffTime, uint32_t()); - MOCK_CONST_METHOD2(IsApplicationSaved, - ssize_t(const std::string& policy_app_id, - const std::string& device_id)); - MOCK_CONST_METHOD1(GetDataForLoadResumeData, - void(smart_objects::SmartObject& saved_data)); - MOCK_METHOD3(UpdateHmiLevel, - void(const std::string& policy_app_id, - const std::string& device_id, - mobile_apis::HMILevel::eType hmi_level)); - MOCK_METHOD0(Init, bool()); - MOCK_METHOD2(DropAppDataResumption, - bool(const std::string& device_id, const std::string& app_id)); - MOCK_METHOD0(Persist, void()); -}; - -} // namespace resumption_test -} // namespace components -} // namespace test - -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_RESUMPTION_DATA_MOCK_H_ diff --git a/src/components/application_manager/test/include/application_manager/statistics_manager_mock.h b/src/components/application_manager/test/include/application_manager/statistics_manager_mock.h deleted file mode 100644 index 9f48ff2e82..0000000000 --- a/src/components/application_manager/test/include/application_manager/statistics_manager_mock.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2015, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_STATISTICS_MANAGER_MOCK_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_STATISTICS_MANAGER_MOCK_H_ - -#include <string> -#include "gmock/gmock.h" -#include "policy/usage_statistics/statistics_manager.h" - -namespace test { -namespace components { -namespace state_controller_test { - -namespace us = usage_statistics; - -class MockStatisticsManager : public us::StatisticsManager { - public: - MOCK_METHOD1(Increment, void(us::GlobalCounterId)); - MOCK_METHOD2(Increment, void(const std::string&, us::AppCounterId)); - MOCK_METHOD3(Set, - void(const std::string&, us::AppInfoId, const std::string&)); - MOCK_METHOD3(Add, void(const std::string&, us::AppStopwatchId, int32_t)); -}; - -} // namespace state_controller_test -} -} - -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_STATISTICS_MANAGER_MOCK_H_ diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc index 8070244bf2..79397f5175 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" #include "application_manager/usage_statistics.h" -#include "application_manager/resumption_data_mock.h" +#include "application_manager/mock_resumption_data.h" #include "utils/custom_string.h" #include "application_manager/application.h" #include "utils/data_accessor.h" 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 f19a0896d1..fce79291d3 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 @@ -39,7 +39,6 @@ #include "connection_handler/mock_connection_handler_settings.h" #include "connection_handler/connection_handler_impl.h" #include "transport_manager/mock_transport_manager.h" -#include "application_manager/statistics_manager_mock.h" #include "utils/lock.h" #include "utils/data_accessor.h" #include "utils/make_shared.h" @@ -48,6 +47,7 @@ #include "application_manager/smart_object_keys.h" #include "application_manager/mock_message_helper.h" #include "policy/mock_policy_settings.h" +#include "policy/usage_statistics/mock_statistics_manager.h" #include "protocol_handler/mock_session_observer.h" #include "connection_handler/mock_connection_handler.h" #include "application_manager/policies/mock_policy_handler_interface.h" @@ -131,7 +131,7 @@ class StateControllerImplTest : public ::testing::Test { , usage_stat("0", utils::SharedPtr<usage_statistics::StatisticsManager>( - new state_controller_test::MockStatisticsManager)) + new usage_statistics_test::MockStatisticsManager)) , applications_(application_set_, applications_lock_) {} NiceMock<application_manager_test::MockApplicationManager> app_manager_mock_; NiceMock<policy_test::MockPolicyHandlerInterface> policy_interface_; 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 08f2198fa0..a5ca9fcef5 100644 --- a/src/components/connection_handler/test/connection_handler_impl_test.cc +++ b/src/components/connection_handler/test/connection_handler_impl_test.cc @@ -40,7 +40,7 @@ #include "security_manager/mock_security_manager.h" #include "security_manager/mock_ssl_context.h" #include "protocol_handler/mock_protocol_handler.h" -#include "connection_handler/connection_handler_observer_mock.h" +#include "connection_handler/mock_connection_handler_observer.h" #include "connection_handler/mock_connection_handler_settings.h" #include "transport_manager/mock_transport_manager.h" #include "encryption/hashing.h" diff --git a/src/components/connection_handler/test/include/connection_handler/connection_handler_observer_mock.h b/src/components/connection_handler/test/include/connection_handler/connection_handler_observer_mock.h deleted file mode 100644 index c0d069fe4e..0000000000 --- a/src/components/connection_handler/test/include/connection_handler/connection_handler_observer_mock.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2015, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_CONNECTION_HANDLER_TEST_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_OBSERVER_MOCK_H_ -#define SRC_COMPONENTS_CONNECTION_HANDLER_TEST_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_OBSERVER_MOCK_H_ - -#include "gmock/gmock.h" -#include <string> -#include "connection_handler/connection_handler_observer.h" - -namespace test { -namespace components { -namespace connection_handler_test { - -/* - * MOCK implementation of ::connection_handler::ConnectionHandlerObserver - * interface - */ -class ConnectionHandlerObserverMock - : public ::connection_handler::ConnectionHandlerObserver { - public: - MOCK_METHOD1(OnDeviceListUpdated, - void(const connection_handler::DeviceMap& device_list)); - MOCK_METHOD0(OnFindNewApplicationsRequest, void()); - MOCK_METHOD1(RemoveDevice, - void(const connection_handler::DeviceHandle& device_handle)); - MOCK_METHOD3(OnServiceStartedCallback, - bool(const connection_handler::DeviceHandle& device_handle, - const int32_t& session_key, - const protocol_handler::ServiceType& type)); - MOCK_METHOD3( - OnServiceEndedCallback, - void(const int32_t& session_key, - const protocol_handler::ServiceType& type, - const connection_handler::CloseSessionReason& close_reason)); - MOCK_CONST_METHOD1( - GetHandshakeContext, - security_manager::SSLContext::HandshakeContext(uint32_t key)); -}; -} // namespace connection_handler_test -} // namespace components -} // namespace test -#endif // SRC_COMPONENTS_CONNECTION_HANDLER_TEST_INCLUDE_CONNECTION_HANDLER_CONNECTION_HANDLER_OBSERVER_MOCK_H_ 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 db89668a85..790032139a 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,23 +40,28 @@ namespace test { namespace components { namespace connection_handler_test { -class MockConnectionHandlerObserver : public ConnectionHandlerObserver { +class ConnectionHandlerObserverMock + : public ::connection_handler::ConnectionHandlerObserver { public: MOCK_METHOD1(OnDeviceListUpdated, - void(const connection_handler::DeviceMap& device_list)); - MOCK_METHOD0(OnFindNewApplicationsRequest, - void()); + void(const connection_handler::DeviceMap& device_list)); + MOCK_METHOD0(OnFindNewApplicationsRequest, void()); MOCK_METHOD1(RemoveDevice, - void(const connection_handler::DeviceHandle& device_handle)); + void(const connection_handler::DeviceHandle& device_handle)); MOCK_METHOD3(OnServiceStartedCallback, - bool(const connection_handler::DeviceHandle& device_handle, const int32_t& session_key, const protocol_handler::ServiceType& type)); - MOCK_METHOD3(OnServiceEndedCallback, - void(const int32_t& session_key, const protocol_handler::ServiceType& type, const connection_handler::CloseSessionReason& close_reason)); - MOCK_CONST_METHOD1(GetHandshakeContext, + bool(const connection_handler::DeviceHandle& device_handle, + const int32_t& session_key, + const protocol_handler::ServiceType& type)); + MOCK_METHOD3( + OnServiceEndedCallback, + void(const int32_t& session_key, + const protocol_handler::ServiceType& type, + const connection_handler::CloseSessionReason& close_reason)); + MOCK_CONST_METHOD1( + GetHandshakeContext, security_manager::SSLContext::HandshakeContext(uint32_t key)); }; - } // namespace connection_handler_test } // namespace components } // namespace test diff --git a/src/components/include/test/protocol_handler/protocol_observer_mock.h b/src/components/include/test/protocol_handler/mock_protocol_observer.h index 3cbc8555e4..257ea5ad9f 100644 --- a/src/components/include/test/protocol_handler/protocol_observer_mock.h +++ b/src/components/include/test/protocol_handler/mock_protocol_observer.h @@ -30,10 +30,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_PROTOCOL_OBSERVER_MOCK_H_ -#define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_PROTOCOL_OBSERVER_MOCK_H_ +#ifndef SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_OBSERVER_H_ +#define SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_OBSERVER_H_ -#include <gmock/gmock.h> +#include "gmock/gmock.h" #include <string> #include "protocol_handler/protocol_observer.h" @@ -44,7 +44,7 @@ namespace protocol_handler_test { /* * MOCK implementation of ::protocol_handler::ProtocolObserver interface */ -class ProtocolObserverMock : public ::protocol_handler::ProtocolObserver { +class MockProtocolObserver : public ::protocol_handler::ProtocolObserver { public: MOCK_METHOD1(OnMessageReceived, void(const ::protocol_handler::RawMessagePtr)); @@ -54,4 +54,4 @@ class ProtocolObserverMock : public ::protocol_handler::ProtocolObserver { } // namespace protocol_handler_test } // namespace components } // namespace test -#endif // SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_PROTOCOL_OBSERVER_MOCK_H_ +#endif // SRC_COMPONENTS_INCLUDE_TEST_PROTOCOL_HANDLER_MOCK_PROTOCOL_OBSERVER_H_ diff --git a/src/components/include/test/resumption/mock_last_state.h b/src/components/include/test/resumption/mock_last_state.h index 419deba3cf..9f4b11cbbf 100644 --- a/src/components/include/test/resumption/mock_last_state.h +++ b/src/components/include/test/resumption/mock_last_state.h @@ -36,7 +36,9 @@ #include "gmock/gmock.h" #include "resumption/last_state.h" -namespace resumption { +namespace test { +namespace components { +namespace resumption_test { class MockLastState : public resumption::LastState { public: @@ -44,6 +46,8 @@ class MockLastState : public resumption::LastState { MOCK_METHOD0(get_dictionary, Json::Value&()); }; -} // resumption +} // namespace resumption_test +} // namespace components +} // namespace test #endif // SRC_COMPONENTS_INCLUDE_TEST_RESUMPTION_MOCK_LAST_STATE_H_ 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 c989556ace..ebf4ea20c1 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2015, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,61 +30,62 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#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" +#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_ +#include <vector> +#include <gmock/gmock.h> #include "transport_manager/transport_manager_listener.h" +#include "protocol/raw_message.h" namespace test { namespace components { namespace transport_manager_test { -class MockTransportManagerListener - : public transport_manager::TransportManagerListener { +using namespace transport_manager; +using ::protocol_handler::RawMessage; +using ::protocol_handler::RawMessagePtr; + +class TransportManagerListenerMock : public TransportManagerListener { public: MOCK_METHOD1(OnDeviceListUpdated, - void(const std::vector<DeviceInfo>)); - MOCK_METHOD0(OnFindNewApplicationsRequest, - void()); - MOCK_METHOD1(OnDeviceFound, - void(const DeviceInfo& device_info)); - MOCK_METHOD1(OnDeviceAdded, - void(const DeviceInfo& device_info)); - MOCK_METHOD1(OnDeviceRemoved, - void(const DeviceInfo& device_info)); - MOCK_METHOD0(OnScanDevicesFinished, - void()); - MOCK_METHOD1(OnScanDevicesFailed, - void(const SearchDeviceError& error)); + void(const std::vector<DeviceInfo>& device_info)); + MOCK_METHOD0(OnFindNewApplicationsRequest, void()); + MOCK_METHOD1(OnDeviceFound, void(const DeviceInfo& device_info)); + MOCK_METHOD1(OnDeviceAdded, void(const DeviceInfo& device_info)); + MOCK_METHOD1(OnDeviceRemoved, void(const DeviceInfo& device_info)); + MOCK_METHOD0(OnScanDevicesFinished, void()); + MOCK_METHOD1(OnScanDevicesFailed, void(const SearchDeviceError& error)); MOCK_METHOD2(OnConnectionEstablished, - void(const DeviceInfo& device_info, const ConnectionUID connection_id)); + void(const DeviceInfo& device_info, + const ConnectionUID connection_id)); MOCK_METHOD2(OnConnectionFailed, - void(const DeviceInfo& device_info, const ConnectError& error)); - MOCK_METHOD1(OnConnectionClosed, - void(const ConnectionUID connection_id)); + void(const DeviceInfo& device_info, const ConnectError& error)); + MOCK_METHOD1(OnConnectionClosed, void(const ConnectionUID connection_id)); MOCK_METHOD2(OnUnexpectedDisconnect, - void(const ConnectionUID connection_id, const CommunicationError& error)); + void(const ConnectionUID connection_id, + const CommunicationError& error)); MOCK_METHOD2(OnConnectionClosedFailure, - void(const ConnectionUID connection_id, const DisconnectError& error)); + void(const ConnectionUID connection_id, + const DisconnectError& error)); MOCK_METHOD2(OnDeviceConnectionLost, - void(const DeviceHandle& device, const DisconnectDeviceError& error)); + void(const DeviceHandle& device, + const DisconnectDeviceError& error)); MOCK_METHOD2(OnDisconnectFailed, - void(const DeviceHandle& device, const DisconnectDeviceError& error)); + void(const DeviceHandle& device, + const DisconnectDeviceError& error)); MOCK_METHOD1(OnTMMessageReceived, - void(const ::protocol_handler::RawMessagePtr message)); - MOCK_METHOD1(OnTMMessageReceiveFailed, - void(const DataReceiveError& error)); + void(const ::protocol_handler::RawMessagePtr message)); + MOCK_METHOD1(OnTMMessageReceiveFailed, void(const DataReceiveError& error)); MOCK_METHOD1(OnTMMessageSend, - void(const ::protocol_handler::RawMessagePtr message)); + void(const ::protocol_handler::RawMessagePtr message)); MOCK_METHOD2(OnTMMessageSendFailed, - void(const DataSendError& error, const ::protocol_handler::RawMessagePtr message)); + void(const DataSendError& error, + const ::protocol_handler::RawMessagePtr message)); }; - } // namespace transport_manager_test } // namespace components } // namespace test -#endif // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_LISTENER_H_ +#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_LISTENER_MOCK_H_ diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_device.h b/src/components/include/test/transport_manager/transport_adapter/mock_device.h index 557a490ea6..b703428dfb 100644 --- a/src/components/include/test/transport_manager/transport_adapter/mock_device.h +++ b/src/components/include/test/transport_manager/transport_adapter/mock_device.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2015, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,30 +30,42 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_DEVICE_H_ -#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_DEVICE_H_ +#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_ +#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_ #include "gmock/gmock.h" #include "transport_manager/transport_adapter/device.h" +#include "transport_manager/common.h" +#include "transport_manager/tcp/tcp_device.h" namespace test { namespace components { namespace transport_manager_test { -using transport_manager::transport_adapter::Device; +class MockDevice : public ::transport_manager::transport_adapter::Device { + public: + MockDevice(const std::string& name, const std::string& unique_device_id) + : Device(name, unique_device_id) {} + MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device)); + MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>()); + MOCK_CONST_METHOD1(LaunchApp, void(const std::string& bundle_id)); + MOCK_METHOD0(Stop, void()); +}; -class MockDevice : public Device { +class MockTCPDevice : public ::transport_manager::transport_adapter::TcpDevice { public: - MOCK_CONST_METHOD1(IsSameAs, - bool(const Device* other_device)); - MOCK_CONST_METHOD0(GetApplicationList, - transport_manager::ApplicationList()); - MOCK_METHOD0(Stop, - void()); + MockTCPDevice(const uint32_t& in_addr_t, const std::string& name) + : TcpDevice(in_addr_t, name) {} + MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device)); + MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>()); + MOCK_METHOD0(Stop, void()); + MOCK_CONST_METHOD1( + GetApplicationPort, + int(const ::transport_manager::ApplicationHandle app_handle)); }; } // namespace transport_manager_test } // namespace components } // namespace test -#endif // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_DEVICE_H_ +#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_ diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h index 618e85a4fa..815b04930a 100644 --- a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h +++ b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,52 +30,80 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_ -#define SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_ +#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ +#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ #include "gmock/gmock.h" -#include <string> -#include "transport_manager/transport_manager.h" -#include "transport_manager/transport_adapter/transport_adapter_event.h" -#include "telemetry_monitor/telemetry_observable.h" -#include "resumption/last_state.h" +#include "transport_manager/transport_adapter/transport_adapter.h" namespace test { namespace components { namespace transport_manager_test { -using ::transport_manager::DeviceHandle; -using ::transport_manager::ConnectionUID; -using ::transport_manager::transport_adapter::TransportAdapter; -using ::transport_manager::TransportAdapterEvent; -using ::transport_manager::TransportManagerListener; -/* - * MOCK implementation of ::transport_manager::TransportManager interface - */ -class MockTransportManager : public ::transport_manager::TransportManager, - public ::telemetry_monitor::TelemetryObservable< - transport_manager::TMTelemetryObserver> { +class MockTransportAdapter + : public ::transport_manager::transport_adapter::TransportAdapter { public: - MOCK_METHOD1(Init, int(resumption::LastState& last_state)); - MOCK_METHOD0(Reinit, int()); - MOCK_METHOD0(SearchDevices, int()); - MOCK_METHOD1(ConnectDevice, int(const DeviceHandle)); - MOCK_METHOD1(DisconnectDevice, int(const DeviceHandle)); - MOCK_METHOD1(Disconnect, int(const ConnectionUID)); - MOCK_METHOD1(DisconnectForce, int(const ConnectionUID)); - MOCK_METHOD1(SendMessageToDevice, - int(const ::protocol_handler::RawMessagePtr)); - MOCK_METHOD1(ReceiveEventFromDevice, int(const TransportAdapterEvent&)); - MOCK_METHOD1(AddTransportAdapter, int(TransportAdapter* adapter)); - MOCK_METHOD1(AddEventListener, int(TransportManagerListener* listener)); - MOCK_METHOD0(Stop, int()); - MOCK_METHOD1(RemoveDevice, int(const DeviceHandle)); - MOCK_CONST_METHOD1(Visibility, int(const bool&)); - MOCK_METHOD1(SetTelemetryObserver, - void(transport_manager::TMTelemetryObserver* observer)); + MOCK_CONST_METHOD0(GetDeviceType, + ::transport_manager::transport_adapter::DeviceType()); + MOCK_CONST_METHOD0(GetConnectionType, ::transport_manager::ConnectionType()); + MOCK_CONST_METHOD0(IsInitialised, bool()); + MOCK_METHOD0( + Init, ::transport_manager::transport_adapter::TransportAdapter::Error()); + MOCK_METHOD0(Terminate, void()); + MOCK_METHOD1( + AddListener, + void(::transport_manager::transport_adapter::TransportAdapterListener* + listener)); + MOCK_CONST_METHOD0(IsSearchDevicesSupported, bool()); + MOCK_METHOD0( + SearchDevices, + ::transport_manager::transport_adapter::TransportAdapter::Error()); + MOCK_CONST_METHOD0(IsServerOriginatedConnectSupported, bool()); + MOCK_METHOD2(Connect, + ::transport_manager::transport_adapter::TransportAdapter::Error( + const ::transport_manager::DeviceUID& device_handle, + const ::transport_manager::ApplicationHandle& app_handle)); + MOCK_METHOD1(ConnectDevice, + ::transport_manager::transport_adapter::TransportAdapter::Error( + const ::transport_manager::DeviceUID& device_handle)); + MOCK_METHOD2(RunAppOnDevice, void(const std::string&, const std::string&)); + MOCK_CONST_METHOD0(IsClientOriginatedConnectSupported, bool()); + MOCK_METHOD0( + StartClientListening, + ::transport_manager::transport_adapter::TransportAdapter::Error()); + MOCK_METHOD0( + StopClientListening, + ::transport_manager::transport_adapter::TransportAdapter::Error()); + MOCK_METHOD2(RemoveFinalizedConnection, + void(const ::transport_manager::DeviceUID& device_handle, + const ::transport_manager::ApplicationHandle& app_handle)); + MOCK_METHOD2(Disconnect, + ::transport_manager::transport_adapter::TransportAdapter::Error( + const ::transport_manager::DeviceUID& device_handle, + const ::transport_manager::ApplicationHandle& app_handle)); + MOCK_METHOD1(DisconnectDevice, + Error(const ::transport_manager::DeviceUID& device_handle)); + MOCK_METHOD3(SendData, + ::transport_manager::transport_adapter::TransportAdapter::Error( + const ::transport_manager::DeviceUID& device_handle, + const ::transport_manager::ApplicationHandle& app_handle, + const protocol_handler::RawMessagePtr data)); + MOCK_CONST_METHOD0(GetDeviceList, ::transport_manager::DeviceList()); + MOCK_CONST_METHOD1(GetApplicationList, + ::transport_manager::ApplicationList( + const ::transport_manager::DeviceUID& device_handle)); + MOCK_CONST_METHOD1( + DeviceName, + std::string(const ::transport_manager::DeviceUID& device_handle)); + +#ifdef TELEMETRY_MONITOR + MOCK_METHOD0(GetTelemetryObserver, + ::transport_manager::TMTelemetryObserver*()); +#endif // TELEMETRY_MONITOR }; } // namespace transport_manager_test } // namespace components } // namespace test -#endif // SRC_COMPONENTS_INCLUDE_TEST_TRANSPORT_MANAGER_MOCK_TRANSPORT_MANAGER_H_ + +#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ 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" diff --git a/src/components/protocol_handler/test/protocol_handler_tm_test.cc b/src/components/protocol_handler/test/protocol_handler_tm_test.cc index 1a7be866d9..5aa7ae48dd 100644 --- a/src/components/protocol_handler/test/protocol_handler_tm_test.cc +++ b/src/components/protocol_handler/test/protocol_handler_tm_test.cc @@ -36,7 +36,7 @@ #include "protocol/common.h" #include "protocol_handler/control_message_matcher.h" #include "protocol_handler/mock_protocol_handler.h" -#include "protocol_handler/protocol_observer_mock.h" +#include "protocol_handler/mock_protocol_observer.h" #include "protocol_handler/mock_protocol_handler_settings.h" #include "protocol_handler/mock_session_observer.h" #include "connection_handler/mock_connection_handler.h" diff --git a/src/components/transport_manager/test/include/transport_manager/device_mock.h b/src/components/transport_manager/test/include/transport_manager/device_mock.h deleted file mode 100644 index b703428dfb..0000000000 --- a/src/components/transport_manager/test/include/transport_manager/device_mock.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2015, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_ -#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_ - -#include "gmock/gmock.h" -#include "transport_manager/transport_adapter/device.h" -#include "transport_manager/common.h" -#include "transport_manager/tcp/tcp_device.h" - -namespace test { -namespace components { -namespace transport_manager_test { - -class MockDevice : public ::transport_manager::transport_adapter::Device { - public: - MockDevice(const std::string& name, const std::string& unique_device_id) - : Device(name, unique_device_id) {} - MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device)); - MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>()); - MOCK_CONST_METHOD1(LaunchApp, void(const std::string& bundle_id)); - MOCK_METHOD0(Stop, void()); -}; - -class MockTCPDevice : public ::transport_manager::transport_adapter::TcpDevice { - public: - MockTCPDevice(const uint32_t& in_addr_t, const std::string& name) - : TcpDevice(in_addr_t, name) {} - MOCK_CONST_METHOD1(IsSameAs, bool(const Device* other_device)); - MOCK_CONST_METHOD0(GetApplicationList, std::vector<int>()); - MOCK_METHOD0(Stop, void()); - MOCK_CONST_METHOD1( - GetApplicationPort, - int(const ::transport_manager::ApplicationHandle app_handle)); -}; - -} // namespace transport_manager_test -} // namespace components -} // namespace test - -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_DEVICE_MOCK_H_ diff --git a/src/components/transport_manager/test/include/transport_manager/transport_manager_listener_mock.h b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h index ebf4ea20c1..ebf4ea20c1 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_manager_listener_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/mock_transport_manager_listener.h diff --git a/src/components/transport_manager/test/include/transport_manager/client_connection_listener_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_client_connection_listener.h index f2a0a7e132..f2a0a7e132 100644 --- a/src/components/transport_manager/test/include/transport_manager/client_connection_listener_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_client_connection_listener.h diff --git a/src/components/transport_manager/test/include/transport_manager/connection_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_connection.h index 5ad3c53beb..5ad3c53beb 100644 --- a/src/components/transport_manager/test/include/transport_manager/connection_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_connection.h diff --git a/src/components/transport_manager/test/include/transport_manager/device_scanner_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_device_scanner.h index 74232661dd..74232661dd 100644 --- a/src/components/transport_manager/test/include/transport_manager/device_scanner_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_device_scanner.h diff --git a/src/components/transport_manager/test/include/transport_manager/server_connection_factory_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_server_connection_factory.h index 71cd93956c..71cd93956c 100644 --- a/src/components/transport_manager/test/include/transport_manager/server_connection_factory_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_server_connection_factory.h diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter_controller_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h index b63b9e23bc..b63b9e23bc 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter_controller_mock.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h index c576c3de6c..0636448e58 100644 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h @@ -34,8 +34,8 @@ #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_TRANSPORT_ADAPTER_IMPL_H_ #include "gmock/gmock.h" -#include "transport_manager/transport_adapter/transport_adapter_impl.h" #include "transport_manager/transport_manager_settings.h" +#include "transport_manager/transport_adapter/transport_adapter_impl.h" using ::transport_manager::transport_adapter::TransportAdapterImpl; using ::transport_manager::transport_adapter::DeviceScanner; @@ -71,7 +71,7 @@ class MockTransportAdapterImpl : public TransportAdapterImpl { virtual ~MockTransportAdapterImpl(){}; virtual DeviceType GetDeviceType() const { - return UNKNOWN; + return DeviceType::UNKNOWN; } MOCK_CONST_METHOD0(Store, void()); diff --git a/src/components/transport_manager/test/include/transport_manager/mock_transport_adapter_listener.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h index 767a97ed1f..767a97ed1f 100644 --- a/src/components/transport_manager/test/include/transport_manager/mock_transport_adapter_listener.h +++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_listener.h diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter_listener_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter_listener_mock.h deleted file mode 100644 index 52585777fb..0000000000 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter_listener_mock.h +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (c) 2016, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_LISTENER_MOCK_H_ -#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_LISTENER_MOCK_H_ - -#include "gmock/gmock.h" -#include "transport_manager/transport_adapter/transport_adapter_listener.h" - -namespace test { -namespace components { -namespace transport_manager_test { - -namespace tm = transport_manager; -namespace ta = tm::transport_adapter; -using ta::TransportAdapter; -using ta::TransportAdapterListener; -using tm::SearchDeviceError; -using tm::DeviceUID; -using tm::ApplicationHandle; -using tm::ConnectError; -using tm::CommunicationError; -using tm::DisconnectError; -using tm::DisconnectDeviceError; -using tm::DataSendError; -using tm::DataReceiveError; - -class MockTransportAdapterListener : public TransportAdapterListener { - public: - MOCK_METHOD1(OnSearchDeviceDone, - void(const TransportAdapter* transport_adapter)); - MOCK_METHOD2(OnSearchDeviceFailed, - void(const TransportAdapter* transport_adapter, - const SearchDeviceError& error)); - MOCK_METHOD1(OnDeviceListUpdated, - void(const TransportAdapter* transport_adapter)); - MOCK_METHOD1(OnFindNewApplicationsRequest, - void(const TransportAdapter* transport_adapter)); - MOCK_METHOD3(OnConnectDone, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); - MOCK_METHOD4(OnConnectFailed, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const ConnectError& error)); - MOCK_METHOD3(OnConnectRequested, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); - MOCK_METHOD4(OnUnexpectedDisconnect, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const CommunicationError& error)); - MOCK_METHOD3(OnDisconnectDone, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); - MOCK_METHOD4(OnDisconnectFailed, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const DisconnectError& error)); - MOCK_METHOD2(OnDisconnectDeviceDone, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle)); - MOCK_METHOD3(OnDisconnectDeviceFailed, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const DisconnectDeviceError& error)); - MOCK_METHOD4(OnDataSendDone, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const ::protocol_handler::RawMessagePtr data_container)); - MOCK_METHOD5(OnDataSendFailed, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const ::protocol_handler::RawMessagePtr data_container, - const DataSendError& error)); - MOCK_METHOD4(OnDataReceiveDone, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const ::protocol_handler::RawMessagePtr data_container)); - MOCK_METHOD4(OnDataReceiveFailed, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle, - const DataReceiveError& error)); - MOCK_METHOD3(OnCommunicationError, - void(const TransportAdapter* transport_adapter, - const DeviceUID& device_handle, - const ApplicationHandle& app_handle)); -}; - -} // namespace transport_manager_test -} // namespace components -} // namespace test - -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_LISTENER_MOCK_H_ diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h deleted file mode 100644 index 815b04930a..0000000000 --- a/src/components/transport_manager/test/include/transport_manager/transport_adapter_mock.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2016, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ -#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ - -#include "gmock/gmock.h" -#include "transport_manager/transport_adapter/transport_adapter.h" - -namespace test { -namespace components { -namespace transport_manager_test { - -class MockTransportAdapter - : public ::transport_manager::transport_adapter::TransportAdapter { - public: - MOCK_CONST_METHOD0(GetDeviceType, - ::transport_manager::transport_adapter::DeviceType()); - MOCK_CONST_METHOD0(GetConnectionType, ::transport_manager::ConnectionType()); - MOCK_CONST_METHOD0(IsInitialised, bool()); - MOCK_METHOD0( - Init, ::transport_manager::transport_adapter::TransportAdapter::Error()); - MOCK_METHOD0(Terminate, void()); - MOCK_METHOD1( - AddListener, - void(::transport_manager::transport_adapter::TransportAdapterListener* - listener)); - MOCK_CONST_METHOD0(IsSearchDevicesSupported, bool()); - MOCK_METHOD0( - SearchDevices, - ::transport_manager::transport_adapter::TransportAdapter::Error()); - MOCK_CONST_METHOD0(IsServerOriginatedConnectSupported, bool()); - MOCK_METHOD2(Connect, - ::transport_manager::transport_adapter::TransportAdapter::Error( - const ::transport_manager::DeviceUID& device_handle, - const ::transport_manager::ApplicationHandle& app_handle)); - MOCK_METHOD1(ConnectDevice, - ::transport_manager::transport_adapter::TransportAdapter::Error( - const ::transport_manager::DeviceUID& device_handle)); - MOCK_METHOD2(RunAppOnDevice, void(const std::string&, const std::string&)); - MOCK_CONST_METHOD0(IsClientOriginatedConnectSupported, bool()); - MOCK_METHOD0( - StartClientListening, - ::transport_manager::transport_adapter::TransportAdapter::Error()); - MOCK_METHOD0( - StopClientListening, - ::transport_manager::transport_adapter::TransportAdapter::Error()); - MOCK_METHOD2(RemoveFinalizedConnection, - void(const ::transport_manager::DeviceUID& device_handle, - const ::transport_manager::ApplicationHandle& app_handle)); - MOCK_METHOD2(Disconnect, - ::transport_manager::transport_adapter::TransportAdapter::Error( - const ::transport_manager::DeviceUID& device_handle, - const ::transport_manager::ApplicationHandle& app_handle)); - MOCK_METHOD1(DisconnectDevice, - Error(const ::transport_manager::DeviceUID& device_handle)); - MOCK_METHOD3(SendData, - ::transport_manager::transport_adapter::TransportAdapter::Error( - const ::transport_manager::DeviceUID& device_handle, - const ::transport_manager::ApplicationHandle& app_handle, - const protocol_handler::RawMessagePtr data)); - MOCK_CONST_METHOD0(GetDeviceList, ::transport_manager::DeviceList()); - MOCK_CONST_METHOD1(GetApplicationList, - ::transport_manager::ApplicationList( - const ::transport_manager::DeviceUID& device_handle)); - MOCK_CONST_METHOD1( - DeviceName, - std::string(const ::transport_manager::DeviceUID& device_handle)); - -#ifdef TELEMETRY_MONITOR - MOCK_METHOD0(GetTelemetryObserver, - ::transport_manager::TMTelemetryObserver*()); -#endif // TELEMETRY_MONITOR -}; - -} // namespace transport_manager_test -} // namespace components -} // namespace test - -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_ADAPTER_MOCK_H_ diff --git a/src/components/transport_manager/test/include/transport_manager/transport_manager_impl_mock.h b/src/components/transport_manager/test/include/transport_manager/transport_manager_impl_mock.h deleted file mode 100644 index d20b67fc47..0000000000 --- a/src/components/transport_manager/test/include/transport_manager/transport_manager_impl_mock.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_IMPL_MOCK_H_ -#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_IMPL_MOCK_H_ - -#include "gmock/gmock.h" -#include "transport_manager/transport_manager_impl.h" - -namespace test { -namespace components { -namespace transport_manager { - -using namespace ::transport_manager; - -class TransportManagerImplMock : public TransportManagerImpl { - public: - MOCK_METHOD1(ReceiveEventFromDevice, int(const TransportAdapterEvent& event)); -}; - -} // namespace transport_manager -} // namespace components -} // namespace test - -#endif // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_IMPL_MOCK_H_ diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc index 782b363a38..b179f63ece 100644 --- a/src/components/transport_manager/test/tcp_client_listener_test.cc +++ b/src/components/transport_manager/test/tcp_client_listener_test.cc @@ -31,7 +31,7 @@ */ #include "gtest/gtest.h" -#include "transport_manager/transport_adapter_mock.h" +#include "transport_manager/transport_adapter/mock_transport_adapter.h" #include "transport_manager/tcp/tcp_client_listener.h" #include "transport_manager/mock_transport_manager.h" #include "transport_manager/transport_adapter/transport_adapter_controller.h" 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 b8ff762f41..5d11cb0df1 100644 --- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc +++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc @@ -32,12 +32,12 @@ #include "gtest/gtest.h" #include "transport_manager/tcp/tcp_transport_adapter.h" -#include "transport_manager/transport_adapter/connection.h" #include "resumption/last_state_impl.h" #include "protocol/raw_message.h" -#include "transport_manager/transport_adapter_listener_mock.h" -#include "transport_manager/device_mock.h" -#include "transport_manager/connection_mock.h" +#include "transport_manager/transport_adapter/connection.h" +#include "transport_manager/transport_adapter/mock_transport_adapter_listener.h" +#include "transport_manager/transport_adapter/mock_device.h" +#include "transport_manager/transport_adapter/mock_connection.h" #include "transport_manager/tcp/mock_tcp_transport_adapter.h" #include "transport_manager/mock_transport_manager_settings.h" diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc index d56949301c..c8e9af7d63 100644 --- a/src/components/transport_manager/test/transport_adapter_listener_test.cc +++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc @@ -31,9 +31,9 @@ */ #include "gtest/gtest.h" -#include "transport_manager/transport_adapter_mock.h" -#include "transport_manager/transport_adapter/transport_adapter_listener_impl.h" #include "transport_manager/mock_transport_manager.h" +#include "transport_manager/transport_adapter/mock_transport_adapter.h" +#include "transport_manager/transport_adapter/transport_adapter_listener_impl.h" namespace test { namespace components { diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc index 6e845753ec..6711fc70ba 100644 --- a/src/components/transport_manager/test/transport_adapter_test.cc +++ b/src/components/transport_manager/test/transport_adapter_test.cc @@ -31,12 +31,12 @@ */ #include "gtest/gtest.h" -#include "transport_manager/device_scanner_mock.h" -#include "transport_manager/client_connection_listener_mock.h" -#include "transport_manager/server_connection_factory_mock.h" -#include "transport_manager/device_mock.h" -#include "transport_manager/connection_mock.h" -#include "transport_manager/transport_adapter_listener_mock.h" +#include "transport_manager/transport_adapter/mock_device_scanner.h" +#include "transport_manager/transport_adapter/mock_client_connection_listener.h" +#include "transport_manager/transport_adapter/mock_server_connection_factory.h" +#include "transport_manager/transport_adapter/mock_device.h" +#include "transport_manager/transport_adapter/mock_connection.h" +#include "transport_manager/transport_adapter/mock_transport_adapter_listener.h" #include "transport_manager/transport_adapter/mock_transport_adapter_impl.h" #include "transport_manager/mock_transport_manager_settings.h" diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc index e3bd0e7240..0d8e574317 100644 --- a/src/components/transport_manager/test/transport_manager_default_test.cc +++ b/src/components/transport_manager/test/transport_manager_default_test.cc @@ -40,7 +40,7 @@ namespace test { namespace components { namespace transport_manager_test { -using ::resumption::MockLastState; +using resumption_test::MockLastState; using ::testing::Return; using ::testing::ReturnRef; using ::testing::NiceMock; @@ -62,7 +62,7 @@ TEST(TestTransportManagerDefault, Init_LastStateNotUsed) { transport_manager::TransportManagerDefault transport_manager( transport_manager_settings); - NiceMock<resumption::MockLastState> mock_last_state; + NiceMock<MockLastState> mock_last_state; Json::Value custom_dictionary = Json::Value(); ON_CALL(mock_last_state, get_dictionary()) @@ -82,7 +82,7 @@ TEST(TestTransportManagerDefault, Init_LastStateUsed) { transport_manager::TransportManagerDefault transport_manager( transport_manager_settings); - NiceMock<resumption::MockLastState> mock_last_state; + NiceMock<MockLastState> mock_last_state; Json::Value custom_dictionary; Json::Value tcp_device; tcp_device[kDeviceName] = "unique_tcp_device_name"; 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 07d54be4d7..ca5c40a54c 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -37,10 +37,9 @@ #include "transport_manager/transport_manager_impl.h" #include "transport_manager/mock_telemetry_observer.h" -#include "transport_manager/transport_manager_listener_mock.h" -#include "transport_manager/mock_transport_adapter_listener.h" +#include "transport_manager/mock_transport_manager_listener.h" #include "transport_manager/mock_telemetry_observer.h" -#include "transport_manager/transport_adapter_mock.h" +#include "transport_manager/transport_adapter/mock_transport_adapter.h" #include "transport_manager/mock_transport_manager_impl.h" #include "transport_manager/mock_transport_manager_settings.h" #include "utils/make_shared.h" |