Fixed build failing due to migrated unit tests.

3 files changed, 4 insertions, 18 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc
index a7c07f8b1e..cfe1032ea2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_response_from_hmi_test.cc
@@ -143,12 +143,8 @@ struct CommandData {
 };
 
 typedef Types<
-    CommandData<sdl_rpc_plugin::commands::VIReadDIDResponse,
-                hmi_apis::FunctionID::VehicleInfo_ReadDID>,
     CommandData<sdl_rpc_plugin::commands::TTSSpeakResponse,
                 hmi_apis::FunctionID::TTS_Speak>,
-    CommandData<sdl_rpc_plugin::commands::VISubscribeVehicleDataResponse,
-                hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData>,
     CommandData<sdl_rpc_plugin::commands::hmi::DialNumberResponse,
                 hmi_apis::FunctionID::BasicCommunication_DialNumber>,
     CommandData<sdl_rpc_plugin::commands::UIDeleteSubmenuResponse,
@@ -289,18 +285,6 @@ TEST_F(OtherResponseFromHMICommandsTest, VIGetVehicleTypeResponse_Run_SUCCESS) {
   command->Run();
 }
 
-TEST_F(OtherResponseFromHMICommandsTest, VIIsReadyResponse_Run_SUCCESS) {
-  SharedPtr<sdl_rpc_plugin::commands::VIIsReadyResponse> command(
-      CreateCommand<sdl_rpc_plugin::commands::VIIsReadyResponse>());
-
-  MockEventDispatcher mock_event_dispatcher;
-  EXPECT_CALL(app_mngr_, event_dispatcher())
-      .WillOnce(ReturnRef(mock_event_dispatcher));
-  EXPECT_CALL(mock_event_dispatcher, raise_event(_));
-
-  command->Run();
-}
-
 MATCHER_P(CheckMsgType, msg_type, "") {
   return msg_type ==
          static_cast<int32_t>(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/diagnostic_message_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc
index 0ae24c7b9e..3f684cae3f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/diagnostic_message_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc
@@ -46,6 +46,7 @@
 #include "application_manager/event_engine/event.h"
 #include "application_manager/mock_message_helper.h"
 #include "interfaces/MOBILE_API.h"
+#include "vehicle_info_plugin/commands/mobile/diagnostic_message_request.h"
 
 namespace test {
 namespace components {
@@ -58,7 +59,7 @@ using ::testing::Return;
 using ::testing::ReturnRef;
 namespace am = ::application_manager;
 using am::commands::MessageSharedPtr;
-using sdl_rpc_plugin::commands::DiagnosticMessageRequest;
+using vehicle_info_plugin::commands::DiagnosticMessageRequest;
 using am::event_engine::Event;
 namespace mobile_result = mobile_apis::Result;
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
index e6649a14ad..7cdeb2541c 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
@@ -46,6 +46,7 @@
 #include "interfaces/HMI_API.h"
 #include "application_manager/smart_object_keys.h"
 #include "application_manager/event_engine/event.h"
+#include "vehicle_info_plugin/commands/mobile/read_did_request.h"
 
 namespace test {
 namespace components {
@@ -58,7 +59,7 @@ using ::testing::DoAll;
 using ::testing::Return;
 using ::testing::SaveArg;
 namespace am = ::application_manager;
-using sdl_rpc_plugin::commands::ReadDIDRequest;
+using vehicle_info_plugin::commands::ReadDIDRequest;
 using am::commands::MessageSharedPtr;
 using am::event_engine::Event;
 using ::utils::SharedPtr;