Convert DataAccessor to use a shared_ptr to a lock and some fixes after rebasefeature/vehicle_info_plugin_rebased

7 files changed, 20 insertions, 16 deletions

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
index e26b5b9e0f..78d20c6b13 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
@@ -108,7 +108,8 @@ TEST_F(OnInteriorVehicleDataNotificationTest,
   MessageSharedPtr mobile_message = CreateBasicMessage();
   ApplicationSet app_set = {mock_app_};
   MessageSharedPtr message;
-  const sync_primitives::Lock apps_lock;
+  std::shared_ptr<sync_primitives::Lock> apps_lock =
+      std::make_shared<sync_primitives::Lock>();
   DataAccessor<ApplicationSet> accessor(app_set, apps_lock);
   // Expectations
   EXPECT_CALL(app_mngr_, applications()).WillOnce(Return(accessor));
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
index 0c61a7d118..f3ac768a4e 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
@@ -134,7 +134,8 @@ TEST_F(RCOnRemoteControlSettingsNotificationTest,
 
   ApplicationSet app_set = {mock_app_};
 
-  const sync_primitives::Lock apps_lock;
+  std::shared_ptr<sync_primitives::Lock> apps_lock =
+      std::make_shared<sync_primitives::Lock>();
   DataAccessor<ApplicationSet> accessor(app_set, apps_lock);
   // Expectations
   EXPECT_CALL(app_mngr_, applications()).WillOnce(Return(accessor));
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
index 0ff17a9c59..9058249661 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
@@ -84,6 +84,7 @@ class RAManagerTest : public ::testing::Test {
             protocol_handler::ServiceType::kRpc)))
       , mock_app_1_(utils::MakeShared<NiceMock<MockApplication> >())
       , mock_app_2_(utils::MakeShared<NiceMock<MockApplication> >())
