Add unit tests for subMenuIcon parameter

    Add tests for addSubMenu request and addSubMenu resuming

    Related to APPLINK-23382

2 files changed, 46 insertions, 15 deletions

diff --git a/src/components/application_manager/test/resumption/resumption_data_db_test.cc b/src/components/application_manager/test/resumption/resumption_data_db_test.cc
index aa4db59eac..294f0b60d6 100644
--- a/src/components/application_manager/test/resumption/resumption_data_db_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_db_test.cc
@@ -346,7 +346,7 @@ void ResumptionDataDBTest::CheckCharacters(int64_t global_properties_key) {
 }
 
 void ResumptionDataDBTest::CheckSubmenuData() {
-  utils::dbms::SQLQuery select_submenu(test_db());
+  ::utils::dbms::SQLQuery select_submenu(test_db());
 
   EXPECT_TRUE(select_submenu.Prepare(kSelectCountSubMenu));
   BindId(select_submenu);
@@ -357,13 +357,23 @@ void ResumptionDataDBTest::CheckSubmenuData() {
   BindId(select_submenu);
   int i = 10;
   while (select_submenu.Next()) {
-    uint32_t test_id = (*test_submenu_map[i])[am::strings::menu_id].asUInt();
-    std::string name =
+    const uint32_t test_id =
+        (*test_submenu_map[i])[am::strings::menu_id].asUInt();
+    const std::string name =
         (*test_submenu_map[i])[am::strings::menu_name].asString();
-    int position = (*test_submenu_map[i])[am::strings::position].asInt();
+
+    const int position = (*test_submenu_map[i])[am::strings::position].asInt();
+    const std::string image_value =
+        (*test_submenu_map[i])[am::strings::sub_menu_icon][am::strings::value]
+            .asString();
+    const int image_type =
+        (*test_submenu_map[i])[am::strings::sub_menu_icon]
+                              [am::strings::image_type].asInt();
     EXPECT_EQ(test_id, select_submenu.GetUInteger(0));
     EXPECT_EQ(name, select_submenu.GetString(1));
     EXPECT_EQ(position, select_submenu.GetInteger(2));
+    EXPECT_EQ(image_value, select_submenu.GetString(3));
+    EXPECT_EQ(image_type, select_submenu.GetInteger(4));
     i++;
   }
 }
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 79397f5175..80ab694bd2 100644
--- a/src/components/application_manager/test/resumption/resumption_data_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_test.cc
@@ -122,13 +122,29 @@ void ResumptionDataTest::CheckCommands(sm::SmartObject& res_list) {
 void ResumptionDataTest::CheckSubmenues(sm::SmartObject& res_list) {
   for (uint32_t i = 0; i < kCountOfSubmenues_; ++i) {
     uint32_t test_id =
-        (*test_submenu_map[i + 10])[am::strings::menu_id].asUInt();
+        (*test_submenu_map[i + kSubmenuStartId_])[am::strings::menu_id]
+            .asUInt();
     std::string name =
-        (*test_submenu_map[i + 10])[am::strings::menu_name].asString();
-    int position = (*test_submenu_map[i + 10])[am::strings::position].asInt();
+        (*test_submenu_map[i + kSubmenuStartId_])[am::strings::menu_name]
+            .asString();
+    int position =
+        (*test_submenu_map[i + kSubmenuStartId_])[am::strings::position]
+            .asInt();
+    std::string icon_name =
+        (*test_submenu_map[i + kSubmenuStartId_])
+            [am::strings::sub_menu_icon][am::strings::value].asString();
+    int icon_type =
+        (*test_submenu_map[i + kSubmenuStartId_])
+            [am::strings::sub_menu_icon][am::strings::image_type].asInt();
     EXPECT_EQ(position, res_list[i][am::strings::position].asInt());
     EXPECT_EQ(test_id, res_list[i][am::strings::menu_id].asUInt());
     EXPECT_EQ(name, res_list[i][am::strings::menu_name].asString());
+    EXPECT_EQ(
+        icon_name,
+        res_list[i][am::strings::sub_menu_icon][am::strings::value].asString());
+    EXPECT_EQ(icon_type,
+              res_list[i][am::strings::sub_menu_icon][am::strings::image_type]
+                  .asInt());
   }
 }
 
@@ -456,17 +472,22 @@ void ResumptionDataTest::SetCommands() {
 }
 
 void ResumptionDataTest::SetSubmenues() {
-  sm::SmartObject sm_comm;
-  for (uint32_t i = 10; i < kCountOfSubmenues_ + 10; ++i) {
+  sm::SmartObject so_submenu;
+  for (size_t i = kSubmenuStartId_; i < kCountOfSubmenues_ + kSubmenuStartId_;
+       ++i) {
     char numb[12];
-    std::snprintf(numb, 12, "%d", i);
-    sm_comm[am::strings::menu_id] = i;
-    sm_comm[am::strings::position] = i;
-    sm_comm[am::strings::menu_name] = "SubMenu" + std::string(numb);
-    test_submenu_map[i] = new sm::SmartObject(sm_comm);
+    snprintf(numb, 12, "%lu", i);
+    std::string numb_id(numb);
+    so_submenu[am::strings::menu_id] = i;
+    so_submenu[am::strings::position] = i;
+    so_submenu[am::strings::menu_name] = "SubMenu" + numb_id;
+    so_submenu[am::strings::sub_menu_icon][am::strings::value] =
+        "submenuicon" + numb_id;
+    so_submenu[am::strings::sub_menu_icon][am::strings::type] =
+        ImageType::STATIC;
+    test_submenu_map[i] = new sm::SmartObject(so_submenu);
   }
 }
-
 void ResumptionDataTest::SetChoiceSet() {
   sm::SmartObject choice_vector;
   sm::SmartObject choice;