1 files changed, 8 insertions, 35 deletions
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index a164265ab0..072199082e 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -341,42 +341,15 @@ class MockMessageHelper {
       CreateDisplayCapabilityUpdateToMobile,
       smart_objects::SmartObjectSPtr(const smart_objects::SmartObject&,
                                      application_manager::Application&));
-  MOCK_METHOD3(CreateOnServiceUpdateNotification, smart_objects::SmartObject(
-      const uint32_t app_id,
-      const hmi_apis::Common_ServiceType::eType service_type,
-      const hmi_apis::Common_ServiceEvent::eType service_event));
-  MOCK_METHOD4(CreateOnServiceUpdateNotification, smart_objects::SmartObject(
-      const uint32_t app_id,
-      const hmi_apis::Common_ServiceType::eType service_type,
-      const hmi_apis::Common_ServiceEvent::eType service_event,
-      const hmi_apis::Common_ServiceStatusUpdateReason::eType
-          service_update_reason));
-
-class MockServiceStatusUpdateNotificationBuilder
-    : public MessageHelper::ServiceStatusUpdateNotificationBuilder {
- public:
-  MockServiceStatusUpdateNotificationBuilder(
-      const MockServiceStatusUpdateNotificationBuilder& obj){};
-  MockServiceStatusUpdateNotificationBuilder(){};
-  MOCK_METHOD2(CreateBuilder,
-               MessageHelper::ServiceStatusUpdateNotificationBuilder(
-                   hmi_apis::Common_ServiceType::eType,
-                   hmi_apis::Common_ServiceEvent::eType));
-
-  MOCK_METHOD1(AddAppID,
-               MessageHelper::ServiceStatusUpdateNotificationBuilder &
-                   (const uint32_t app_id));
-
-  MOCK_METHOD1(AddServiceUpdateReason,
-               MessageHelper::ServiceStatusUpdateNotificationBuilder &
-                   (const hmi_apis::Common_ServiceStatusUpdateReason::eType));
-
-  MOCK_CONST_METHOD0(notification, smart_objects::SmartObjectSPtr());
-};
+  MOCK_METHOD4(CreateOnServiceUpdateNotification,
+               smart_objects::SmartObjectSPtr(
+                   const hmi_apis::Common_ServiceType::eType service_type,
+                   const hmi_apis::Common_ServiceEvent::eType service_event,
+                   const hmi_apis::Common_ServiceStatusUpdateReason::eType
+                       service_update_reason,
+                   const uint32_t app_id));
 
-static MockMessageHelper* message_helper_mock();
-static MockServiceStatusUpdateNotificationBuilder*
-on_service_update_builder_mock();
+  static MockMessageHelper* message_helper_mock();
 };
 
 }  // namespace application_manager