1 files changed, 15 insertions, 9 deletions
diff --git a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
index ffedf1b4f6..a5f7fa40d6 100644
--- a/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
+++ b/src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
@@ -227,7 +227,9 @@ class HMICommandsNotificationsTest
           CommandsTestMocks::kIsNice> {
  public:
   HMICommandsNotificationsTest()
-      : applications_(application_set_, applications_lock_), app_ptr_(NULL) {}
+      : applications_lock_(std::make_shared<sync_primitives::Lock>())
+      , applications_(application_set_, applications_lock_)
+      , app_ptr_(NULL) {}
 
   ~HMICommandsNotificationsTest() {
     // Fix DataAccessor release and WinQt crash
@@ -237,7 +239,7 @@ class HMICommandsNotificationsTest
 
  protected:
   am::ApplicationSet application_set_;
-  sync_primitives::Lock applications_lock_;
+  std::shared_ptr<sync_primitives::Lock> applications_lock_;
   DataAccessor<am::ApplicationSet> applications_;
   MockHMICapabilities mock_hmi_capabilities_;
 
@@ -365,7 +367,8 @@ typedef Types<OnVIAccPedalPositionNotification,
               OnVITirePressureNotification,
               OnVIVehicleDataNotification,
               OnVIVinNotification,
-              OnVIWiperStatusNotification> HMIOnViNotificationsTypes;
+              OnVIWiperStatusNotification>
+    HMIOnViNotificationsTypes;
 
 typedef Types<OnAppPermissionChangedNotification,
               OnAudioDataStreamingNotification,
@@ -378,7 +381,8 @@ typedef Types<OnAppPermissionChangedNotification,
               OnSDLPersistenceCompleteNotification,
               OnStatusUpdateNotification,
               OnVideoDataStreamingNotification,
-              OnRecordStartdNotification> HMIOnNotificationsListToHMITypes;
+              OnRecordStartdNotification>
+    HMIOnNotificationsListToHMITypes;
 
 typedef Types<
     CommandPair<OnAppActivatedNotification,
@@ -1123,7 +1127,8 @@ TEST_F(HMICommandsNotificationsTest,
     EXPECT_CALL(app_mngr_, application(kAppId_)).WillRepeatedly(Return(app_));
     EXPECT_CALL(mock_message_helper_,
                 GetOnAppInterfaceUnregisteredNotificationToMobile(
-                    kAppId_, *it_mobile_reason)).WillOnce(Return(notification));
+                    kAppId_, *it_mobile_reason))
+        .WillOnce(Return(notification));
     EXPECT_CALL(app_mngr_,
                 ManageMobileCommand(notification, Command::ORIGIN_SDL));
     EXPECT_CALL(app_mngr_,
@@ -1485,10 +1490,11 @@ TEST_F(HMICommandsNotificationsTest,
             [am::strings::id] = "2014";
   utils::SharedPtr<Command> command =
       CreateCommand<OnDeviceChosenNotification>(message);
-  EXPECT_CALL(app_mngr_,
-              ConnectToDevice(
-                  (*message)[am::strings::msg_params][am::strings::device_info]
-                            [am::strings::id].asString()));
+  EXPECT_CALL(
+      app_mngr_,
+      ConnectToDevice((*message)[am::strings::msg_params]
+                                [am::strings::device_info][am::strings::id]
+                                    .asString()));
   command->Run();
 }