1 files changed, 25 insertions, 17 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc
index 200e458c17..81e0fa87af 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc
@@ -84,16 +84,10 @@ using namespace rc_rpc_plugin;
 class ReleaseInteriorVehicleDataModuleRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
-  ReleaseInteriorVehicleDataModuleRequestTest() : mock_app_(CreateMockApp()) {}
-
-  void SetUp() OVERRIDE {
-    TestPreCondition();
-    ON_CALL(app_mngr_, application(kAppID)).WillByDefault(Return(mock_app_));
-    ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppID));
-    ON_CALL(mock_rc_capabilities_manager_,
-            GetDefaultModuleIdFromCapabilities(kModuleType))
-        .WillByDefault(Return(kDefaultModuleID));
-  }
+  ReleaseInteriorVehicleDataModuleRequestTest()
+      : mock_app_(CreateMockApp())
+      , rc_capabilities_(std::make_shared<smart_objects::SmartObject>(
+            smart_objects::SmartType::SmartType_Array)) {}
 
   MessageSharedPtr CreateBasicMessage() {
     MessageSharedPtr message = CreateMessage();
@@ -111,13 +105,6 @@ class ReleaseInteriorVehicleDataModuleRequestTest
     return message;
   }
 
-  void TestPreCondition() {
-    message_ = CreateBasicMessage();
-    command_ =
-        CreateRCCommand<commands::ReleaseInteriorVehicleDataModuleRequest>(
-            message_);
-  }
-
   template <class Command>
   std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
     InitCommand(kDefaultTimeout_);
@@ -134,6 +121,26 @@ class ReleaseInteriorVehicleDataModuleRequestTest
   }
 
  protected:
+  void SetUp() OVERRIDE {
+    TestPreCondition();
+    ON_CALL(app_mngr_, application(kAppID)).WillByDefault(Return(mock_app_));
+    ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppID));
+    ON_CALL(mock_hmi_capabilities_, rc_capability())
+        .WillByDefault(Return(rc_capabilities_));
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_))
+        .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_,
+            GetDefaultModuleIdFromCapabilities(kModuleType))
+        .WillByDefault(Return(kDefaultModuleID));
+  }
+
+  void TestPreCondition() {
+    message_ = CreateBasicMessage();
+    command_ =
+        CreateRCCommand<commands::ReleaseInteriorVehicleDataModuleRequest>(
+            message_);
+  }
+
   MessageSharedPtr message_;
   ReleaseCommandPtr command_;
 
@@ -143,6 +150,7 @@ class ReleaseInteriorVehicleDataModuleRequestTest
   MockInteriorDataManager mock_interior_data_manager_;
   NiceMock<MockRCCapabilitiesManager> mock_rc_capabilities_manager_;
   MockRCConsentManager mock_rc_consent_manger_;
+  smart_objects::SmartObjectSPtr rc_capabilities_;
 };
 
 TEST_F(ReleaseInteriorVehicleDataModuleRequestTest,