1 files changed, 36 insertions, 18 deletions
diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc
index 8a5c639775..acde0bfd86 100644
--- a/src/components/application_manager/test/command_holder_test.cc
+++ b/src/components/application_manager/test/command_holder_test.cc
@@ -80,8 +80,10 @@ class CommandHolderImplTest : public testing::Test {
 
 TEST_F(CommandHolderImplTest, HoldOne_ExpectReleaseOne) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
   // Act
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_, _));
@@ -93,8 +95,10 @@ TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
 
   int32_t iterations = 0;
   do {
-    cmd_holder.Suspend(
-        mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+    cmd_holder.Suspend(mock_app_ptr_,
+                       am::CommandHolder::CommandType::kHmiCommand,
+                       am::commands::Command::CommandSource::SOURCE_HMI,
+                       cmd_ptr_);
     ++iterations;
   } while (iterations < 5);
 
@@ -106,10 +110,14 @@ TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
 
 TEST_F(CommandHolderImplTest, Hold_Drop_ExpectNoReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
   // Act
   cmd_holder.Clear(mock_app_ptr_);
@@ -119,10 +127,14 @@ TEST_F(CommandHolderImplTest, Hold_Drop_ExpectNoReleased) {
 
 TEST_F(CommandHolderImplTest, Hold_ReleaseAnotherId_ExpectNoReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
   // Act
   std::shared_ptr<MockApplication> another_app =
@@ -137,8 +149,10 @@ TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
 
   int32_t iterations = 0;
   do {
-    cmd_holder.Suspend(
-        mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+    cmd_holder.Suspend(mock_app_ptr_,
+                       am::CommandHolder::CommandType::kHmiCommand,
+                       am::commands::Command::CommandSource::SOURCE_HMI,
+                       cmd_ptr_);
     ++iterations;
   } while (iterations < 3);
 
@@ -155,11 +169,15 @@ TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
 TEST_F(CommandHolderImplTest, Hold_Mobile_and_HMI_commands_ExpectReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
 
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kMobileCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kMobileCommand,
+                     am::commands::Command::CommandSource::SOURCE_MOBILE,
+                     cmd_ptr_);
 
   // Act
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_, _));