diff options
| author | Igor Gapchuk (GitHub) <41586842+IGapchuk@users.noreply.github.com> | 2019-10-09 23:58:07 +0300 |
|---|---|---|
| committer | Collin <iCollin@users.noreply.github.com> | 2019-10-09 16:58:07 -0400 |
| commit | b7a420df297f9eb84df2afe9272ac2b537798a1c (patch) | |
| tree | fda48e91e7d52dd33dc4e494b460e976ed774aea | |
| parent | 2b09ea3adf962e25717b6b4cd751173f0aa40d02 (diff) | |
| download | sdl_core-b7a420df297f9eb84df2afe9272ac2b537798a1c.tar.gz | |
Fix resource allocation manager unit tests are not included in /resource_allocation_manager_tests testing binary . (#3070)
* ResourceAllocationManagerImpl Unit tests don't run
* Fix style
3 files changed, 14 insertions, 2 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h index 2473909ce5..c73472d2a8 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h @@ -84,6 +84,10 @@ class MockRCHelpers { std::vector<bool>(const smart_objects::SmartObject& consents)); MOCK_METHOD1(RemoveRedundantGPSDataFromIVDataMsg, void(smart_objects::SmartObject& msg_params)); + MOCK_METHOD2( + MergeModuleData, + smart_objects::SmartObject(const smart_objects::SmartObject& data1, + const smart_objects::SmartObject& data2)); static MockRCHelpers* rc_helpers_mock(); }; diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc index d5c8d09ae9..3e60591c6b 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc @@ -34,6 +34,12 @@ namespace rc_rpc_plugin { +smart_objects::SmartObject RCHelpers::MergeModuleData( + const smart_objects::SmartObject& data1, + const smart_objects::SmartObject& data2) { + return MockRCHelpers::rc_helpers_mock()->MergeModuleData(data1, data2); +} + const std::function<std::string(const std::string&)> rc_rpc_plugin::RCHelpers::GetModuleTypeToDataMapping() { return MockRCHelpers::rc_helpers_mock()->GetModuleTypeToDataMapping(); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt index c665e98448..4b10d34643 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt @@ -54,7 +54,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/resource_allocation_manager_impl_test.cc set(RC_COMMANDS_TEST_SOURCE_DIR ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/test/commands) set(RC_COMMANDS_SOURCE_DIR ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/commands) -collect_sources(COMMANDS_SOURCES "${RC_COMMANDS_TEST_DIR}" "${RC_COMMANDS_TEST_SOURCE_DIR}") +collect_sources(COMMANDS_SOURCES "${RC_COMMANDS_SOURCE_DIR}" "${RC_COMMANDS_TEST_SOURCE_DIR}") set(LIBRARIES ApplicationManager @@ -77,5 +77,7 @@ if(ENABLE_LOG) list(APPEND LIBRARIES expat -L${EXPAT_LIBS_DIRECTORY}) endif() -create_test("resource_allocation_manager_test" "${COMMANDS_SOURCES}" "${LIBRARIES}" "${RESOURCE_ALLOC_MANAGER_TEST_SOURCES}") +list(APPEND COMMANDS_SOURCES ${RESOURCE_ALLOC_MANAGER_TEST_SOURCES}) + +create_test("resource_allocation_manager_test" "${COMMANDS_SOURCES}" "${LIBRARIES}") |