diff options
author | JackLivio <jack@livio.io> | 2020-02-17 13:05:54 -0500 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2020-02-17 13:05:54 -0500 |
commit | 86dea8793023f986c7c10d7f9e5b7a932d89a49a (patch) | |
tree | bf44b0d5b6bf6b6c78dd2d0602b67f05ebe2a17c /src/components/application_manager/test/resumption/resume_ctrl_test.cc | |
parent | 4310b2dfd5e1078df0df53138a73d49d000c9c62 (diff) | |
parent | ece258838a44a5461d718c5eeae380ad11a3769b (diff) | |
download | sdl_core-86dea8793023f986c7c10d7f9e5b7a932d89a49a.tar.gz |
Merge remote-tracking branch 'origin/develop' into fix/3rd_party_build_issuesfix/3rd_party_build_issues
Diffstat (limited to 'src/components/application_manager/test/resumption/resume_ctrl_test.cc')
-rw-r--r-- | src/components/application_manager/test/resumption/resume_ctrl_test.cc | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc index 909ebbbb92..da3cd934e4 100644 --- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc +++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc @@ -385,9 +385,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) { GetInfoFromApp(); smart_objects::SmartObject test_application_commands; smart_objects::SmartObject test_commands; - const uint32_t count_of_commands = 20; + const uint32_t count_of_commands = 20u; - for (uint32_t i = 0; i < count_of_commands; ++i) { + for (uint32_t i = 0u; i < count_of_commands; ++i) { test_commands[application_manager::strings::cmd_id] = i; test_application_commands[i] = test_commands; } @@ -409,10 +409,33 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) { ON_CALL(*mock_app_, help_prompt_manager()) .WillByDefault(ReturnRef(*mock_help_prompt_manager_)); - for (uint32_t i = 0; i < count_of_commands; ++i) { - EXPECT_CALL(*mock_app_, AddCommand(i, test_application_commands[i])); - EXPECT_CALL(*mock_help_prompt_manager_, - OnVrCommandAdded(i, test_application_commands[i], true)); + std::vector<application_manager::CommandsMap> command_vec(count_of_commands); + for (uint32_t count = 0u; count < count_of_commands; ++count) { + for (uint32_t i = 0u; i < count; ++i) { + command_vec[count].insert( + std::pair<uint32_t, smart_objects::SmartObject*>( + i + 1, &test_application_commands[i])); + }; + } + + uint32_t comm_n = 0u; + ON_CALL(*mock_app_, commands_map()) + .WillByDefault(testing::Invoke( + [&]() -> DataAccessor<application_manager::CommandsMap> { + DataAccessor<application_manager::CommandsMap> data_accessor( + command_vec[comm_n], app_set_lock_ptr_); + ++comm_n; + return data_accessor; + })); + + for (uint32_t cmd_id = 0u, internal_id = 1u; cmd_id < count_of_commands; + ++cmd_id, ++internal_id) { + EXPECT_CALL(*mock_app_, + AddCommand(internal_id, test_application_commands[cmd_id])); + + EXPECT_CALL( + *mock_help_prompt_manager_, + OnVrCommandAdded(cmd_id, test_application_commands[cmd_id], true)); } smart_objects::SmartObjectList requests; |