Fix all misspellings of `subscriptions` in the projectfix/subscriptions_typo

17 files changed, 108 insertions, 67 deletions

diff --git a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
index f556f81764..719c514729 100644
--- a/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
@@ -3,6 +3,9 @@
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
+ Copyright (c) 2017, Livio, Inc.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
@@ -117,6 +120,13 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
       ApplicationSharedPtr app,
       const smart_objects::SmartObject& msg_params) const;
 
+  DEPRECATED void CheckVISubscribtions(
+      ApplicationSharedPtr app,
+      std::string& out_info,
+      mobile_apis::Result::eType& out_result_code,
+      smart_objects::SmartObject& out_response_params,
+      smart_objects::SmartObject& out_request_params,
+      bool& out_result);
   /**
    * @brief Checks if current application and other applications
    * were subscribed to VI, prepare data that need to send to mobile app
@@ -130,7 +140,7 @@ class SubscribeVehicleDataRequest : public CommandRequestImpl {
    * HMI
    * @param result contains result that SDL sends to mobile app.
    */
-  void CheckVISubscribtions(ApplicationSharedPtr app,
+  void CheckVISubscriptions(ApplicationSharedPtr app,
                             std::string& out_info,
                             mobile_apis::Result::eType& out_result_code,
                             smart_objects::SmartObject& out_response_params,
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index dc16e14023..4edcd36486 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -2,6 +2,9 @@
  Copyright (c) 2015, Ford Motor Company
  All rights reserved.
 
+ Copyright (c) 2017, Livio, Inc.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
@@ -212,10 +215,12 @@ class MessageHelper {
   static smart_objects::SmartObjectSPtr CreateSetAppIcon(
       const std::string& path_to_icon, uint32_t app_id);
 
+  DEPRECATED static bool SendIVISubscribtions(const uint32_t app_id,
+                                              ApplicationManager& app_mngr);
   /**
    * @brief Sends IVI subscription requests
    */
-  static bool SendIVISubscribtions(const uint32_t app_id,
+  static bool SendIVISubscriptions(const uint32_t app_id,
                                    ApplicationManager& app_mngr);
 
   /**
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
index a8032d1f65..780aac82c1 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
@@ -683,7 +683,7 @@ class ResumptionDataDB : public ResumptionData {
                          smart_objects::SmartObject& saved_app) const;
 
   /**
-   * @brief Selects data from applicationSubscribtionsArray table
+   * @brief Selects data from applicationSubscriptionsArray table
    * @param policy_app_id contains mobile application id of application
    * @param device_id contains id of device on which is running application
    * @param saved_app will contain subscriptions
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_sql_queries.h b/src/components/application_manager/include/application_manager/resumption/resumption_sql_queries.h
index d61baff7d2..33d62740f7 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_sql_queries.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_sql_queries.h
@@ -62,7 +62,7 @@ extern const std::string kDeleteFile;
 extern const std::string kDeleteApplicationFilesArray;
 extern const std::string kDeleteSubMenu;
 extern const std::string kDeleteApplicationSubMenuArray;
-extern const std::string kDeleteApplicationSubscribtionsArray;
+extern const std::string kDeleteApplicationSubscriptionsArray;
 extern const std::string kDeleteImageFromCommands;
 extern const std::string kDeleteVrCommands;
 extern const std::string kDeleteCommands;
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 0d4eeea0c4..32a2315f23 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -282,7 +282,7 @@ extern const char* application_choice_sets;
 extern const char* application_global_properties;
 extern const char* application_vehicle_info;
 extern const char* application_buttons;
-extern const char* application_subscribtions;
+extern const char* application_subscriptions;
 extern const char* application_files;
 extern const char* application_show;
 extern const char* resumption;
diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
index 28cf4c754c..15ba7999bd 100644
--- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
@@ -3,6 +3,9 @@
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
+ Copyright (c) 2017, Livio, Inc.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
@@ -116,7 +119,7 @@ void SubscribeVehicleDataRequest::Run() {
   smart_objects::SmartObject response_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
   bool result = false;
-  CheckVISubscribtions(
+  CheckVISubscriptions(
       app, info, result_code, response_params, msg_params, result);
 
   if (mobile_apis::Result::INVALID_ENUM != result_code) {
@@ -365,6 +368,21 @@ void SubscribeVehicleDataRequest::CheckVISubscribtions(
     smart_objects::SmartObject& out_response_params,
     smart_objects::SmartObject& out_request_params,
     bool& out_result) {
+  CheckVISubscriptions(app,
+                       out_info,
+                       out_result_code,
+                       out_response_params,
+                       out_request_params,
+                       out_result);
+}
+
+void SubscribeVehicleDataRequest::CheckVISubscriptions(
+    ApplicationSharedPtr app,
+    std::string& out_info,
+    mobile_apis::Result::eType& out_result_code,
+    smart_objects::SmartObject& out_response_params,
+    smart_objects::SmartObject& out_request_params,
+    bool& out_result) {
   // counter for items to subscribe
   VehicleInfoSubscriptions::size_type items_to_subscribe = 0;
   // counter for subscribed items by application
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index f544b5161e..6e58ef57fa 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -2,6 +2,9 @@
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
+ Copyright (c) 2017, Livio, Inc.
+ All rights reserved.
+
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
 
@@ -1058,6 +1061,11 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateSetAppIcon(
 
 bool MessageHelper::SendIVISubscribtions(const uint32_t app_id,
                                          ApplicationManager& app_mngr) {
+  return SendIVISubscriptions(app_id, app_mngr);
+}
+
+bool MessageHelper::SendIVISubscriptions(const uint32_t app_id,
+                                         ApplicationManager& app_mngr) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   bool result = true;
diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
index 72f2246e7c..e3fd423970 100644
--- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
+++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
@@ -606,30 +606,30 @@ void ResumeCtrlImpl::AddSubscriptions(
     ApplicationSharedPtr application,
     const smart_objects::SmartObject& saved_app) {
   LOG4CXX_AUTO_TRACE(logger_);
-  if (saved_app.keyExists(strings::application_subscribtions)) {
-    const smart_objects::SmartObject& subscribtions =
-        saved_app[strings::application_subscribtions];
+  if (saved_app.keyExists(strings::application_subscriptions)) {
+    const smart_objects::SmartObject& subscriptions =
+        saved_app[strings::application_subscriptions];
 
-    if (subscribtions.keyExists(strings::application_buttons)) {
-      const smart_objects::SmartObject& subscribtions_buttons =
-          subscribtions[strings::application_buttons];
+    if (subscriptions.keyExists(strings::application_buttons)) {
+      const smart_objects::SmartObject& subscriptions_buttons =
+          subscriptions[strings::application_buttons];
       mobile_apis::ButtonName::eType btn;
-      for (size_t i = 0; i < subscribtions_buttons.length(); ++i) {
+      for (size_t i = 0; i < subscriptions_buttons.length(); ++i) {
         btn = static_cast<mobile_apis::ButtonName::eType>(
-            (subscribtions_buttons[i]).asInt());
+            (subscriptions_buttons[i]).asInt());
         application->SubscribeToButton(btn);
       }
     }
     MessageHelper::SendAllOnButtonSubscriptionNotificationsForApp(
         application, application_manager_);
 
-    if (subscribtions.keyExists(strings::application_vehicle_info)) {
-      const smart_objects::SmartObject& subscribtions_ivi =
-          subscribtions[strings::application_vehicle_info];
+    if (subscriptions.keyExists(strings::application_vehicle_info)) {
+      const smart_objects::SmartObject& subscriptions_ivi =
+          subscriptions[strings::application_vehicle_info];
       mobile_apis::VehicleDataType::eType ivi;
-      for (size_t i = 0; i < subscribtions_ivi.length(); ++i) {
+      for (size_t i = 0; i < subscriptions_ivi.length(); ++i) {
         ivi = static_cast<mobile_apis::VehicleDataType::eType>(
-            (subscribtions_ivi[i]).asInt());
+            (subscriptions_ivi[i]).asInt());
         application->SubscribeToIVI(ivi);
       }
       ProcessHMIRequests(MessageHelper::GetIVISubscriptionRequests(
diff --git a/src/components/application_manager/src/resumption/resumption_data_db.cc b/src/components/application_manager/src/resumption/resumption_data_db.cc
index b031fd0afd..2fe7330a9c 100644
--- a/src/components/application_manager/src/resumption/resumption_data_db.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_db.cc
@@ -953,7 +953,7 @@ bool ResumptionDataDB::SelectSubscriptionsData(
     return false;
   }
 
-  saved_app[strings::application_subscribtions] = SmartObject(SmartType_Map);
+  saved_app[strings::application_subscriptions] = SmartObject(SmartType_Map);
 
   if (0 == count_item) {
     LOG4CXX_INFO(logger_, "Application does not contain subscriptions data");
@@ -972,8 +972,8 @@ bool ResumptionDataDB::SelectSubscriptionsData(
   size_t buttons_idx = 0;
   size_t vi_idx = 0;
   /* Position of data in "select_subscriptions" :
-     field "vehicleValue" from table "applicationSubscribtionsArray" = 0
-     field "ButtonNameValue" from table "applicationSubscribtionsArray" = 1*/
+     field "vehicleValue" from table "applicationSubscriptionsArray" = 0
+     field "ButtonNameValue" from table "applicationSubscriptionsArray" = 1*/
   while (select_subscriptions.Next()) {
     if (!select_subscriptions.IsNull(0)) {
       application_vehicle_info[vi_idx++] = select_subscriptions.GetInteger(0);
@@ -983,12 +983,12 @@ bool ResumptionDataDB::SelectSubscriptionsData(
     }
   }
   if (!application_buttons.empty()) {
-    saved_app[strings::application_subscribtions]
+    saved_app[strings::application_subscriptions]
              [strings::application_buttons] = application_buttons;
   }
 
   if (!application_vehicle_info.empty()) {
-    saved_app[strings::application_subscribtions]
+    saved_app[strings::application_subscriptions]
              [strings::application_vehicle_info] = application_vehicle_info;
   }
   LOG4CXX_INFO(logger_, "Subscriptions were restored from DB successfully");
@@ -1504,9 +1504,9 @@ bool ResumptionDataDB::DeleteSavedSubscriptions(
   LOG4CXX_AUTO_TRACE(logger_);
 
   if (!ExecQueryToDeleteData(
-          policy_app_id, device_id, kDeleteApplicationSubscribtionsArray)) {
+          policy_app_id, device_id, kDeleteApplicationSubscriptionsArray)) {
     LOG4CXX_WARN(logger_,
-                 "Incorrect delete from applicationSubscribtionsArray.");
+                 "Incorrect delete from applicationSubscriptionsArray.");
     return false;
   }
   return true;
@@ -1899,7 +1899,7 @@ bool ResumptionDataDB::SaveApplicationToDB(
   }
   if (!InsertSubscriptionsData(GetApplicationSubscriptions(application),
                                application_primary_key)) {
-    LOG4CXX_WARN(logger_, "Incorrect insert subscribtions data to DB.");
+    LOG4CXX_WARN(logger_, "Incorrect insert subscriptions data to DB.");
     db_->RollbackTransaction();
     return false;
   }
@@ -1956,9 +1956,9 @@ bool ResumptionDataDB::SaveApplicationToDB(
     db_->RollbackTransaction();
     return false;
   }
-  if (!InsertSubscriptionsData(application["subscribtions"],
+  if (!InsertSubscriptionsData(application["subscriptions"],
                                application_primary_key)) {
-    LOG4CXX_WARN(logger_, "Incorrect insert subscribtions data to DB.");
+    LOG4CXX_WARN(logger_, "Incorrect insert subscriptions data to DB.");
     db_->RollbackTransaction();
     return false;
   }
@@ -2164,9 +2164,9 @@ bool ResumptionDataDB::InsertSubscriptionsData(
     return false;
   }
   /* Positions of binding data for "insert_subscriptions":
-       field "idApplication" from table "applicationSubscribtionsArray" = 0
-       field "vehicleValue" from table "applicationSubscribtionsArray" = 1
-       field "ButtonNameValue" from table "applicationSubscribtionsArray" = 2*/
+       field "idApplication" from table "applicationSubscriptionsArray" = 0
+       field "vehicleValue" from table "applicationSubscriptionsArray" = 1
+       field "ButtonNameValue" from table "applicationSubscriptionsArray" = 2*/
   for (size_t i = 0; i < max_length; ++i) {
     insert_subscriptions.Bind(0, application_primary_key);
     if (i < vi_sub_length) {
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc
index e99d8bae26..3925fb57da 100644
--- a/src/components/application_manager/src/resumption/resumption_data_json.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_json.cc
@@ -95,7 +95,7 @@ void ResumptionDataJson::SaveApplication(
   json_app[strings::application_global_properties] = tmp;
   Formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationSubscriptions(application), tmp);
-  json_app[strings::application_subscribtions] = tmp;
+  json_app[strings::application_subscriptions] = tmp;
   Formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationFiles(application), tmp);
   json_app[strings::application_files] = tmp;
@@ -473,7 +473,7 @@ bool ResumptionDataJson::DropAppDataResumption(const std::string& device_id,
   application[strings::application_submenus].clear();
   application[strings::application_choice_sets].clear();
   application[strings::application_global_properties].clear();
-  application[strings::application_subscribtions].clear();
+  application[strings::application_subscriptions].clear();
   application[strings::application_files].clear();
   application.removeMember(strings::grammar_id);
   LOG4CXX_DEBUG(logger_,
diff --git a/src/components/application_manager/src/resumption/resumption_sql_queries.cc b/src/components/application_manager/src/resumption/resumption_sql_queries.cc
index 7a5008542c..9ca91e859a 100644
--- a/src/components/application_manager/src/resumption/resumption_sql_queries.cc
+++ b/src/components/application_manager/src/resumption/resumption_sql_queries.cc
@@ -298,8 +298,8 @@ const std::string kCreateSchema =
     "CREATE INDEX IF NOT EXISTS "
     "`applicationSubMenuArray.fk_Application_idx` "
     "  ON `applicationSubMenuArray`(`idApplication`); "
-    "CREATE TABLE IF NOT EXISTS `applicationSubscribtionsArray`( "
-    "  `idapplicationSubscribtionsArray` INTEGER PRIMARY KEY NOT NULL, "
+    "CREATE TABLE IF NOT EXISTS `applicationSubscriptionsArray`( "
+    "  `idapplicationSubscriptionsArray` INTEGER PRIMARY KEY NOT NULL, "
     "  `vehicleValue` INTEGER, "
     "  `ButtonNameValue` INTEGER, "
     "  `idApplication` INTEGER, "
@@ -308,8 +308,8 @@ const std::string kCreateSchema =
     "    REFERENCES `application`(`idApplication`) "
     "  ); "
     "CREATE INDEX IF NOT EXISTS "
-    "`applicationSubscribtionsArray.fk_Application_idx` "
-    "  ON `applicationSubscribtionsArray`(`idApplication`); "
+    "`applicationSubscriptionsArray.fk_Application_idx` "
+    "  ON `applicationSubscriptionsArray`(`idApplication`); "
     "CREATE TABLE IF NOT EXISTS `_internal_data`( "
     "   `db_version_hash` INTEGER "
     "  ); "
@@ -365,8 +365,8 @@ const std::string kDropSchema =
     "DROP TABLE IF EXISTS `applicationSubMenuArray`; "
     "DROP INDEX IF EXISTS `applicationSubMenuArray.fk_subMenu_idx`; "
     "DROP INDEX IF EXISTS `applicationSubMenuArray.fk_Application_idx`; "
-    "DROP TABLE IF EXISTS `applicationSubscribtionsArray`; "
-    "DROP INDEX IF EXISTS `applicationSubscribtionsArray.fk_Application_idx`; "
+    "DROP TABLE IF EXISTS `applicationSubscriptionsArray`; "
+    "DROP INDEX IF EXISTS `applicationSubscriptionsArray.fk_Application_idx`; "
     "DROP TABLE IF EXISTS `_internal_data`; "
     "COMMIT; "
     "VACUUM;";
@@ -477,8 +477,8 @@ const std::string kDeleteApplicationSubMenuArray =
     "FROM `application` "
     "WHERE `appID` = ? AND `deviceID` = ?)";
 
-const std::string kDeleteApplicationSubscribtionsArray =
-    "DELETE FROM `applicationSubscribtionsArray` "
+const std::string kDeleteApplicationSubscriptionsArray =
+    "DELETE FROM `applicationSubscriptionsArray` "
     "WHERE `idApplication` = (SELECT `idApplication` "
     "FROM `application` "
     "WHERE `appID` = ? AND `deviceID` = ?)";
@@ -713,7 +713,7 @@ const std::string kInsertVrCommand =
     "(?, ?, ?);";
 
 const std::string kInsertSubscriptions =
-    "INSERT INTO `applicationSubscribtionsArray` "
+    "INSERT INTO `applicationSubscriptionsArray` "
     "(`idApplication`, `vehicleValue`, `ButtonNameValue`) "
     "VALUES "
     "(?, ?, ?);";
@@ -851,14 +851,14 @@ const std::string kSelectCommands =
 
 const std::string kSelectCountSubscriptions =
     "SELECT COUNT (`idApplication`) "
-    "FROM `applicationSubscribtionsArray` "
+    "FROM `applicationSubscriptionsArray` "
     "WHERE `idApplication` = (SELECT `idApplication` "
     "FROM `application` "
     "WHERE `appID` = ? AND `deviceID` = ?);";
 
 const std::string kSelectSubscriptions =
     "SELECT `vehicleValue`, `ButtonNameValue` "
-    "FROM `applicationSubscribtionsArray` "
+    "FROM `applicationSubscriptionsArray` "
     "WHERE `idApplication` = (SELECT `idApplication` "
     "FROM `application` "
     "WHERE `appID` = ? AND `deviceID` = ?);";
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index 0bf3287e42..c3aba90dd5 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -246,7 +246,7 @@ const char* application_choice_sets = "applicationChoiceSets";
 const char* application_global_properties = "globalProperties";
 const char* application_vehicle_info = "vehicleInfo";
 const char* application_buttons = "buttons";
-const char* application_subscribtions = "subscribtions";
+const char* application_subscriptions = "subscriptions";
 const char* application_files = "applicationFiles";
 const char* application_show = "applicationShow";
 const char* resumption = "resumption";
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 f3e49001fa..85801d7e73 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -421,7 +421,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscribeOnButtons) {
   smart_objects::SmartObject saved_app;
   saved_app[application_manager::strings::hash_id] = kHash_;
   saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
-  saved_app[application_manager::strings::application_subscribtions] =
+  saved_app[application_manager::strings::application_subscriptions] =
       test_subscriptions;
 
   // Check RestoreApplicationData
@@ -466,7 +466,7 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToIVI) {
   smart_objects::SmartObject saved_app;
   saved_app[application_manager::strings::hash_id] = kHash_;
   saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
-  saved_app[application_manager::strings::application_subscribtions] =
+  saved_app[application_manager::strings::application_subscriptions] =
       test_subscriptions;
 
   // Check RestoreApplicationData
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 cf0ebb7fd2..001e06ca58 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
@@ -165,7 +165,7 @@ class ResumptionDataDBTest : public ResumptionDataTest {
       "DELETE FROM `applicationCommandsArray`; "
       "DELETE FROM `applicationFilesArray`; "
       "DELETE FROM `applicationSubMenuArray`; "
-      "DELETE FROM `applicationSubscribtionsArray`; "
+      "DELETE FROM `applicationSubscriptionsArray`; "
       "DELETE FROM `_internal_data`; ";
 
  private:
@@ -863,8 +863,8 @@ TEST_F(ResumptionDataDBTest, DropAppResumptionData) {
   EXPECT_TRUE(app.keyExists(am::strings::application_global_properties) &&
               app[am::strings::application_global_properties].empty());
 
-  EXPECT_TRUE(app.keyExists(am::strings::application_subscribtions) &&
-              app[am::strings::application_subscribtions].empty());
+  EXPECT_TRUE(app.keyExists(am::strings::application_subscriptions) &&
+              app[am::strings::application_subscriptions].empty());
 
   EXPECT_TRUE(app.keyExists(am::strings::application_files) &&
               app[am::strings::application_files].empty());
diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
index e017c39497..a38afd8bdf 100644
--- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
@@ -375,8 +375,8 @@ TEST_F(ResumptionDataJsonTest, DropAppDataResumption) {
   EXPECT_TRUE(app.keyExists(am::strings::application_global_properties) &&
               app[am::strings::application_global_properties].empty());
 
-  EXPECT_TRUE(app.keyExists(am::strings::application_subscribtions) &&
-              app[am::strings::application_subscribtions].empty());
+  EXPECT_TRUE(app.keyExists(am::strings::application_subscriptions) &&
+              app[am::strings::application_subscriptions].empty());
 
   EXPECT_TRUE(app.keyExists(am::strings::application_files) &&
               app[am::strings::application_files].empty());
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 1f13ff78f3..65e01b6119 100644
--- a/src/components/application_manager/test/resumption/resumption_data_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_test.cc
@@ -72,7 +72,7 @@ void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) {
 
   CheckGlobalProporties(
       resume_app_list[am::strings::application_global_properties]);
-  CheckSubscriptions(resume_app_list[am::strings::application_subscribtions]);
+  CheckSubscriptions(resume_app_list[am::strings::application_subscriptions]);
 }
 
 void ResumptionDataTest::CheckCommands(sm::SmartObject& res_list) {
diff --git a/src/components/application_manager/test/resumption_sql_queries_test.cc b/src/components/application_manager/test/resumption_sql_queries_test.cc
index 08fa0a3eb5..28a3383086 100644
--- a/src/components/application_manager/test/resumption_sql_queries_test.cc
+++ b/src/components/application_manager/test/resumption_sql_queries_test.cc
@@ -79,7 +79,7 @@ const string kDeleteData =
     "DELETE FROM `applicationCommandsArray`; "
     "DELETE FROM `applicationFilesArray`; "
     "DELETE FROM `applicationSubMenuArray`; "
-    "DELETE FROM `applicationSubscribtionsArray`; "
+    "DELETE FROM `applicationSubscriptionsArray`; "
     "DELETE FROM `_internal_data`; "
     "COMMIT; "
     "VACUUM;";
@@ -326,7 +326,7 @@ class ResumptionSqlQueriesTest : public ::testing::Test {
     db_schema.push_back("applicationCommandsArray");
     db_schema.push_back("applicationFilesArray");
     db_schema.push_back("applicationSubMenuArray");
-    db_schema.push_back("applicationSubscribtionsArray");
+    db_schema.push_back("applicationSubscriptionsArray");
     db_schema.push_back("_internal_data");
     std::sort(db_schema.begin(), db_schema.end());
   }
@@ -1386,7 +1386,7 @@ TEST_F(ResumptionSqlQueriesTest,
 }
 
 TEST_F(ResumptionSqlQueriesTest,
-       kDeleteApplicationSubscribtionsArray_ExpectDataDeleted) {
+       kDeleteApplicationSubscriptionsArray_ExpectDataDeleted) {
   // Arrange
   SQLQuery temp_query(db());
   int64_t key1 = FillImageTable(temp_query, 1, test_image).LastInsertId();
@@ -1410,12 +1410,12 @@ TEST_F(ResumptionSqlQueriesTest,
   key1 = FillApplicationFilesArrayTable(temp_query, key1, key2).LastInsertId();
   FillAppSubscriptionsArrayTable(temp_query, 7, 2, key1);
   // Check
-  const std::string select_count_applicationSubscribtionsArray =
-      "SELECT COUNT(*) FROM applicationSubscribtionsArray;";
+  const std::string select_count_applicationSubscriptionsArray =
+      "SELECT COUNT(*) FROM applicationSubscriptionsArray;";
   ValToPosPair p1(0, app_id2);
   ValToPosPair p2(1, device_id);
-  CheckDeleteQuery(select_count_applicationSubscribtionsArray,
-                   kDeleteApplicationSubscribtionsArray,
+  CheckDeleteQuery(select_count_applicationSubscriptionsArray,
+                   kDeleteApplicationSubscriptionsArray,
                    p1,
                    p2,
                    1,
@@ -2211,17 +2211,17 @@ TEST_F(ResumptionSqlQueriesTest, kInsertSubscriptions_ExpectDataInserted) {
   SQLQuery temp_query(db());
   FillAppSubscriptionsArrayTable(temp_query, 2, 3, 4);
   // Checks
-  const std::string select_count_applicationSubscribtionsArray =
-      "SELECT COUNT(*) FROM applicationSubscribtionsArray;";
-  CheckSelectQuery(select_count_applicationSubscribtionsArray, 1, 0);
+  const std::string select_count_applicationSubscriptionsArray =
+      "SELECT COUNT(*) FROM applicationSubscriptionsArray;";
+  CheckSelectQuery(select_count_applicationSubscriptionsArray, 1, 0);
   const std::string select_idApplication =
-      "SELECT idApplication FROM applicationSubscribtionsArray;";
+      "SELECT idApplication FROM applicationSubscriptionsArray;";
   CheckSelectQuery(select_idApplication, 4, 0);
   const std::string select_vehicleValue =
-      "SELECT vehicleValue FROM applicationSubscribtionsArray;";
+      "SELECT vehicleValue FROM applicationSubscriptionsArray;";
   CheckSelectQuery(select_vehicleValue, 2, 0);
   const std::string select_ButtonNameValue =
-      "SELECT ButtonNameValue FROM applicationSubscribtionsArray;";
+      "SELECT ButtonNameValue FROM applicationSubscriptionsArray;";
   CheckSelectQuery(select_ButtonNameValue, 3, 0);
 }