1 files changed, 16 insertions, 14 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 99491873be..5d940c4f4c 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) {
@@ -456,11 +449,22 @@ 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));
+
   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);
@@ -583,8 +587,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
-          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-          _))
+          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_SubscribeButton), _))
       .WillOnce(Return(true));
   EXPECT_CALL(
       mock_rpc_service_,
@@ -848,8 +851,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
-          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-          _))
+          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_SubscribeButton), _))
       .WillOnce(Return(true));
   EXPECT_CALL(
       mock_rpc_service_,