diff options
| author | JackLivio <jack@livio.io> | 2019-03-17 15:19:23 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2019-03-17 15:19:23 -0400 |
| commit | c6020f483bcd9739779ce4fa87c0065f0ae7cac8 (patch) | |
| tree | ae033ddb1821cb6b0b8b0d85f884d0eba29c246a /src/components/include/test/application_manager/mock_application_manager.h | |
| parent | a593ff38c4a5a01f1cbb467b955c12d44783e995 (diff) | |
| parent | 6c6e363dc72338893dc8c577e9b59867a3215aa2 (diff) | |
| download | sdl_core-c6020f483bcd9739779ce4fa87c0065f0ae7cac8.tar.gz | |
Merge remote-tracking branch 'origin/develop' into tests/cloud_app_disconnecttests/cloud_app_disconnect+fix
# Conflicts:
# src/components/application_manager/test/application_manager_impl_test.cc
Diffstat (limited to 'src/components/include/test/application_manager/mock_application_manager.h')
| -rw-r--r-- | src/components/include/test/application_manager/mock_application_manager.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index 4f09d2c2f9..679e6ccfb3 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -39,21 +39,24 @@ #include "gmock/gmock.h" -#include "application_manager/application_manager.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/app_launch/app_launch_ctrl.h" +#include "application_manager/app_service_manager.h" #include "application_manager/application_manager_settings.h" +#include "application_manager/command_factory.h" #include "application_manager/commands/command.h" +#include "application_manager/event_engine/event_dispatcher.h" #include "application_manager/hmi_capabilities.h" -#include "application_manager/state_controller.h" #include "application_manager/message.h" -#include "resumption/last_state.h" -#include "interfaces/MOBILE_API.h" -#include "application_manager/app_launch/app_launch_ctrl.h" -#include "application_manager/event_engine/event_dispatcher.h" +#include "application_manager/message_helper.h" +#include "application_manager/plugin_manager/rpc_plugin_manager.h" +#include "application_manager/resumption/resume_ctrl.h" +#include "application_manager/rpc_handler.h" +#include "application_manager/rpc_service.h" #include "application_manager/state_controller.h" +#include "interfaces/HMI_API.h" +#include "interfaces/MOBILE_API.h" +#include "resumption/last_state.h" #include "smart_objects/smart_object.h" -#include "application_manager/plugin_manager/rpc_plugin_manager.h" -#include "application_manager/command_factory.h" namespace test { namespace components { |