diff options
| author | Frank Ronneburg <fronneburg@xevo.com> | 2018-04-12 07:36:02 +0900 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-04-11 17:03:27 -0700 |
| commit | e0caccd349cd66a21508c00bcfab8f288d688d86 (patch) | |
| tree | 2147dcb99c82ad8769496089b4958ed4d68d9518 /src/components/application_manager/test/include | |
| parent | 4bc109858e8f16c3b37eab3b766976d6039dbf09 (diff) | |
| download | sdl_core-e0caccd349cd66a21508c00bcfab8f288d688d86.tar.gz | |
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
Diffstat (limited to 'src/components/application_manager/test/include')
| -rw-r--r-- | src/components/application_manager/test/include/application_manager/mock_application.h | 4 | ||||
| -rw-r--r-- | src/components/application_manager/test/include/application_manager/mock_message_helper.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h index ec707c7a76..5bb41181fe 100644 --- a/src/components/application_manager/test/include/application_manager/mock_application.h +++ b/src/components/application_manager/test/include/application_manager/mock_application.h @@ -139,9 +139,9 @@ class MockApplication : public ::application_manager::Application { MOCK_METHOD1(set_is_resuming, void(bool)); MOCK_CONST_METHOD0(is_resuming, bool()); MOCK_METHOD1(set_deferred_resumption_hmi_level, - void(mobile_api::HMILevel::eType level)); + void(application_manager::mobile_api::HMILevel::eType level)); MOCK_CONST_METHOD0(deferred_resumption_hmi_level, - mobile_api::HMILevel::eType()); + application_manager::mobile_api::HMILevel::eType()); 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)); 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, |