From e0caccd349cd66a21508c00bcfab8f288d688d86 Mon Sep 17 00:00:00 2001 From: Frank Ronneburg Date: Thu, 12 Apr 2018 07:36:02 +0900 Subject: Merge pull request #236 in NAR/sdl-core from fix/build_errors_in_tests to feature/Ford-WiFi * commit 'd529b059e47f170c77137ac1edf10c0696a7bb6b': fallout from other changes in the Ford-WiFi branch revert device_type hacks revert device_type hacks UT: support newly added Application::deferred_resumption_hmi_level() UT: support newly added ApplicationManager::CheckResumptionRequiredTransportAvailable() UT: update test cases to support new protocol frames UT: fix CheckStringContainer() test case UT: fix test case TcpClientListenerTest IsInitialised UT: support newly added TransportAdapter::GetDeviceType() UT: support newly added transport_manager_tcp_adapter_network_interface() method Remove invalid test cases Add/fix mock methods for testing Update test code to add new arg in Connection::AddNewSession() and AddNewService() Update test code related to SessionContext struct Update test codes related to SendEndService() Update DeviceInfo struct in test codes Add mock methods for testing --- .../test/include/application_manager/mock_message_helper.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/components/application_manager/test/include/application_manager/mock_message_helper.h') diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h index 93db0d9795..359005859a 100644 --- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h +++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h @@ -225,6 +225,12 @@ class MockMessageHelper { MOCK_METHOD2(SendUIChangeRegistrationRequestToHMI, void(ApplicationConstSharedPtr app, ApplicationManager& app_mngr)); + MOCK_METHOD5(CreateDeviceInfo, + bool(connection_handler::DeviceHandle device_handle, + const protocol_handler::SessionObserver& session_observer, + const policy::PolicyHandlerInterface& policy_handler, + ApplicationManager& app_mngr, + smart_objects::SmartObject* output)); MOCK_METHOD5(CreateHMIApplicationStruct, bool(ApplicationConstSharedPtr app, const protocol_handler::SessionObserver& session_observer, -- cgit v1.2.1