diff options
| -rw-r--r-- | src/components/application_manager/test/include/application_manager/resumption_data_test.h | 11 | ||||
| -rw-r--r-- | src/components/application_manager/test/resumption/resumption_data_test.cc | 27 |
2 files changed, 37 insertions, 1 deletions
diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_test.h b/src/components/application_manager/test/include/application_manager/resumption_data_test.h index dd6529d872..e38b428877 100644 --- a/src/components/application_manager/test/include/application_manager/resumption_data_test.h +++ b/src/components/application_manager/test/include/application_manager/resumption_data_test.h @@ -63,7 +63,15 @@ using namespace mobile_apis; class ResumptionDataTest : public ::testing::Test { protected: ResumptionDataTest() - : kCountOfCommands_(5u) + : help_prompt_(NULL) + , timeout_prompt_(NULL) + , vr_help_(NULL) + , vr_help_title_(NULL) + , vr_synonyms_(NULL) + , keyboard_props_(NULL) + , menu_title_(NULL) + , menu_icon_(NULL) + , kCountOfCommands_(5u) , kCountOfChoice_(2u) , kCountOfChoiceSets_(4u) , kCountOfSubmenues_(3u) @@ -77,6 +85,7 @@ class ResumptionDataTest : public ::testing::Test { , ivilock_ptr_(std::make_shared<sync_primitives::Lock>()) , window_params_map_lock_ptr_(std::make_shared<sync_primitives::Lock>()) { } + virtual ~ResumptionDataTest(); // Check structure in saved application void CheckSavedApp(sm::SmartObject& saved_data); // Set data for resumption diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc index e362064a78..12a38e1bc4 100644 --- a/src/components/application_manager/test/resumption/resumption_data_test.cc +++ b/src/components/application_manager/test/resumption/resumption_data_test.cc @@ -52,6 +52,33 @@ using ::testing::Return; using ::testing::ReturnPointee; using ::testing::ReturnRef; +ResumptionDataTest::~ResumptionDataTest() { + delete help_prompt_; + delete timeout_prompt_; + delete vr_help_; + delete vr_help_title_; + delete vr_synonyms_; + delete keyboard_props_; + delete menu_title_; + delete menu_icon_; + + for (am::CommandsMap::iterator it = test_commands_map.begin(); + test_commands_map.end() != it; + ++it) { + delete it->second; + } + for (am::SubMenuMap::iterator it = test_submenu_map.begin(); + test_submenu_map.end() != it; + ++it) { + delete it->second; + } + for (am::ChoiceSetMap::iterator it = test_choiceset_map.begin(); + test_choiceset_map.end() != it; + ++it) { + delete it->second; + } +} + void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) { EXPECT_EQ(policy_app_id_, resume_app_list[am::strings::app_id].asString()); EXPECT_EQ(grammar_id_, resume_app_list[am::strings::grammar_id].asUInt()); |