+      , apps_lock_(std::make_shared<sync_primitives::Lock>())
       , apps_da_(apps_, apps_lock_) {
     ON_CALL(mock_app_mngr_, GetPolicyHandler())
         .WillByDefault(ReturnRef(mock_policy_handler_));
@@ -109,7 +110,7 @@ class RAManagerTest : public ::testing::Test {
   utils::SharedPtr<NiceMock<MockApplication> > mock_app_1_;
   utils::SharedPtr<NiceMock<MockApplication> > mock_app_2_;
   application_manager::ApplicationSet apps_;
-  const sync_primitives::Lock apps_lock_;
+  const std::shared_ptr<sync_primitives::Lock> apps_lock_;
   DataAccessor<application_manager::ApplicationSet> apps_da_;
 };
 
@@ -395,7 +396,8 @@ TEST_F(RAManagerTest, AppsDisallowed_ReleaseAllResources) {
 
   application_manager::ApplicationSet apps;
   apps.insert(mock_app_1_);
-  const sync_primitives::Lock apps_lock;
+  std::shared_ptr<sync_primitives::Lock> apps_lock =
+      std::make_shared<sync_primitives::Lock>();
   DataAccessor<application_manager::ApplicationSet> apps_da(apps, apps_lock);
 
   EXPECT_CALL(mock_app_mngr_, applications()).WillRepeatedly(Return(apps_da));
@@ -456,7 +458,8 @@ TEST_F(RAManagerTest, AppGotRevokedModulesWithPTU_ReleaseRevokedResource) {
 
   application_manager::ApplicationSet apps;
   apps.insert(mock_app_1_);
-  const sync_primitives::Lock apps_lock;
+  std::shared_ptr<sync_primitives::Lock> apps_lock =
+      std::make_shared<sync_primitives::Lock>();
   DataAccessor<application_manager::ApplicationSet> apps_da(apps, apps_lock);
 
   EXPECT_CALL(mock_app_mngr_, applications()).WillRepeatedly(Return(apps_da));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
index b7765a2ce8..264ff2d788 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc
@@ -317,8 +317,8 @@ TEST_F(AddCommandRequestTest, Run_CMDIconHasError_EXPECT_INVALID_DATA) {
   EXPECT_CALL(*mock_app_, FindCommand(kCmdId)).WillOnce(Return(so_ptr_.get()));
   am::CommandsMap commands_map;
   EXPECT_CALL(*mock_app_, commands_map())
-      .WillRepeatedly(Return(
-          DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
+      .WillRepeatedly(Return(DataAccessor<application_manager::CommandsMap>(
+          commands_map, lock_ptr_)));
 
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(
@@ -384,8 +384,8 @@ TEST_F(AddCommandRequestTest,
   const am::CommandsMap commands_map =
       CreateCommandsMap(first_command, second_command);
   EXPECT_CALL(*mock_app_, commands_map())
-      .WillRepeatedly(Return(
-          DataAccessor<application_manager::CommandsMap>(commands_map, lock_)));
+      .WillRepeatedly(Return(DataAccessor<application_manager::CommandsMap>(
+          commands_map, lock_ptr_)));
   EXPECT_CALL(*mock_app_, FindSubMenu(kSecondParentId))
       .WillOnce(Return(so_ptr_.get()));
 
@@ -493,7 +493,8 @@ TEST_F(AddCommandRequestTest, GetRunMethods_SUCCESS) {
   EXPECT_CALL(*mock_app_, commands_map())
       .WillRepeatedly(Return(DataAccessor<application_manager::CommandsMap>(
           commands_map, lock_ptr_)));
-  ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_));
+  ON_CALL(app_mngr_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_AddCommand)))
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc
index f14faaae78..9fad021c3e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_sub_menu_request_test.cc
@@ -95,7 +95,7 @@ TEST_F(AddSubMenuRequestTest, Run_ImageVerificationFailed_EXPECT_INVALID_DATA) {
 
   EXPECT_CALL(mock_message_helper_, VerifyImage(image, _, _))
       .WillOnce(Return(mobile_apis::Result::INVALID_DATA));
-  EXPECT_CALL(app_mngr_,
+  EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(
                   MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), _));
   utils::SharedPtr<AddSubMenuRequest> request_ptr =
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
index b3c877945c..b15b7006e6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
@@ -69,8 +69,6 @@ class VehicleInfoPlugin : public plugins::RPCPlugin {
   void ProcessResumptionSubscription(app_mngr::Application& app,
                                      VehicleInfoAppExtension& ext);
 
-  static const VehicleData vehicle_data_;
-
  private:
   void DeleteSubscriptions(app_mngr::ApplicationSharedPtr app);
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
index 1afcf8d135..3f0cc1d789 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
@@ -70,7 +70,7 @@ class UnsubscribeVehicleRequestTest
  public:
   UnsubscribeVehicleRequestTest()
       : mock_app_(CreateMockApp())
-	  , app_set_lock_ptr_(std::make_shared<sync_primitives::Lock>())
+      , app_set_lock_ptr_(std::make_shared<sync_primitives::Lock>())
       , vi_app_extension_ptr_(
             utils::MakeShared<vehicle_info_plugin::VehicleInfoAppExtension>(
                 vi_plugin_, *mock_app_)) {}
@@ -92,8 +92,8 @@ class UnsubscribeVehicleRequestTest
   }
 
   MockAppPtr mock_app_;
-  application_manager::AppExtensionPtr vi_app_extension_ptr_;
   std::shared_ptr<sync_primitives::Lock> app_set_lock_ptr_;
+  application_manager::AppExtensionPtr vi_app_extension_ptr_;
   vehicle_info_plugin::VehicleInfoPlugin vi_plugin_;
 };
 
@@ -209,7 +209,7 @@ TEST_F(UnsubscribeVehicleRequestTest,
   command->Run();
 }
 
-void UnsubscribeVehicleRequestTest::UnsubscribeSuccessfully() {
+TEST_F(UnsubscribeVehicleRequestTest, Run_UnsubscribeDataDisabled_UNSUCCESS) {
   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;