Fix build with unit tests after commands factory refactoring

 - Change enum name from command origin to command source
 - Create Mock for command factory class
 - Fix mock_app_manager after refactoring
 - Fix failed unit test

Fix unit test in progress

Add asser in plugin manager getter

Fixed UT Application manager impl

-Add method "SetRPCService" into the class ApplicationManagerImpl

Fixed UT Application manager impl

-Add method "SetRPCService" into the class ApplicationManagerImpl

Fixed UT Application manager impl

-Add method "SetRPCService" into the class ApplicationManagerImpl

Fixed UTs for hmi and mobile commands.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc
index 484af75798..9227fd8fcb 100644
--- a/src/components/application_manager/test/command_holder_test.cc
+++ b/src/components/application_manager/test/command_holder_test.cc
@@ -68,7 +68,7 @@ class CommandHolderImplTest : public testing::Test {
     ON_CALL(*mock_app_ptr_, policy_app_id())
         .WillByDefault(Return(kPolicyAppId_));
     ON_CALL(mock_app_manager_, GetRPCService())
-        .WillByDefault(ReturnRef(rpc_service_));
+        .WillByDefault(ReturnRef(mock_rpc_service_));
   }
 
   MockApplicationManager mock_app_manager_;
@@ -77,7 +77,7 @@ class CommandHolderImplTest : public testing::Test {
   const uint32_t kConnectionKey_;
   utils::SharedPtr<smart_objects::SmartObject> cmd_ptr_;
   utils::SharedPtr<MockApplication> mock_app_ptr_;
-  application_manager_test::MockRPCService rpc_service_;
+  application_manager_test::MockRPCService mock_rpc_service_;
 };
 
 TEST_F(CommandHolderImplTest, HoldOne_ExpectReleaseOne) {
@@ -86,7 +86,7 @@ TEST_F(CommandHolderImplTest, HoldOne_ExpectReleaseOne) {
       mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
 
   // Act
-  EXPECT_CALL(rpc_service_, ManageHMICommand(cmd_ptr_));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_));
   cmd_holder.Resume(mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand);
 }
 
@@ -101,7 +101,7 @@ TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
   } while (iterations < 5);
 
   // Act
-  EXPECT_CALL(rpc_service_, ManageHMICommand(cmd_ptr_)).Times(iterations);
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_)).Times(iterations);
   cmd_holder.Resume(mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand);
 }
 
@@ -114,7 +114,7 @@ TEST_F(CommandHolderImplTest, Hold_Drop_ExpectNoReleased) {
 
   // Act
   cmd_holder.Clear(mock_app_ptr_);
-  EXPECT_CALL(rpc_service_, ManageHMICommand(cmd_ptr_)).Times(0);
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_)).Times(0);
   cmd_holder.Resume(mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand);
 }
 
@@ -129,7 +129,7 @@ TEST_F(CommandHolderImplTest, Hold_ReleaseAnotherId_ExpectNoReleased) {
   utils::SharedPtr<MockApplication> another_app =
       utils::MakeShared<MockApplication>();
 
-  EXPECT_CALL(rpc_service_, ManageHMICommand(cmd_ptr_)).Times(0);
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_)).Times(0);
   cmd_holder.Resume(another_app, am::CommandHolder::CommandType::kHmiCommand);
 }
 
@@ -148,7 +148,7 @@ TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
       utils::MakeShared<MockApplication>();
   cmd_holder.Clear(another_app);
 
-  EXPECT_CALL(rpc_service_, ManageHMICommand(cmd_ptr_)).Times(iterations);
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_)).Times(iterations);
   cmd_holder.Resume(mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand);
 }
 
@@ -162,11 +162,11 @@ TEST_F(CommandHolderImplTest, Hold_Mobile_and_HMI_commands_ExpectReleased) {
       mock_app_ptr_, am::CommandHolder::CommandType::kMobileCommand, cmd_ptr_);
 
   // Act
-  EXPECT_CALL(rpc_service_, ManageHMICommand(cmd_ptr_));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_));
   cmd_holder.Resume(mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand);
 
   EXPECT_CALL(
-      rpc_service_,
+      mock_rpc_service_,
       ManageMobileCommand(cmd_ptr_,
                           am::commands::Command::CommandSource::SOURCE_MOBILE));
   cmd_holder.Resume(mock_app_ptr_,