Merge Develop

1 files changed, 10 insertions, 7 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc
index 30f01e390e..3d6a345ced 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/change_registration_test.cc
@@ -88,7 +88,8 @@ class ChangeRegistrationRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
   ChangeRegistrationRequestTest()
-      : mock_app_(CreateMockApp())
+      : app_set_lock_ptr_(std::make_shared<sync_primitives::Lock>())
+      , mock_app_(CreateMockApp())
       , supported_languages_(CreateMessage(smart_objects::SmartType_Array)) {}
 
   MessageSharedPtr CreateMsgFromMobile() {
@@ -158,7 +159,8 @@ class ChangeRegistrationRequestTest
     MockAppPtr app = CreateMockApp();
     app->set_name(name);
 
-    DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_);
+    DataAccessor<am::ApplicationSet> accessor(application_set,
+                                              app_set_lock_ptr_);
 
     application_set.insert(app);
 
@@ -265,7 +267,8 @@ class ChangeRegistrationRequestTest
                  NiceMock<application_manager_test::MockHMICapabilities>,
                  application_manager_test::MockHMICapabilities>::Result
       MockHMICapabilities;
-  sync_primitives::Lock app_set_lock_;
+  std::shared_ptr<sync_primitives::Lock> app_set_lock_ptr_;
+  MockHMICapabilities hmi_capabilities_;
   MockAppPtr mock_app_;
   MessageSharedPtr supported_languages_;
   MockPolicyHandlerInterface mock_policy_handler_;
@@ -284,7 +287,7 @@ TEST_F(ChangeRegistrationRequestTest,
   MockAppPtr app = CreateMockApp();
   app->set_name(name);
 
-  DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_);
+  DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_ptr_);
 
   application_set.insert(app);
 
@@ -373,7 +376,7 @@ TEST_F(ChangeRegistrationRequestTest,
   const utils::custom_string::CustomString name("name");
   MockAppPtr app = CreateMockApp();
   app->set_name(name);
-  DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_);
+  DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_ptr_);
   application_set.insert(app);
   EXPECT_CALL(app_mngr_, applications()).WillOnce(Return(accessor));
   EXPECT_CALL(*app, name()).WillOnce(ReturnRef(name));
@@ -477,7 +480,7 @@ TEST_F(ChangeRegistrationRequestTest,
   MockAppPtr app = CreateMockApp();
   app->set_name(name);
 
-  DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_);
+  DataAccessor<am::ApplicationSet> accessor(application_set, app_set_lock_ptr_);
 
   application_set.insert(app);
 
@@ -556,4 +559,4 @@ TEST_F(ChangeRegistrationRequestTest,
 }  // namespace mobile_commands_test
 }  // namespace commands_test
 }  // namespace components
-}  // namespace tests
+}  // namespace test