1 files changed, 28 insertions, 22 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
index 4572a6d907..0624c873fa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
@@ -289,8 +289,7 @@ class RegisterAppInterfaceRequestTest
     EXPECT_CALL(
         mock_rpc_service_,
         ManageHMICommand(
-            HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-            _))
+            HMIResultCodeIs(hmi_apis::FunctionID::Buttons_SubscribeButton), _))
         .Times(0);
 
     EXPECT_CALL(
@@ -350,12 +349,6 @@ class RegisterAppInterfaceRequestTest
                     hmi_apis::FunctionID::BasicCommunication_OnAppRegistered),
                 _))
         .WillByDefault(Return(true));
-    ON_CALL(
-        mock_rpc_service_,
-        ManageHMICommand(
-            HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-            _))
-        .WillByDefault(Return(true));
   }
 
   void SetCommonPreconditionsToCheckWithPolicyData(MockAppPtr mock_app) {
@@ -416,6 +409,7 @@ TEST_F(RegisterAppInterfaceRequestTest, DefaultTimeout_CheckIfZero_SUCCESS) {
 TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
   InitBasicMessage();
   (*msg_)[am::strings::msg_params][am::strings::hash_id] = kAppId1;
+
   EXPECT_CALL(app_mngr_, WaitForHmiIsReady()).WillOnce(Return(true));
   EXPECT_CALL(app_mngr_, IsApplicationForbidden(_, _)).WillOnce(Return(false));
 
@@ -455,11 +449,33 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
                       hmi_apis::FunctionID::BasicCommunication_OnAppRegistered),
                   _))
       .WillOnce(Return(true));
+
+  ON_CALL(mock_hmi_interfaces_,
+          GetInterfaceState(
+              application_manager::HmiInterfaces::HMI_INTERFACE_Buttons))
+      .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
+
+  ON_CALL(
+      mock_hmi_interfaces_,
+      GetInterfaceFromFunction(hmi_apis::FunctionID::Buttons_SubscribeButton))
+      .WillByDefault(
+          Return(application_manager::HmiInterfaces::HMI_INTERFACE_Buttons));
+
+  ON_CALL(mock_hmi_capabilities_, is_ui_cooperating())
+      .WillByDefault(Return(true));
+
+  MessageSharedPtr button_caps_ptr =
+      CreateMessage(smart_objects::SmartType_Map);
+  (*button_caps_ptr)[0][am::hmi_response::button_name] =
+      mobile_apis::ButtonName::CUSTOM_BUTTON;
+
+  ON_CALL(mock_hmi_capabilities_, button_capabilities())
+      .WillByDefault(Return(button_caps_ptr));
+
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
-          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-          _))
+          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_SubscribeButton), _))
       .WillOnce(Return(true));
 
   application_manager::DisplayCapabilitiesBuilder builder(*mock_app);
@@ -501,6 +517,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
   InitBasicMessage();
 
   ON_CALL(app_mngr_, WaitForHmiIsReady()).WillByDefault(Return(true));
+
   EXPECT_CALL(app_mngr_, IsApplicationForbidden(_, _)).WillOnce(Return(false));
 
   ON_CALL(mock_connection_handler_,
@@ -581,12 +598,6 @@ TEST_F(RegisterAppInterfaceRequestTest,
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
-          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-          _))
-      .WillOnce(Return(true));
-  EXPECT_CALL(
-      mock_rpc_service_,
-      ManageHMICommand(
           HMIResultCodeIs(hmi_apis::FunctionID::VR_ChangeRegistration), _))
       .WillOnce(Return(true));
   EXPECT_CALL(
@@ -802,6 +813,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
   (*msg_)[am::strings::params][am::strings::connection_key] = kConnectionKey2;
 
   ON_CALL(app_mngr_, WaitForHmiIsReady()).WillByDefault(Return(true));
+
   EXPECT_CALL(app_mngr_, IsApplicationForbidden(kConnectionKey2, kAppId1))
       .WillOnce(Return(false));
 
@@ -845,12 +857,6 @@ TEST_F(RegisterAppInterfaceRequestTest,
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
-          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-          _))
-      .WillOnce(Return(true));
-  EXPECT_CALL(
-      mock_rpc_service_,
-      ManageHMICommand(
           HMIResultCodeIs(hmi_apis::FunctionID::VR_ChangeRegistration), _))
       .WillOnce(Return(true));
   EXPECT_CALL(