Move vi_get_vehicle_type to vehicle_info_plugin

3 files changed, 2 insertions, 26 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
index b5a33784b8..2374609774 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
@@ -158,8 +158,6 @@
 #include "hmi/sdl_activate_app_response.h"
 #include "hmi/on_app_permission_changed_notification.h"
 #include "hmi/on_event_changed_notification.h"
-#include "hmi/vi_get_vehicle_type_request.h"
-#include "hmi/vi_get_vehicle_type_response.h"
 #include "hmi/navi_is_ready_request.h"
 #include "hmi/navi_show_constant_tbt_request.h"
 #include "hmi/navi_show_constant_tbt_response.h"
@@ -433,9 +431,7 @@ typedef Types<commands::UIChangeRegistrationRequest,
               commands::UIIsReadyResponse,
               commands::UIIsReadyRequest> HMICommandsListSecond;
 
-typedef Types<commands::VIGetVehicleTypeResponse,
-              commands::VIGetVehicleTypeRequest,
-              commands::NaviIsReadyResponse,
+typedef Types<commands::NaviIsReadyResponse,
               commands::NaviIsReadyRequest,
               commands::NaviAlertManeuverResponse,
               commands::NaviAlertManeuverRequest,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
index b313fc2363..c24cfc48db 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/simple_requests_to_hmi_test.cc
@@ -59,7 +59,6 @@
 #include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_set_global_properties_request.h"
 #include "application_manager/commands/request_to_hmi.h"
-#include "sdl_rpc_plugin/commands/hmi/vi_get_vehicle_type_request.h"
 #include "sdl_rpc_plugin/commands/hmi/dial_number_request.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_is_ready_request.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_set_global_properties_request.h"
@@ -164,8 +163,7 @@ class RequestToHMICommandsTest3
   typedef Command CommandType;
 };
 
-typedef Types<sdl_rpc_plugin::commands::VIGetVehicleTypeRequest,
-              sdl_rpc_plugin::commands::hmi::DialNumberRequest,
+typedef Types<sdl_rpc_plugin::commands::hmi::DialNumberRequest,
               sdl_rpc_plugin::commands::ClosePopupRequest,
               sdl_rpc_plugin::commands::TTSSetGlobalPropertiesRequest,
               sdl_rpc_plugin::commands::TTSSpeakRequest,
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 cfe1032ea2..229f48b5e1 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
@@ -59,7 +59,6 @@
 #include "application_manager/mock_event_dispatcher.h"
 #include "application_manager/mock_hmi_capabilities.h"
 #include "application_manager/policies/mock_policy_handler_interface.h"
-#include "hmi/vi_get_vehicle_type_response.h"
 #include "hmi/dial_number_response.h"
 #include "hmi/close_popup_response.h"
 #include "hmi/tts_set_global_properties_response.h"
@@ -268,23 +267,6 @@ MATCHER_P(VehicleTypeIsEqualTo, vehicle_type, "") {
   return (*vehicle_type) == arg.asString();
 }
 
-TEST_F(OtherResponseFromHMICommandsTest, VIGetVehicleTypeResponse_Run_SUCCESS) {
-  const std::string kVehicleType = "Test";
-
-  MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
-  (*command_msg)[am::strings::msg_params][am::hmi_response::vehicle_type] =
-      kVehicleType;
-
-  SharedPtr<sdl_rpc_plugin::commands::VIGetVehicleTypeResponse> command(
-      CreateCommand<sdl_rpc_plugin::commands::VIGetVehicleTypeResponse>(
-          command_msg));
-
-  EXPECT_CALL(mock_hmi_capabilities_,
-              set_vehicle_type(VehicleTypeIsEqualTo(&kVehicleType)));
-
-  command->Run();
-}
-
 MATCHER_P(CheckMsgType, msg_type, "") {
   return msg_type ==
          static_cast<int32_t>(